Vergleich member.php - 1.8.34 - 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 756Zeile 762
			eval("\$coppa = \"".$templates->get("member_register_coppa")."\";");
output_page($coppa);
exit;

			eval("\$coppa = \"".$templates->get("member_register_coppa")."\";");
output_page($coppa);
exit;

		}
}

		}
}


if((!isset($mybb->input['agree']) && !isset($mybb->input['regsubmit'])) && $fromreg == 0 || $mybb->request_method != "post")
{
$coppa_agreement = '';
// Is this user a COPPA user? We need to show the COPPA agreement too


if((!isset($mybb->input['agree']) && !isset($mybb->input['regsubmit'])) && $fromreg == 0 || $mybb->request_method != "post")
{
$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 847Zeile 853
				$referrername = $ref['username'];
}
elseif(!empty($referrername))

				$referrername = $ref['username'];
}
elseif(!empty($referrername))

			{

			{

				$ref = get_user_by_username($referrername);

				$ref = get_user_by_username($referrername);

				if(!$ref['uid'])

				if(!$ref)

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

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

			else
{
$referrername = '';
}

			else
{
$referrername = '';
}

			if(isset($quickreg))
{
$refbg = "trow1";
}
else

			if(isset($quickreg))
{
$refbg = "trow1";
}
else

			{

			{

				$refbg = "trow2";
}
eval("\$referrer = \"".$templates->get("member_register_referrer")."\";");

				$refbg = "trow2";
}
eval("\$referrer = \"".$templates->get("member_register_referrer")."\";");

Zeile 931Zeile 937
						foreach($useropts as $key => $val)
{
$seloptions[$val] = $val;

						foreach($useropts as $key => $val)
{
$seloptions[$val] = $val;

						}
}
$expoptions = explode("\n", $options);
if(is_array($expoptions))
{
foreach($expoptions as $key => $val)
{

						}
}
$expoptions = explode("\n", $options);
if(is_array($expoptions))
{
foreach($expoptions as $key => $val)
{

							$val = trim($val);
$val = str_replace("\n", "\\n", $val);


							$val = trim($val);
$val = str_replace("\n", "\\n", $val);


Zeile 952Zeile 958
						if(!$profilefield['length'])
{
$profilefield['length'] = 3;

						if(!$profilefield['length'])
{
$profilefield['length'] = 3;

						}

						}


eval("\$code = \"".$templates->get("usercp_profile_profilefields_multiselect")."\";");
}


eval("\$code = \"".$templates->get("usercp_profile_profilefields_multiselect")."\";");
}

Zeile 983Zeile 989
					}
}
elseif($type == "radio")

					}
}
elseif($type == "radio")

				{
$expoptions = explode("\n", $options);

				{
$expoptions = explode("\n", $options);

					if(is_array($expoptions))
{
foreach($expoptions as $key => $val)

					if(is_array($expoptions))
{
foreach($expoptions as $key => $val)

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 1346Zeile 1352
if($mybb->input['action'] == "do_resendactivation" && $mybb->request_method == "post")
{
$plugins->run_hooks("member_do_resendactivation_start");

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


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


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

		error($lang->error_activated_by_admin);
}


		error($lang->error_activated_by_admin);
}


Zeile 1387Zeile 1393
			while($user = $db->fetch_array($query))
{
if($user['type'] == "b" && $user['validated'] == 1)

			while($user = $db->fetch_array($query))
{
if($user['type'] == "b" && $user['validated'] == 1)

				{

				{

					error($lang->error_activated_by_admin);
}


					error($lang->error_activated_by_admin);
}


Zeile 1429Zeile 1435
			}

$plugins->run_hooks("member_do_resendactivation_end");

			}

$plugins->run_hooks("member_do_resendactivation_end");





			redirect("index.php", $lang->redirect_activationresent);
}
else

			redirect("index.php", $lang->redirect_activationresent);
}
else

Zeile 1456Zeile 1462
	$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;
}

	}

$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)

	}

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

Zeile 1483Zeile 1489
	{
$errors = '';
$email = '';

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

	}

$plugins->run_hooks("member_resendactivation_end");


	}

$plugins->run_hooks("member_resendactivation_end");


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

	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");





	$errors = array();

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

	$errors = array();

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





		if($captcha->validate_captcha() == false)
{
// CAPTCHA validation failed

		if($captcha->validate_captcha() == false)
{
// CAPTCHA validation failed

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

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

						break;

						break;

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

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

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

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

	}
else
{

	}
else
{

		$errors = '';
$email = '';
}

		$errors = '';
$email = '';
}

Zeile 1652Zeile 1658
		$password_length = (int)$mybb->settings['minpasswordlength'];

if($password_length < 8)

		$password_length = (int)$mybb->settings['minpasswordlength'];

if($password_length < 8)

		{

		{

			$password_length = min(8, (int)$mybb->settings['maxpasswordlength']);
}


			$password_length = min(8, (int)$mybb->settings['maxpasswordlength']);
}


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'],
);


Zeile 1700Zeile 1706
		$plugins->run_hooks("member_resetpassword_form");

switch($mybb->settings['username_method'])

		$plugins->run_hooks("member_resetpassword_form");

switch($mybb->settings['username_method'])

		{

		{

			case 0:

			case 0:

				$lang_username = $lang->username;

				$lang_username = $lang->username;

				break;
case 1:
$lang_username = $lang->username1;

				break;
case 1:
$lang_username = $lang->username1;

				break;

				break;

			case 2:
$lang_username = $lang->username2;
break;
default:
$lang_username = $lang->username;
break;

			case 2:
$lang_username = $lang->username2;
break;
default:
$lang_username = $lang->username;
break;

		}


		}


		$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);