Vergleich admin/index.php - 1.8.11 - 1.8.38

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 45Zeile 45

if(!isset($cp_language))
{


if(!isset($cp_language))
{

	if(!file_exists(MYBB_ROOT."inc/languages/".$mybb->settings['cplanguage']."/admin/home_dashboard.lang.php"))
{
$mybb->settings['cplanguage'] = "english";
}

 
	$lang->set_language($mybb->settings['cplanguage'], "admin");
}

	$lang->set_language($mybb->settings['cplanguage'], "admin");
}





// Load global language phrases
$lang->load("global");
$lang->load("messages", true);

if(function_exists('mb_internal_encoding') && !empty($lang->settings['charset']))

// Load global language phrases
$lang->load("global");
$lang->load("messages", true);

if(function_exists('mb_internal_encoding') && !empty($lang->settings['charset']))

{

{

	@mb_internal_encoding($lang->settings['charset']);
}


	@mb_internal_encoding($lang->settings['charset']);
}


Zeile 92Zeile 88
$logged_out = false;
$fail_check = 0;
$post_verify = true;

$logged_out = false;
$fail_check = 0;
$post_verify = true;





foreach(array('action', 'do', 'module') as $input)
{
if(!isset($mybb->input[$input]))

foreach(array('action', 'do', 'module') as $input)
{
if(!isset($mybb->input[$input]))

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


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


		if(!$user['uid'])

		if(!$user)

		{
$error = $lang->error_invalid_username;
}

		{
$error = $lang->error_invalid_username;
}

Zeile 120Zeile 116
	else if($mybb->input['uid'])
{
$user = get_user($mybb->input['uid']);

	else if($mybb->input['uid'])
{
$user = get_user($mybb->input['uid']);

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

		if(!$user)
{

			$error = $lang->error_invalid_uid;
}
}

			$error = $lang->error_invalid_uid;
}
}

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

// Have we attempted too many times?

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

// Have we attempted too many times?

		if($loginattempts['loginattempts'] > 0)

		if($loginattempts !== false && $loginattempts['loginattempts'] > 0)

		{
// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 0)

		{
// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 0)

Zeile 251Zeile 247
		$mybb->user = get_user($loginhandler->login_data['uid']);
}


		$mybb->user = get_user($loginhandler->login_data['uid']);
}


	if($mybb->user['uid'])

	if(!empty($mybb->user['uid']))

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

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

Zeile 267Zeile 263

$plugins->run_hooks("admin_login_success");



$plugins->run_hooks("admin_login_success");


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


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


		$sid = md5(random_str(50));

$useragent = $_SERVER['HTTP_USER_AGENT'];
if(my_strlen($useragent) > 200)
{
$useragent = my_substr($useragent, 0, 200);

		$sid = md5(random_str(50));

$useragent = $_SERVER['HTTP_USER_AGENT'];
if(my_strlen($useragent) > 200)
{
$useragent = my_substr($useragent, 0, 200);

		}


		}


		// Create a new admin session for this user
$admin_session = array(
"sid" => $sid,

		// Create a new admin session for this user
$admin_session = array(
"sid" => $sid,

Zeile 287Zeile 283
			"lastactive" => TIME_NOW,
"data" => my_serialize(array()),
"useragent" => $db->escape_string($useragent),

			"lastactive" => TIME_NOW,
"data" => my_serialize(array()),
"useragent" => $db->escape_string($useragent),

 
			"authenticated" => 0,

		);
$db->insert_query("adminsessions", $admin_session);
$admin_session['data'] = array();

		);
$db->insert_query("adminsessions", $admin_session);
$admin_session['data'] = array();

Zeile 299Zeile 296
			$db->update_query("adminoptions", array("loginattempts" => 0, "loginlockoutexpiry" => 0), "uid='{$mybb->user['uid']}'");
}


			$db->update_query("adminoptions", array("loginattempts" => 0, "loginlockoutexpiry" => 0), "uid='{$mybb->user['uid']}'");
}


		my_setcookie("adminsid", $sid, '', true);

		my_setcookie("adminsid", $sid, '', true, "strict");

		my_setcookie('acploginattempts', 0);
$post_verify = false;


		my_setcookie('acploginattempts', 0);
$post_verify = false;


Zeile 324Zeile 321

// Remove our first member if it's for the module
if(substr($parameters[0], 0, 8) == '?module=')


// Remove our first member if it's for the module
if(substr($parameters[0], 0, 8) == '?module=')

				{

				{

					unset($parameters[0]);
}

					unset($parameters[0]);
}





				foreach($parameters as $key => $param)
{
$params = explode("=", $param);


				foreach($parameters as $key => $param)
{
$params = explode("=", $param);


					$query_string .= '&'.htmlspecialchars_uni($params[0])."=".htmlspecialchars_uni($params[1]);






					$query_string .= '&'.htmlspecialchars_uni($params[0]);

if(isset($params[1]))
{
$query_string .= "=".htmlspecialchars_uni($params[1]);
}

				}
}


				}
}


Zeile 345Zeile 347

$plugins->run_hooks("admin_login_fail");



$plugins->run_hooks("admin_login_fail");


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


		$loginattempts = false;
if(!empty($login_user['uid']) && $login_user['uid'] > 0)

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

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

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

		}

		}


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

 

// Have we attempted too many times?


// Have we attempted too many times?

		if($loginattempts['loginattempts'] > 0)

		if($loginattempts !== false && $loginattempts['loginattempts'] > 0)

		{
// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 0)

		{
// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 0)

Zeile 407Zeile 409
		$admin_session = $db->fetch_array($query);

// No matching admin session found - show message on login screen

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

// No matching admin session found - show message on login screen

		if(!$admin_session['sid'])

		if(empty($admin_session) || !$admin_session['sid'])

		{
$login_message = $lang->error_invalid_admin_session;
}

		{
$login_message = $lang->error_invalid_admin_session;
}

Zeile 462Zeile 464
				else if(ADMIN_IPV6_SEGMENTS > 0 && strpos($ip_address, ':') !== false)
{
// Expand IPv6 addresses

				else if(ADMIN_IPV6_SEGMENTS > 0 && strpos($ip_address, ':') !== false)
{
// Expand IPv6 addresses

					$hex = unpack("H*hex", my_inet_pton($ip_address));         

					$hex = unpack("H*hex", my_inet_pton($ip_address));

					$expanded_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex['hex']), 0, -1);

					$expanded_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex['hex']), 0, -1);

					$hex_admin = unpack("H*hex", $admin_session['ip']);         

					$hex_admin = unpack("H*hex", $admin_session['ip']);

					$expanded_admin_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex_admin['hex']), 0, -1);

$exploded_ip = explode(":", $expanded_ip);

					$expanded_admin_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex_admin['hex']), 0, -1);

$exploded_ip = explode(":", $expanded_ip);

Zeile 500Zeile 502
{
$plugins->run_hooks("admin_logout");


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


	if(verify_post_check($mybb->input['my_post_key']))

	if(verify_post_check($mybb->get_input('my_post_key')))

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

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

Zeile 518Zeile 520
}
$mybb->usergroup = usergroup_permissions($mybbgroups);


}
$mybb->usergroup = usergroup_permissions($mybbgroups);


$is_super_admin = is_super_admin($mybb->user['uid']);





$is_super_admin = false;
if(isset($mybb->user['uid']))
{
$is_super_admin = is_super_admin($mybb->user['uid']);
}





if($mybb->usergroup['cancp'] != 1 && !$is_super_admin || !$mybb->user['uid'])

if(empty($mybb->usergroup['cancp']) && !$is_super_admin || !$mybb->user['uid'])

{
$uid = 0;
if(isset($mybb->user['uid']))

{
$uid = 0;
if(isset($mybb->user['uid']))

Zeile 530Zeile 536
	$db->delete_query("adminsessions", "uid = '{$uid}'");
unset($mybb->user);
my_unsetcookie('adminsid');

	$db->delete_query("adminsessions", "uid = '{$uid}'");
unset($mybb->user);
my_unsetcookie('adminsid');

 
	if($mybb->get_input('do') == 'login')
{
$login_message = $lang->error_mybb_not_admin_account;
}

}

if(!empty($mybb->user['uid']))

}

if(!empty($mybb->user['uid']))

Zeile 537Zeile 547
	$query = $db->simple_select("adminoptions", "*", "uid='".$mybb->user['uid']."'");
$admin_options = $db->fetch_array($query);


	$query = $db->simple_select("adminoptions", "*", "uid='".$mybb->user['uid']."'");
$admin_options = $db->fetch_array($query);


	if(!empty($admin_options['cplanguage']) && file_exists(MYBB_ROOT."inc/languages/".$admin_options['cplanguage']."/admin/home_dashboard.lang.php"))


	// Only update language / theme once fully authenticated
if(empty($admin_options['authsecret']) || $admin_session['authenticated'] == 1)

	{

	{

		$cp_language = $admin_options['cplanguage'];
$lang->set_language($cp_language, "admin");
$lang->load("global"); // Reload global language vars
$lang->load("messages", true);
}



		if(!empty($admin_options['cplanguage']))
{
$cp_language = $admin_options['cplanguage'];
$lang->set_language($cp_language, "admin");
$lang->load("global"); // Reload global language vars
$lang->load("messages", true);
}





	if(!empty($admin_options['cpstyle']) && file_exists(MYBB_ADMIN_DIR."/styles/{$admin_options['cpstyle']}/main.css"))
{
$cp_style = $admin_options['cpstyle'];


		if(!empty($admin_options['cpstyle']) && file_exists(MYBB_ADMIN_DIR."/styles/{$admin_options['cpstyle']}/main.css"))
{
$cp_style = $admin_options['cpstyle'];
}

	}

// Update the session information in the DB

	}

// Update the session information in the DB

Zeile 643Zeile 657
		$admin_session['authenticated'] = 1;
$db->update_query("adminoptions", array("loginattempts" => 0, "loginlockoutexpiry" => 0), "uid='{$mybb->user['uid']}'");
my_setcookie('acploginattempts', 0);

		$admin_session['authenticated'] = 1;
$db->update_query("adminoptions", array("loginattempts" => 0, "loginlockoutexpiry" => 0), "uid='{$mybb->user['uid']}'");
my_setcookie('acploginattempts', 0);

		// post would result in an authorization code mismatch error
$mybb->request_method = "get";

		admin_redirect("index.php");


	}
else
{

	}
else
{

Zeile 658Zeile 671
		$loginattempts = login_attempt_check_acp($mybb->user['uid'], true);

// Have we attempted too many times?

		$loginattempts = login_attempt_check_acp($mybb->user['uid'], true);

// Have we attempted too many times?

		if($loginattempts['loginattempts'] > 0)

		if($loginattempts !== false && $loginattempts['loginattempts'] > 0)

		{
// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 0)

		{
// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 0)

Zeile 806Zeile 819
	if($post_verify == true)
{
// If the post key does not match we switch the action to GET and set a message to show the user

	if($post_verify == true)
{
// If the post key does not match we switch the action to GET and set a message to show the user

		if(!isset($mybb->input['my_post_key']) || $mybb->post_code !== $mybb->input['my_post_key'])

		if(!verify_post_check($mybb->get_input('my_post_key'), true))

		{
$mybb->request_method = "get";
$page->show_post_verify_error = true;

		{
$mybb->request_method = "get";
$page->show_post_verify_error = true;