Vergleich member.php - 1.8.33 - 1.8.38

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 391Zeile 391
			$captcha->invalidate_captcha();
}


			$captcha->invalidate_captcha();
}


		if($mybb->settings['regtype'] != "randompass" && !isset($mybb->cookies['coppauser']))

		if($mybb->settings['regtype'] != "randompass" && empty($mybb->cookies['coppauser']))

		{
// Log them in
my_setcookie("mybbuser", $user_info['uid']."_".$user_info['loginkey'], null, true, "lax");
}


		{
// Log them in
my_setcookie("mybbuser", $user_info['uid']."_".$user_info['loginkey'], null, true, "lax");
}


		if(isset($mybb->cookies['coppauser']))

		if(!empty($mybb->cookies['coppauser']))

		{
$lang->redirect_registered_coppa_activate = $lang->sprintf($lang->redirect_registered_coppa_activate, $mybb->settings['bbname'], htmlspecialchars_uni($user_info['username']));
my_unsetcookie("coppauser");

		{
$lang->redirect_registered_coppa_activate = $lang->sprintf($lang->redirect_registered_coppa_activate, $mybb->settings['bbname'], htmlspecialchars_uni($user_info['username']));
my_unsetcookie("coppauser");

Zeile 718Zeile 718
		$birthday_year = '';
}


		$birthday_year = '';
}


 
	$under_thirteen = false;


	// Is COPPA checking enabled?
if($mybb->settings['coppa'] != "disabled" && !isset($mybb->input['step']))
{

	// Is COPPA checking enabled?
if($mybb->settings['coppa'] != "disabled" && !isset($mybb->input['step']))
{

Zeile 742Zeile 744
			{
my_setcookie("coppauser", 1, -0);
$under_thirteen = true;

			{
my_setcookie("coppauser", 1, -0);
$under_thirteen = true;

 
			}
else
{
my_setcookie("coppauser", 0, -0);

			}
$mybb->request_method = "";
}

			}
$mybb->request_method = "";
}

Zeile 763Zeile 769
	{
$coppa_agreement = '';
// Is this user a COPPA user? We need to show the COPPA agreement too

	{
$coppa_agreement = '';
// Is this user a COPPA user? We need to show the COPPA agreement too

		if($mybb->settings['coppa'] != "disabled" && ($mybb->cookies['coppauser'] == 1 || $under_thirteen))

		if($mybb->settings['coppa'] != "disabled" && (!empty($mybb->cookies['coppauser']) || $under_thirteen))

		{
if($mybb->settings['coppa'] == "deny")
{

		{
if($mybb->settings['coppa'] == "deny")
{

Zeile 849Zeile 855
			elseif(!empty($referrername))
{
$ref = get_user_by_username($referrername);

			elseif(!empty($referrername))
{
$ref = get_user_by_username($referrername);

				if(!$ref['uid'])

				if(!$ref)

				{
$errors[] = $lang->error_badreferrer;
}

				{
$errors[] = $lang->error_badreferrer;
}

Zeile 1107Zeile 1113
			{
$captcha_html = 1;
$regimage = $captcha->html;

			{
$captcha_html = 1;
$regimage = $captcha->html;

			}
}

			}
}


// Security Question
$questionbox = '';


// Security Question
$questionbox = '';

Zeile 1277Zeile 1283
	{
$query = $db->simple_select("awaitingactivation", "*", "uid='".$user['uid']."' AND (type='r' OR type='e' OR type='b')");
$activation = $db->fetch_array($query);

	{
$query = $db->simple_select("awaitingactivation", "*", "uid='".$user['uid']."' AND (type='r' OR type='e' OR type='b')");
$activation = $db->fetch_array($query);

		if(!$activation['uid'])

		if(!$activation)

		{
error($lang->error_alreadyactivated);
}

		{
error($lang->error_alreadyactivated);
}

Zeile 1347Zeile 1353
{
$plugins->run_hooks("member_do_resendactivation_start");


{
$plugins->run_hooks("member_do_resendactivation_start");


	if($mybb->settings['regtype'] == "admin")
{
error($lang->error_activated_by_admin);
}

$errors = array();


	if($mybb->settings['regtype'] == "admin")
{
error($lang->error_activated_by_admin);
}

$errors = array();


	if($mybb->settings['captchaimage'])
{
require_once MYBB_ROOT.'inc/class_captcha.php';
$captcha = new captcha;

if($captcha->validate_captcha() == false)

	if($mybb->settings['captchaimage'])
{
require_once MYBB_ROOT.'inc/class_captcha.php';
$captcha = new captcha;

if($captcha->validate_captcha() == false)

		{

		{

			// CAPTCHA validation failed
foreach($captcha->get_errors() as $error)
{

			// CAPTCHA validation failed
foreach($captcha->get_errors() as $error)
{

Zeile 1416Zeile 1422
							break;
case 1:
$emailmessage = $lang->sprintf($lang->email_activateaccount1, $user['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user['uid'], $activationcode);

							break;
case 1:
$emailmessage = $lang->sprintf($lang->email_activateaccount1, $user['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user['uid'], $activationcode);

							break;

							break;

						case 2:
$emailmessage = $lang->sprintf($lang->email_activateaccount2, $user['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user['uid'], $activationcode);
break;

						case 2:
$emailmessage = $lang->sprintf($lang->email_activateaccount2, $user['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user['uid'], $activationcode);
break;

Zeile 1444Zeile 1450
	$plugins->run_hooks("member_resendactivation");

if($mybb->settings['regtype'] == "admin")

	$plugins->run_hooks("member_resendactivation");

if($mybb->settings['regtype'] == "admin")

	{
error($lang->error_activated_by_admin);
}

	{
error($lang->error_activated_by_admin);
}


if($mybb->user['uid'] && $mybb->user['usergroup'] != 5)


if($mybb->user['uid'] && $mybb->user['usergroup'] != 5)

	{

	{

		error($lang->error_alreadyactivated);

		error($lang->error_alreadyactivated);

	}

	}


$query = $db->simple_select("awaitingactivation", "*", "uid='".$mybb->user['uid']."' AND type='b'");
$activation = $db->fetch_array($query);


$query = $db->simple_select("awaitingactivation", "*", "uid='".$mybb->user['uid']."' AND type='b'");
$activation = $db->fetch_array($query);


if($activation['validated'] == 1)
{


if($activation && $activation['validated'] == 1)
{

		error($lang->error_activated_by_admin);

		error($lang->error_activated_by_admin);

	}

$captcha = '';
// Generate CAPTCHA?
if($mybb->settings['captchaimage'])
{
require_once MYBB_ROOT.'inc/class_captcha.php';
$post_captcha = new captcha(true, "post_captcha");

if($post_captcha->html)
{
$captcha = $post_captcha->html;
}
}

if(isset($errors) && count($errors) > 0)

	}

$captcha = '';
// Generate CAPTCHA?
if($mybb->settings['captchaimage'])
{
require_once MYBB_ROOT.'inc/class_captcha.php';
$post_captcha = new captcha(true, "post_captcha");

if($post_captcha->html)
{
$captcha = $post_captcha->html;
}
}

if(isset($errors) && count($errors) > 0)

	{
$errors = inline_error($errors);
$email = htmlspecialchars_uni($mybb->get_input('email'));

	{
$errors = inline_error($errors);
$email = htmlspecialchars_uni($mybb->get_input('email'));

	}

	}

	else
{
$errors = '';
$email = '';
}

	else
{
$errors = '';
$email = '';
}





	$plugins->run_hooks("member_resendactivation_end");

eval("\$activate = \"".$templates->get("member_resendactivation")."\";");
output_page($activate);

	$plugins->run_hooks("member_resendactivation_end");

eval("\$activate = \"".$templates->get("member_resendactivation")."\";");
output_page($activate);

}


}


if($mybb->input['action'] == "do_lostpw" && $mybb->request_method == "post")
{
$plugins->run_hooks("member_do_lostpw_start");

if($mybb->input['action'] == "do_lostpw" && $mybb->request_method == "post")
{
$plugins->run_hooks("member_do_lostpw_start");

Zeile 1564Zeile 1570
		else
{
$mybb->input['action'] = "lostpw";

		else
{
$mybb->input['action'] = "lostpw";

		}
}

		}
}

}

if($mybb->input['action'] == "lostpw")

}

if($mybb->input['action'] == "lostpw")

Zeile 1594Zeile 1600
	{
$errors = '';
$email = '';

	{
$errors = '';
$email = '';

	}


	}


	eval("\$lostpw = \"".$templates->get("member_lostpw")."\";");
output_page($lostpw);
}

	eval("\$lostpw = \"".$templates->get("member_lostpw")."\";");
output_page($lostpw);
}

Zeile 1660Zeile 1666
		require_once MYBB_ROOT.'inc/datahandlers/user.php';
$userhandler = new UserDataHandler('update');


		require_once MYBB_ROOT.'inc/datahandlers/user.php';
$userhandler = new UserDataHandler('update');


		while(!$userhandler->verify_password())

		do

		{
$password = random_str($password_length, $mybb->settings['requirecomplexpasswords']);


		{
$password = random_str($password_length, $mybb->settings['requirecomplexpasswords']);


Zeile 1673Zeile 1679

$userhandler->set_validated(true);
$userhandler->errors = array();


$userhandler->set_validated(true);
$userhandler->errors = array();

		}


		} while(!$userhandler->verify_password());


		$userhandler->update_user();

$logindetails = array(
'salt' => $userhandler->data['salt'],

		$userhandler->update_user();

$logindetails = array(
'salt' => $userhandler->data['salt'],

			'password'	=> $userhandler->data['saltedpw'],

			'password'	=> $userhandler->data['password'],

			'loginkey'	=> $userhandler->data['loginkey'],
);


			'loginkey'	=> $userhandler->data['loginkey'],
);


		$email = $user['email'];


		$email = $user['email'];


		$plugins->run_hooks("member_resetpassword_process");

		$plugins->run_hooks("member_resetpassword_process");





		$emailsubject = $lang->sprintf($lang->emailsubject_passwordreset, $mybb->settings['bbname']);
$emailmessage = $lang->sprintf($lang->email_passwordreset, $username, $mybb->settings['bbname'], $password);
my_mail($email, $emailsubject, $emailmessage);

		$emailsubject = $lang->sprintf($lang->emailsubject_passwordreset, $mybb->settings['bbname']);
$emailmessage = $lang->sprintf($lang->email_passwordreset, $username, $mybb->settings['bbname'], $password);
my_mail($email, $emailsubject, $emailmessage);

Zeile 1716Zeile 1722
		}

$code = htmlspecialchars_uni($mybb->get_input('code'));

		}

$code = htmlspecialchars_uni($mybb->get_input('code'));


if(!isset($mybb->input['username']))
{
$input_username = '';
}
$input_username = htmlspecialchars_uni($mybb->input['username']);

		
$input_username = htmlspecialchars_uni($mybb->get_input('username'));






eval("\$activate = \"".$templates->get("member_resetpassword")."\";");
output_page($activate);


eval("\$activate = \"".$templates->get("member_resetpassword")."\";");
output_page($activate);

Zeile 2908Zeile 2910
		$last_email = $db->fetch_array($query);

// Users last email was within the flood time, show the error

		$last_email = $db->fetch_array($query);

// Users last email was within the flood time, show the error

		if($last_email['mid'])

		if(isset($last_email['mid']))

		{
$remaining_time = ($mybb->usergroup['emailfloodtime']*60)-(TIME_NOW-$last_email['dateline']);


		{
$remaining_time = ($mybb->usergroup['emailfloodtime']*60)-(TIME_NOW-$last_email['dateline']);


Zeile 3081Zeile 3083
		$last_email = $db->fetch_array($query);

// Users last email was within the flood time, show the error

		$last_email = $db->fetch_array($query);

// Users last email was within the flood time, show the error

		if($last_email['mid'])

		if(isset($last_email['mid']))

		{
$remaining_time = ($mybb->usergroup['emailfloodtime']*60)-(TIME_NOW-$last_email['dateline']);


		{
$remaining_time = ($mybb->usergroup['emailfloodtime']*60)-(TIME_NOW-$last_email['dateline']);