Vergleich member.php - 1.6.10 - 1.6.11

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 247Zeile 247
	else
{
$user_info = $userhandler->insert_user();

	else
{
$user_info = $userhandler->insert_user();

 

// Invalidate solved captcha
if($mybb->settings['captchaimage'])
{
$captcha->invalidate_captcha();
}


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


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

Zeile 382Zeile 388
		if($mybb->input['bday1'] && $mybb->input['bday2'] && $mybb->input['bday3'])
{
my_unsetcookie("coppauser");

		if($mybb->input['bday1'] && $mybb->input['bday2'] && $mybb->input['bday3'])
{
my_unsetcookie("coppauser");

 
			
$mybb->input['bday1'] = intval($mybb->input['bday1']);
$mybb->input['bday2'] = intval($mybb->input['bday2']);
$mybb->input['bday3'] = intval($mybb->input['bday3']);
$months = get_bdays($mybb->input['bday3']);
if($mybb->input['bday2'] < 1 || $mybb->input['bday2'] > 12 || $mybb->input['bday3'] < (date("Y")-100) || $mybb->input['bday3'] > date("Y") || $mybb->input['bday1'] > $months[$mybb->input['bday2']-1])
{
error($lang->error_invalid_birthday);
}

			
$bdaytime = @mktime(0, 0, 0, $mybb->input['bday2'], $mybb->input['bday1'], $mybb->input['bday3']);


			
$bdaytime = @mktime(0, 0, 0, $mybb->input['bday2'], $mybb->input['bday1'], $mybb->input['bday3']);


Zeile 615Zeile 630
				if($errors)
{
$useropts = $userfield;

				if($errors)
{
$useropts = $userfield;

				}
else

				}
else

				{
$useropts = explode("\n", $userfield);
}

				{
$useropts = explode("\n", $userfield);
}

Zeile 862Zeile 877
if($mybb->input['action'] == "resendactivation")
{
$plugins->run_hooks("member_resendactivation");

if($mybb->input['action'] == "resendactivation")
{
$plugins->run_hooks("member_resendactivation");





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

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

Zeile 891Zeile 906
		LEFT JOIN ".TABLE_PREFIX."awaitingactivation a ON (a.uid=u.uid AND a.type='r')
WHERE u.email='".$db->escape_string($mybb->input['email'])."'
");

		LEFT JOIN ".TABLE_PREFIX."awaitingactivation a ON (a.uid=u.uid AND a.type='r')
WHERE u.email='".$db->escape_string($mybb->input['email'])."'
");

	$numusers = $db->num_rows($query);

	$numusers = $db->num_rows($query);

	if($numusers < 1)
{
error($lang->error_invalidemail);

	if($numusers < 1)
{
error($lang->error_invalidemail);

Zeile 981Zeile 996
			$email = $user['email'];
$activationcode = $user['activationcode'];
$emailsubject = $lang->sprintf($lang->emailsubject_lostpw, $mybb->settings['bbname']);

			$email = $user['email'];
$activationcode = $user['activationcode'];
$emailsubject = $lang->sprintf($lang->emailsubject_lostpw, $mybb->settings['bbname']);

			switch($mybb->settings['username_method'])
{
case 0:
$emailmessage = $lang->sprintf($lang->email_lostpw, $username, $mybb->settings['bbname'], $mybb->settings['bburl'], $uid, $activationcode);
break;

			switch($mybb->settings['username_method'])
{
case 0:
$emailmessage = $lang->sprintf($lang->email_lostpw, $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;

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

Zeile 1031Zeile 1046
			switch($mybb->settings['username_method'])
{
case 0:

			switch($mybb->settings['username_method'])
{
case 0:

					error($lang->error_invalidpworusername);
break;

					error($lang->error_invalidpworusername);
break;

				case 1:
error($lang->error_invalidpworusername1);
break;

				case 1:
error($lang->error_invalidpworusername1);
break;

Zeile 1092Zeile 1107
		switch($mybb->settings['username_method'])
{
case 0:

		switch($mybb->settings['username_method'])
{
case 0:

				$lang_username = $lang->username;
break;

				$lang_username = $lang->username;
break;

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

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

				break;

				break;

			default:
$lang_username = $lang->username;
break;

			default:
$lang_username = $lang->username;
break;

Zeile 1107Zeile 1122

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


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

	}
}

	}
}


$correct = false;
$inline_errors = '';


$correct = false;
$inline_errors = '';

Zeile 1139Zeile 1154
				break;
case 1:
error($lang->error_invalidpworusername1.$login_text);

				break;
case 1:
error($lang->error_invalidpworusername1.$login_text);

				break;

				break;

			case 2:
error($lang->error_invalidpworusername2.$login_text);
break;

			case 2:
error($lang->error_invalidpworusername2.$login_text);
break;

Zeile 1151Zeile 1166

$query = $db->simple_select("users", "loginattempts", "LOWER(username)='".$db->escape_string(my_strtolower($mybb->input['username']))."' OR LOWER(email)='".$db->escape_string(my_strtolower($mybb->input['username']))."'", array('limit' => 1));
$loginattempts = $db->fetch_field($query, "loginattempts");


$query = $db->simple_select("users", "loginattempts", "LOWER(username)='".$db->escape_string(my_strtolower($mybb->input['username']))."' OR LOWER(email)='".$db->escape_string(my_strtolower($mybb->input['username']))."'", array('limit' => 1));
$loginattempts = $db->fetch_field($query, "loginattempts");





	$errors = array();


	$errors = array();


 
	$login_captcha = false;

	if($mybb->settings['failedcaptchalogincount'] > 0 && ($loginattempts > $mybb->settings['failedcaptchalogincount'] || intval($mybb->cookies['loginattempts']) > $mybb->settings['failedcaptchalogincount']))

	if($mybb->settings['failedcaptchalogincount'] > 0 && ($loginattempts > $mybb->settings['failedcaptchalogincount'] || intval($mybb->cookies['loginattempts']) > $mybb->settings['failedcaptchalogincount']))

	{

	{

		// Show captcha image if enabled
if($mybb->settings['captchaimage'])
{

		// Show captcha image if enabled
if($mybb->settings['captchaimage'])
{

Zeile 1215Zeile 1231
		else
{
$correct = true;

		else
{
$correct = true;

		}
}

		}
}


if(!empty($errors))
{


if(!empty($errors))
{

Zeile 1228Zeile 1244
	else if($correct)
{
if($user['coppauser'])

	else if($correct)
{
if($user['coppauser'])

		{

		{

			error($lang->error_awaitingcoppa);
}

			error($lang->error_awaitingcoppa);
}

		








// Invalidate captcha
if($login_captcha !== false)
{
$login_captcha->invalidate_captcha();
}


		my_setcookie('loginattempts', 1);
$db->delete_query("sessions", "ip='".$db->escape_string($session->ipaddress)."' AND sid != '".$session->sid."'");
$newsession = array(

		my_setcookie('loginattempts', 1);
$db->delete_query("sessions", "ip='".$db->escape_string($session->ipaddress)."' AND sid != '".$session->sid."'");
$newsession = array(

Zeile 1645Zeile 1667
			// If our away time has expired already, we should be back, right?
if($returnmkdate < TIME_NOW)
{

			// If our away time has expired already, we should be back, right?
if($returnmkdate < TIME_NOW)
{

				$db->update_query('users', array('away' => '0', 'awaydate' => '', 'returndate' => '', 'awayreason' => ''), 'uid=\''.intval($memprofile['uid']).'\'');

				$db->update_query('users', array('away' => '0', 'awaydate' => '0', 'returndate' => '', 'awayreason' => ''), 'uid=\''.intval($memprofile['uid']).'\'');

				
// Update our status to "not away"
$memprofile['away'] = 0;

				
// Update our status to "not away"
$memprofile['away'] = 0;

Zeile 1885Zeile 1907
	}

// Fetch the reputation for this user

	}

// Fetch the reputation for this user

	if($memperms['usereputationsystem'] == 1 && $displaygroup['usereputationsystem'] == 1 && $mybb->settings['enablereputation'] == 1 && ($mybb->settings['posrep'] || $mybb->settings['neurep'] || $mybb->settings['negrep']))

	if($memperms['usereputationsystem'] == 1 && $displaygroup['usereputationsystem'] == 1 && $mybb->settings['enablereputation'] == 1)

	{
$bg_color = alt_trow();
$reputation = get_reputation($memprofile['reputation']);

// If this user has permission to give reputations show the vote link
$vote_link = '';

	{
$bg_color = alt_trow();
$reputation = get_reputation($memprofile['reputation']);

// If this user has permission to give reputations show the vote link
$vote_link = '';

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

		if($mybb->usergroup['cangivereputations'] == 1 && $memprofile['uid'] != $mybb->user['uid'] && ($mybb->settings['posrep'] || $mybb->settings['neurep'] || $mybb->settings['negrep']))

		{
$vote_link = "[<a href=\"javascript:MyBB.reputation({$memprofile['uid']});\">{$lang->reputation_vote}</a>]";
}

		{
$vote_link = "[<a href=\"javascript:MyBB.reputation({$memprofile['uid']});\">{$lang->reputation_vote}</a>]";
}