Vergleich admin/index.php - 1.8.6 - 1.8.8

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 11Zeile 11
define("IN_MYBB", 1);
define("IN_ADMINCP", 1);


define("IN_MYBB", 1);
define("IN_ADMINCP", 1);


// Here you can change how much of an Admin CP IP address must match in a previous session for the user is validated (defaults to 3 which matches a.b.c)

// Here you can change how much of an Admin CP IP address must match in a previous session for the user is validated (e.g. 3 means a.b.c need to match)

define("ADMIN_IP_SEGMENTS", 0);

define("ADMIN_IP_SEGMENTS", 0);

 
define("ADMIN_IPV6_SEGMENTS", 0);


require_once dirname(dirname(__FILE__))."/inc/init.php";

$shutdown_queries = $shutdown_functions = array();

send_page_headers();


require_once dirname(dirname(__FILE__))."/inc/init.php";

$shutdown_queries = $shutdown_functions = array();

send_page_headers();

 

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


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 50Zeile 53

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


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

 
$lang->load("messages", true);


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


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

Zeile 115Zeile 119
		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'])

	}

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

// If we're good to go

		$query = $db->simple_select("awaitingactivation", "COUNT(aid) AS num", "uid='".(int)$user['uid']."' AND code='".$db->escape_string($mybb->input['token'])."' AND type='l'");

// If we're good to go

Zeile 143Zeile 147
{
// We have an adminsid cookie?
if(isset($mybb->cookies['adminsid']))

{
// 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');

		// Check admin session
$query = $db->simple_select("adminsessions", "sid", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");
$admin_session = $db->fetch_field($query, 'sid');

Zeile 154Zeile 158
			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");





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

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

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

Zeile 237Zeile 241

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



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


		$sid = md5(uniqid(microtime(true), true));

		$sid = md5(random_str(50));


$useragent = $_SERVER['HTTP_USER_AGENT'];


$useragent = $_SERVER['HTTP_USER_AGENT'];

		if(my_strlen($useragent) > 100)

		if(my_strlen($useragent) > 200)

		{

		{

			$useragent = my_substr($useragent, 0, 100);

			$useragent = my_substr($useragent, 0, 200);

		}

// Create a new admin session for this user

		}

// Create a new admin session for this user

Zeile 262Zeile 266
		// Only reset the loginattempts when we're really logged in and the user doesn't need to enter a 2fa code
$query = $db->simple_select("adminoptions", "authsecret", "uid='{$mybb->user['uid']}'");
$admin_options = $db->fetch_array($query);

		// Only reset the loginattempts when we're really logged in and the user doesn't need to enter a 2fa code
$query = $db->simple_select("adminoptions", "authsecret", "uid='{$mybb->user['uid']}'");
$admin_options = $db->fetch_array($query);

		if(empty($admin_options['authsecret']))

		if(empty($admin_options['authsecret']))

		{
$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']}'");
}

Zeile 292Zeile 296

// 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]);
}


Zeile 310Zeile 314
	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')));





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

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

Zeile 383Zeile 387
			$mybb->user = get_user($admin_session['uid']);

// Login key has changed - force logout

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

// Login key has changed - force logout

			if(!$mybb->user['uid'] || $mybb->user['loginkey'] != $admin_session['loginkey'])

			if(!$mybb->user['uid'] || $mybb->user['loginkey'] !== $admin_session['loginkey'])

			{
unset($mybb->user);
}

			{
unset($mybb->user);
}

Zeile 397Zeile 401
					unset($mybb->user);
}
// If IP matching is set - check IP address against the session IP

					unset($mybb->user);
}
// If IP matching is set - check IP address against the session IP

				else if(ADMIN_IP_SEGMENTS > 0)

				else if(ADMIN_IP_SEGMENTS > 0 && strpos($ip_address, ':') === false)

				{
$exploded_ip = explode(".", $ip_address);

				{
$exploded_ip = explode(".", $ip_address);

					$exploded_admin_ip = explode(".", $admin_session['ip']);

					$exploded_admin_ip = explode(".", my_inet_ntop($admin_session['ip']));

					$matches = 0;
$valid_ip = false;
for($i = 0; $i < ADMIN_IP_SEGMENTS; ++$i)

					$matches = 0;
$valid_ip = false;
for($i = 0; $i < ADMIN_IP_SEGMENTS; ++$i)

Zeile 410Zeile 414
							++$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);
}
}
else if(ADMIN_IPV6_SEGMENTS > 0 && strpos($ip_address, ':') !== false)
{
// Expand IPv6 addresses
$hex = unpack("H*hex", my_inet_pton($ip_address));
$expanded_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex['hex']), 0, -1);
$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);
$exploded_admin_ip = explode(":", $expanded_admin_ip);
$matches = 0;
$valid_ip = false;
for($i = 0; $i < ADMIN_IPV6_SEGMENTS; ++$i)
{
if($exploded_ip[$i] == $exploded_admin_ip[$i])
{
++$matches;
}
if($matches == ADMIN_IPV6_SEGMENTS)

						{
$valid_ip = true;
break;

						{
$valid_ip = true;
break;

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

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

	}

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

Zeile 751Zeile 788
	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(!isset($mybb->input['my_post_key']) || $mybb->post_code !== $mybb->input['my_post_key'])

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

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