Vergleich admin/index.php - 1.8.7 - 1.8.33

  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";



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


Zeile 21Zeile 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 43Zeile 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");
}


Zeile 57Zeile 55
if(function_exists('mb_internal_encoding') && !empty($lang->settings['charset']))
{
	@mb_internal_encoding($lang->settings['charset']);

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

}

header("Content-type: text/html; charset={$lang->settings['charset']}");

}

header("Content-type: text/html; charset={$lang->settings['charset']}");


$time = TIME_NOW;
$errors = null;


$time = TIME_NOW;
$errors = null;

Zeile 103Zeile 101
{
	$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' => '*'));

Zeile 125Zeile 126
	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($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 144Zeile 147
}
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']))
	{

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

Zeile 153Zeile 158

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

 

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

		{

		{

			admin_redirect("index.php");
		}
	}

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

 
			admin_redirect("index.php");
		}
	}

	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'])
	{
		case 0: // Username only
			$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username);
			break;
		case 1: // Email only
			$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_email);
			break;
		case 2: // Username and email
		default:
			$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username_and_password);
			break;
	}


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

 

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

 

		$plugins->run_hooks("admin_login_incorrect_pin");


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

 

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

		{
			$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 !== 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 198Zeile 221
				$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);
			}

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


			log_admin_action(array(


			log_admin_action(array(

					'type' => 'admin_locked_out',
					'uid' => (int)$login_user['uid'],
					'username' => $login_user['username'],

 
					'type' => 'admin_locked_out',
					'uid' => (int)$login_user['uid'],
					'username' => $login_user['username'],

				)
			);

			$default_page->show_lockedout();
		}

				)
			);

			$default_page->show_lockedout();
		}

		else
		{

 
		else
		{

			$default_page->show_login($lang->error_invalid_secret_pin, "error");

			$default_page->show_login($login_lang_string, "error");

		}
	}


		}
	}


Zeile 224Zeile 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 237Zeile 260

			$default_page->show_lockedout();
		}

 

			$default_page->show_lockedout();
		}

 

		$plugins->run_hooks("admin_login_success");


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

		$sid = md5(random_str(50));

 

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

		$sid = md5(random_str(50));





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

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

Zeile 258Zeile 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 266Zeile 292
		$query = $db->simple_select("adminoptions", "authsecret", "uid='{$mybb->user['uid']}'");
		$admin_options = $db->fetch_array($query);
		if(empty($admin_options['authsecret']))

 
		$query = $db->simple_select("adminoptions", "authsecret", "uid='{$mybb->user['uid']}'");
		$admin_options = $db->fetch_array($query);
		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']}'");
		}


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


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

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

		$mybb->request_method = "get";

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

		$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 303Zeile 329
				{
					$params = explode("=", $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]);
					}

				}
			}

			admin_redirect("index.php".$query_string);

 
				}
			}

			admin_redirect("index.php".$query_string);

		}

		}

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





		$plugins->run_hooks("admin_login_fail");

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

			{

			{

				$db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'");
			}

 
				$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 341Zeile 376
					"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 374Zeile 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;
		}
		else

			$login_message = $lang->error_invalid_admin_session;
		}
		else

Zeile 386Zeile 421
			$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 400Zeile 435
					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;

 
					$matches = 0;
					$valid_ip = false;

					for($i = 0; $i < ADMIN_IP_SEGMENTS; ++$i)

































					for($i = 0; $i < ADMIN_IP_SEGMENTS; ++$i)
					{
						if($exploded_ip[$i] == $exploded_admin_ip[$i])
						{
							++$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($exploded_ip[$i] == $exploded_admin_ip[$i])
						{
							++$matches;

						}
						if($matches == ADMIN_IP_SEGMENTS)

						}
						if($matches == ADMIN_IPV6_SEGMENTS)

						{
							$valid_ip = true;
							break;

						{
							$valid_ip = true;
							break;

Zeile 433Zeile 500

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

 

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

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



	$plugins->run_hooks("admin_logout");

	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 451Zeile 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($mybb->usergroup['cancp'] != 1 && !$is_super_admin || !$mybb->user['uid'])
{

Zeile 459Zeile 532
	if(isset($mybb->user['uid']))
	{
		$uid = (int)$mybb->user['uid'];

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

	}

	}

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

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

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

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

{

{

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






	// Only update language / theme once fully authenticated
	if(empty($admin_options['authsecret']) || $admin_session['authenticated'] == 1)
	{
		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'];
		}

	}

	// Update the session information in the DB

	}

	// Update the session information in the DB

Zeile 495Zeile 572

// Include the layout generation class overrides for this style
if(file_exists(MYBB_ADMIN_DIR."/styles/{$cp_style}/style.php"))

 

// Include the layout generation class overrides for this style
if(file_exists(MYBB_ADMIN_DIR."/styles/{$cp_style}/style.php"))

{

{

	require_once MYBB_ADMIN_DIR."/styles/{$cp_style}/style.php";
}


	require_once MYBB_ADMIN_DIR."/styles/{$cp_style}/style.php";
}


Zeile 514Zeile 591
	if(!class_exists($style_name))
	{
		eval("class {$style_name} extends {$default_name} { }");

 
	if(!class_exists($style_name))
	{
		eval("class {$style_name} extends {$default_name} { }");

	}
}


	}
}


$page = new Page;
$page->style = $cp_style;


$page = new Page;
$page->style = $cp_style;


Zeile 529Zeile 606
	}
	elseif($fail_check == 1)
	{

 
	}
	elseif($fail_check == 1)
	{

		$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 1: // Email only
				$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_email);
				break;
			case 2: // Username and email
			default:
				$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username_and_password);
				break;
		}


 
		$page->show_login($login_lang_string, "error");
	}
	else

		$page->show_login($login_lang_string, "error");
	}
	else

Zeile 592Zeile 653
		$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 607Zeile 667
		$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 755Zeile 815
	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;