Vergleich member.php - 1.8.0 - 1.8.1

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 21Zeile 21
$templatelist .= ",member_profile_modoptions_manageuser,member_profile_modoptions_editprofile,member_profile_modoptions_banuser,member_profile_modoptions_viewnotes,member_profile_modoptions,member_profile_modoptions_editnotes,member_profile_modoptions_purgespammer,postbit_reputation_formatted,postbit_warninglevel_formatted";
$templatelist .= ",usercp_profile_profilefields_select_option,usercp_profile_profilefields_multiselect,usercp_profile_profilefields_select,usercp_profile_profilefields_textarea,usercp_profile_profilefields_radio,usercp_profile_profilefields_checkbox,usercp_profile_profilefields_text,usercp_options_tppselect_option";
$templatelist .= ",member_register_question,member_register_question_refresh,usercp_options_timezone,usercp_options_timezone_option,usercp_options_language_option,member_register_language,member_profile_userstar,member_profile_customfields_field_multi_item,member_profile_customfields_field_multi,member_register_day";

$templatelist .= ",member_profile_modoptions_manageuser,member_profile_modoptions_editprofile,member_profile_modoptions_banuser,member_profile_modoptions_viewnotes,member_profile_modoptions,member_profile_modoptions_editnotes,member_profile_modoptions_purgespammer,postbit_reputation_formatted,postbit_warninglevel_formatted";
$templatelist .= ",usercp_profile_profilefields_select_option,usercp_profile_profilefields_multiselect,usercp_profile_profilefields_select,usercp_profile_profilefields_textarea,usercp_profile_profilefields_radio,usercp_profile_profilefields_checkbox,usercp_profile_profilefields_text,usercp_options_tppselect_option";
$templatelist .= ",member_register_question,member_register_question_refresh,usercp_options_timezone,usercp_options_timezone_option,usercp_options_language_option,member_register_language,member_profile_userstar,member_profile_customfields_field_multi_item,member_profile_customfields_field_multi,member_register_day";

$templatelist .= ",member_profile_contact_fields_aim,member_profile_contact_fields_google,member_profile_contact_fields_icq,member_profile_contact_fields_skype,member_profile_contact_fields_yahoo,member_profile_pm,member_profile_contact_details,member_emailuser_hidden";

$templatelist .= ",member_profile_contact_fields_aim,member_profile_contact_fields_google,member_profile_contact_fields_icq,member_profile_contact_fields_skype,member_profile_contact_fields_yahoo,member_profile_pm,member_profile_contact_details,member_emailuser_hidden,member_profile_banned";


require_once "./global.php";
require_once MYBB_ROOT."inc/functions_post.php";


require_once "./global.php";
require_once MYBB_ROOT."inc/functions_post.php";

Zeile 1661Zeile 1661
		'imagestring' => $mybb->get_input('imagestring')
);


		'imagestring' => $mybb->get_input('imagestring')
);


	$user_loginattempts = get_user_by_username($user['username'], array('fields' => 'loginattempts'));
$user['loginattempts'] = (int)$user_loginattempts['loginattempts'];






	$options = array(
'fields' => 'loginattempts',
'username_method' => (int)$mybb->settings['username_method'],
);

$user_loginattempts = get_user_by_username($user['username'], $options);
$user['loginattempts'] = (int)$user_loginattempts['loginattempts'];


$loginhandler->set_data($user);
$validated = $loginhandler->validate_login();


$loginhandler->set_data($user);
$validated = $loginhandler->validate_login();

Zeile 1673Zeile 1678
		$mybb->request_method = "get";

my_setcookie('loginattempts', $logins + 1);

		$mybb->request_method = "get";

my_setcookie('loginattempts', $logins + 1);

		$db->update_query("users", array('loginattempts' => 'loginattempts+1'), "LOWER(username) = '".$db->escape_string(my_strtolower($user['username']))."'", 1, true);

		$db->update_query("users", array('loginattempts' => 'loginattempts+1'), "uid='".(int)$loginhandler->login_data['uid']."'", 1, true);


$errors = $loginhandler->get_friendly_errors();



$errors = $loginhandler->get_friendly_errors();


		$user_loginattempts = get_user_by_username($user['username'], array('fields' => 'loginattempts'));
$user['loginattempts'] = (int)$user_loginattempts['loginattempts'];


		$user['loginattempts'] = (int)$loginhandler->login_data['loginattempts'];



		// If we need a captcha set it here
if($mybb->settings['failedcaptchalogincount'] > 0 && ($user['loginattempts'] > $mybb->settings['failedcaptchalogincount'] || (int)$mybb->cookies['loginattempts'] > $mybb->settings['failedcaptchalogincount']))
{

		// If we need a captcha set it here
if($mybb->settings['failedcaptchalogincount'] > 0 && ($user['loginattempts'] > $mybb->settings['failedcaptchalogincount'] || (int)$mybb->cookies['loginattempts'] > $mybb->settings['failedcaptchalogincount']))
{

Zeile 1691Zeile 1695
	{
// Successful login
if($loginhandler->login_data['coppauser'])

	{
// Successful login
if($loginhandler->login_data['coppauser'])

		{

		{

			error($lang->error_awaitingcoppa);
}


			error($lang->error_awaitingcoppa);
}


Zeile 1717Zeile 1721
		{

redirect("index.php", $lang->redirect_loggedin);

		{

redirect("index.php", $lang->redirect_loggedin);

		}
}

		}
}


$plugins->run_hooks("member_do_login_end");
}


$plugins->run_hooks("member_do_login_end");
}

Zeile 1758Zeile 1762
		if($login_captcha->type == 1)
{
if(!$correct)

		if($login_captcha->type == 1)
{
if(!$correct)

			{

			{

				$login_captcha->build_captcha();

				$login_captcha->build_captcha();

			}

			}

			else
{
$captcha = $login_captcha->build_hidden_captcha();
}

			else
{
$captcha = $login_captcha->build_hidden_captcha();
}

		}

		}

		elseif($login_captcha->type == 2)
{
$login_captcha->build_recaptcha();
}
elseif($login_captcha->type == 3)

		elseif($login_captcha->type == 2)
{
$login_captcha->build_recaptcha();
}
elseif($login_captcha->type == 3)

		{

		{

			$login_captcha->build_ayah();
}


			$login_captcha->build_ayah();
}


Zeile 1983Zeile 1987
		else
{
$memprofile[$field] = '';

		else
{
$memprofile[$field] = '';

		}
}


		}
}


	if(!empty($contact_fields) || $sendemail || $sendpm || $website)
{
eval('$contact_details = "'.$templates->get("member_profile_contact_details").'";');

	if(!empty($contact_fields) || $sendemail || $sendpm || $website)
{
eval('$contact_details = "'.$templates->get("member_profile_contact_details").'";');

Zeile 2011Zeile 2015
		if($mybb->user['showimages'] != 1 && $mybb->user['uid'] != 0 || $mybb->settings['guestimages'] != 1 && $mybb->user['uid'] == 0)
{
$sig_parser['allow_imgcode'] = 0;

		if($mybb->user['showimages'] != 1 && $mybb->user['uid'] != 0 || $mybb->settings['guestimages'] != 1 && $mybb->user['uid'] == 0)
{
$sig_parser['allow_imgcode'] = 0;

		}


		}


		$memprofile['signature'] = $parser->parse_message($memprofile['signature'], $sig_parser);
eval("\$signature = \"".$templates->get("member_profile_signature")."\";");
}

		$memprofile['signature'] = $parser->parse_message($memprofile['signature'], $sig_parser);
eval("\$signature = \"".$templates->get("member_profile_signature")."\";");
}

Zeile 2038Zeile 2042
	if($numposts == 0)
{
$post_percent = "0";

	if($numposts == 0)
{
$post_percent = "0";

	}
else

	}
else

	{
$post_percent = $memprofile['postnum']*100/$numposts;
$post_percent = round($post_percent, 2);

	{
$post_percent = $memprofile['postnum']*100/$numposts;
$post_percent = round($post_percent, 2);

Zeile 2091Zeile 2095
		if($memprofile['returndate'] == '')
{
$returndate = "$lang->unknown";

		if($memprofile['returndate'] == '')
{
$returndate = "$lang->unknown";

		}
else

		}
else

		{
$returnhome = explode("-", $memprofile['returndate']);


		{
$returnhome = explode("-", $memprofile['returndate']);


Zeile 2521Zeile 2525
	$lang->tpd_percent_total = $lang->sprintf($lang->tpd_percent_total, my_number_format($tpd), $thread_percent);

$formattedname = format_name($memprofile['username'], $memprofile['usergroup'], $memprofile['displaygroup']);

	$lang->tpd_percent_total = $lang->sprintf($lang->tpd_percent_total, my_number_format($tpd), $thread_percent);

$formattedname = format_name($memprofile['username'], $memprofile['usergroup'], $memprofile['displaygroup']);

 

$bannedbit = '';
if($memperms['isbannedgroup'] == 1 && $mybb->usergroup['canbanusers'] == 1)
{
// Fetch details on their ban
$query = $db->simple_select('banned b LEFT JOIN '.TABLE_PREFIX.'users a ON (b.admin=a.uid)', 'b.*, a.username AS adminuser', "b.uid='{$uid}'", array('limit' => 1));
$memban = $db->fetch_array($query);

if($memban['reason'])
{
$memban['reason'] = htmlspecialchars_uni($parser->parse_badwords($memban['reason']));
$memban['reason'] = my_wordwrap($memban['reason']);
}
else
{
$memban['reason'] = $lang->na;
}

if($memban['lifted'] == 'perm' || $memban['lifted'] == '' || $memban['bantime'] == 'perm' || $memban['bantime'] == '---')
{
$banlength = $lang->permanent;
$timeremaining = $lang->na;
}
else
{
// Set up the array of ban times.
$bantimes = fetch_ban_times();

$banlength = $bantimes[$memban['bantime']];
$remaining = $memban['lifted']-TIME_NOW;

$timeremaining = nice_time($remaining, array('short' => 1, 'seconds' => false))."";

if($remaining < 3600)
{
$timeremaining = "<span style=\"color: red;\">({$timeremaining} {$lang->ban_remaining})</span>";
}
else if($remaining < 86400)
{
$timeremaining = "<span style=\"color: maroon;\">({$timeremaining} {$lang->ban_remaining})</span>";
}
else if($remaining < 604800)
{
$timeremaining = "<span style=\"color: green;\">({$timeremaining} {$lang->ban_remaining})</span>";
}
else
{
$timeremaining = "({$timeremaining} {$lang->ban_remaining})";
}
}

$memban['adminuser'] = build_profile_link($memban['adminuser'], $memban['admin']);

// Display a nice warning to the user
eval('$bannedbit = "'.$templates->get('member_profile_banned').'";');
}


$adminoptions = '';
if($mybb->usergroup['cancp'] == 1 && $mybb->config['hide_admin_links'] != 1)


$adminoptions = '';
if($mybb->usergroup['cancp'] == 1 && $mybb->config['hide_admin_links'] != 1)

Zeile 2553Zeile 2613
			eval("\$editnotes = \"".$templates->get("member_profile_modoptions_editnotes")."\";");
}


			eval("\$editnotes = \"".$templates->get("member_profile_modoptions_editnotes")."\";");
}


		if($mybb->usergroup['canbanusers'] == 1)

		if($mybb->usergroup['canbanusers'] == 1 && (!$memban['uid'] || $memban['uid'] && ($mybb->user['uid'] == $memban['admin']) || $mybb->usergroup['issupermod'] == 1 || $mybb->usergroup['cancp'] == 1))

		{
eval("\$banuser = \"".$templates->get("member_profile_modoptions_banuser")."\";");
}

		{
eval("\$banuser = \"".$templates->get("member_profile_modoptions_banuser")."\";");
}