Vergleich admin/index.php - 1.8.10 - 1.8.11

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 22Zeile 22
send_page_headers();

header('X-Frame-Options: SAMEORIGIN');

send_page_headers();

header('X-Frame-Options: SAMEORIGIN');

 
header('Referrer-Policy: no-referrer');


if(!isset($config['admin_dir']) || !file_exists(MYBB_ROOT.$config['admin_dir']."/inc/class_page.php"))
{


if(!isset($config['admin_dir']) || !file_exists(MYBB_ROOT.$config['admin_dir']."/inc/class_page.php"))
{

Zeile 104Zeile 105
{
$user = array();
$error = '';

{
$user = array();
$error = '';

 

$plugins->run_hooks("admin_unlock_start");


	if($mybb->input['username'])
{
$user = get_user_by_username($mybb->input['username'], array('fields' => '*'));

	if($mybb->input['username'])
{
$user = get_user_by_username($mybb->input['username'], array('fields' => '*'));


if(!$user['uid'])
{


if(!$user['uid'])
{

			$error = $lang->error_invalid_username;
}
}

			$error = $lang->error_invalid_username;
}
}

Zeile 119Zeile 123
		if(!$user['uid'])
{
$error = $lang->error_invalid_uid;

		if(!$user['uid'])
{
$error = $lang->error_invalid_uid;

		}
}


		}
}


	// Do we have the token? If so let's process it
if($mybb->input['token'] && $user['uid'])
{
$query = $db->simple_select("awaitingactivation", "COUNT(aid) AS num", "uid='".(int)$user['uid']."' AND code='".$db->escape_string($mybb->input['token'])."' AND type='l'");

	// Do we have the token? If so let's process it
if($mybb->input['token'] && $user['uid'])
{
$query = $db->simple_select("awaitingactivation", "COUNT(aid) AS num", "uid='".(int)$user['uid']."' AND code='".$db->escape_string($mybb->input['token'])."' AND type='l'");

 

$plugins->run_hooks("admin_unlock_end");


// If we're good to go
if($db->fetch_field($query, "num") > 0)


// If we're good to go
if($db->fetch_field($query, "num") > 0)

Zeile 145Zeile 151
}
elseif($mybb->input['do'] == "login")
{

}
elseif($mybb->input['do'] == "login")
{

 
	$plugins->run_hooks("admin_login");


	// We have an adminsid cookie?
if(isset($mybb->cookies['adminsid']))
{
// Check admin session
$query = $db->simple_select("adminsessions", "sid", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");
$admin_session = $db->fetch_field($query, 'sid');

	// We have an adminsid cookie?
if(isset($mybb->cookies['adminsid']))
{
// Check admin session
$query = $db->simple_select("adminsessions", "sid", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");
$admin_session = $db->fetch_field($query, 'sid');





		// Session found: redirect to index
if($admin_session)

		// Session found: redirect to index
if($admin_session)

		{

		{

			admin_redirect("index.php");

			admin_redirect("index.php");

		}
}


		}
}


	require_once MYBB_ROOT."inc/datahandlers/login.php";
$loginhandler = new LoginDataHandler("get");

	require_once MYBB_ROOT."inc/datahandlers/login.php";
$loginhandler = new LoginDataHandler("get");





	// Determine login method
$login_lang_string = $lang->error_invalid_username_password;
switch($mybb->settings['username_method'])

	// Determine login method
$login_lang_string = $lang->error_invalid_username_password;
switch($mybb->settings['username_method'])

	{

	{

		case 0: // Username only
$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username);
break;

		case 0: // Username only
$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username);
break;

Zeile 180Zeile 188

// Validate PIN first
if(!empty($config['secret_pin']) && (empty($mybb->input['pin']) || $mybb->input['pin'] != $config['secret_pin']))


// Validate PIN first
if(!empty($config['secret_pin']) && (empty($mybb->input['pin']) || $mybb->input['pin'] != $config['secret_pin']))

	{
$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));

if($login_user['uid'] > 0)
{
$db->update_query("adminoptions", array("loginattempts" => "loginattempts+1"), "uid='".(int)$login_user['uid']."'", '', true);
}

$loginattempts = login_attempt_check_acp($login_user['uid'], true);

// Have we attempted too many times?
if($loginattempts['loginattempts'] > 0)
{
// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 0)
{
$db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'");
}




	{
$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));

$plugins->run_hooks("admin_login_incorrect_pin");

if($login_user['uid'] > 0)
{
$db->update_query("adminoptions", array("loginattempts" => "loginattempts+1"), "uid='".(int)$login_user['uid']."'", '', true);
}

$loginattempts = login_attempt_check_acp($login_user['uid'], true);

// Have we attempted too many times?
if($loginattempts['loginattempts'] > 0)
{
// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 0)
{
$db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'");
}


			// Did we hit lockout for the first time? Send the unlock email to the administrator
if($loginattempts['loginattempts'] == $mybb->settings['maxloginattempts'])
{

			// Did we hit lockout for the first time? Send the unlock email to the administrator
if($loginattempts['loginattempts'] == $mybb->settings['maxloginattempts'])
{

Zeile 210Zeile 220
					"type" => "l"
);
$db->insert_query("awaitingactivation", $lockout_array);

					"type" => "l"
);
$db->insert_query("awaitingactivation", $lockout_array);





				$subject = $lang->sprintf($lang->locked_out_subject, $mybb->settings['bbname']);
$message = $lang->sprintf($lang->locked_out_message, htmlspecialchars_uni($mybb->input['username']), $mybb->settings['bbname'], $mybb->settings['maxloginattempts'], $mybb->settings['bburl'], $mybb->config['admin_dir'], $lockout_array['code'], $lockout_array['uid']);
my_mail($login_user['email'], $subject, $message);

				$subject = $lang->sprintf($lang->locked_out_subject, $mybb->settings['bbname']);
$message = $lang->sprintf($lang->locked_out_message, htmlspecialchars_uni($mybb->input['username']), $mybb->settings['bbname'], $mybb->settings['maxloginattempts'], $mybb->settings['bburl'], $mybb->config['admin_dir'], $lockout_array['code'], $lockout_array['uid']);
my_mail($login_user['email'], $subject, $message);

Zeile 222Zeile 232
					'username' => $login_user['username'],
)
);

					'username' => $login_user['username'],
)
);





			$default_page->show_lockedout();
}
else

			$default_page->show_lockedout();
}
else

Zeile 244Zeile 254
	if($mybb->user['uid'])
{
if(login_attempt_check_acp($mybb->user['uid']) == true)

	if($mybb->user['uid'])
{
if(login_attempt_check_acp($mybb->user['uid']) == true)

		{
log_admin_action(array(

		{
log_admin_action(array(

					'type' => 'admin_locked_out',
'uid' => (int)$mybb->user['uid'],
'username' => $mybb->user['username'],
)
);

					'type' => 'admin_locked_out',
'uid' => (int)$mybb->user['uid'],
'username' => $mybb->user['username'],
)
);





			$default_page->show_lockedout();
}

			$default_page->show_lockedout();
}

 

$plugins->run_hooks("admin_login_success");


$db->delete_query("adminsessions", "uid='{$mybb->user['uid']}'");



$db->delete_query("adminsessions", "uid='{$mybb->user['uid']}'");


Zeile 263Zeile 275
		if(my_strlen($useragent) > 200)
{
$useragent = my_substr($useragent, 0, 200);

		if(my_strlen($useragent) > 200)
{
$useragent = my_substr($useragent, 0, 200);

		}

		}


// Create a new admin session for this user
$admin_session = array(


// Create a new admin session for this user
$admin_session = array(

Zeile 290Zeile 302
		my_setcookie("adminsid", $sid, '', true);
my_setcookie('acploginattempts', 0);
$post_verify = false;

		my_setcookie("adminsid", $sid, '', true);
my_setcookie('acploginattempts', 0);
$post_verify = false;


$mybb->request_method = "get";



$mybb->request_method = "get";


		if(!empty($mybb->input['module']))
{
// $query_string should contain the module

		if(!empty($mybb->input['module']))
{
// $query_string should contain the module

Zeile 330Zeile 342
	else
{
$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));

	else
{
$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));

 

$plugins->run_hooks("admin_login_fail");


if($login_user['uid'] > 0)
{


if($login_user['uid'] > 0)
{

Zeile 340Zeile 354

// Have we attempted too many times?
if($loginattempts['loginattempts'] > 0)


// Have we attempted too many times?
if($loginattempts['loginattempts'] > 0)

		{

		{

			// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 0)
{
$db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'");
}

			// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 0)
{
$db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'");
}

 

$plugins->run_hooks("admin_login_lockout");


// Did we hit lockout for the first time? Send the unlock email to the administrator
if($loginattempts['loginattempts'] == $mybb->settings['maxloginattempts'])


// Did we hit lockout for the first time? Send the unlock email to the administrator
if($loginattempts['loginattempts'] == $mybb->settings['maxloginattempts'])

Zeile 430Zeile 446
							++$matches;
}
if($matches == ADMIN_IP_SEGMENTS)

							++$matches;
}
if($matches == ADMIN_IP_SEGMENTS)

						{
$valid_ip = true;
break;
}
}

// IP doesn't match properly - show message on logon screen
if(!$valid_ip)
{
$login_message = $lang->error_invalid_ip;
unset($mybb->user);

						{
$valid_ip = true;
break;
}
}

// IP doesn't match properly - show message on logon screen
if(!$valid_ip)
{
$login_message = $lang->error_invalid_ip;
unset($mybb->user);

					}
}
else if(ADMIN_IPV6_SEGMENTS > 0 && strpos($ip_address, ':') !== false)

					}
}
else if(ADMIN_IPV6_SEGMENTS > 0 && strpos($ip_address, ':') !== false)

Zeile 458Zeile 474
					for($i = 0; $i < ADMIN_IPV6_SEGMENTS; ++$i)
{
if($exploded_ip[$i] == $exploded_admin_ip[$i])

					for($i = 0; $i < ADMIN_IPV6_SEGMENTS; ++$i)
{
if($exploded_ip[$i] == $exploded_admin_ip[$i])

						{

						{

							++$matches;
}
if($matches == ADMIN_IPV6_SEGMENTS)

							++$matches;
}
if($matches == ADMIN_IPV6_SEGMENTS)

Zeile 482Zeile 498

if($mybb->input['action'] == "logout" && $mybb->user)
{


if($mybb->input['action'] == "logout" && $mybb->user)
{

 
	$plugins->run_hooks("admin_logout");


	if(verify_post_check($mybb->input['my_post_key']))
{
$db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");

	if(verify_post_check($mybb->input['my_post_key']))
{
$db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");