Vergleich admin/index.php - 1.8.18 - 1.8.30

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


Zeile 78Zeile 74
if(!isset($cp_style))
{
if(!empty($mybb->settings['cpstyle']) && file_exists(MYBB_ADMIN_DIR."/styles/".$mybb->settings['cpstyle']."/main.css"))

if(!isset($cp_style))
{
if(!empty($mybb->settings['cpstyle']) && file_exists(MYBB_ADMIN_DIR."/styles/".$mybb->settings['cpstyle']."/main.css"))

	{

	{

		$cp_style = $mybb->settings['cpstyle'];

		$cp_style = $mybb->settings['cpstyle'];

	}

	}

	else
{
$cp_style = "default";

	else
{
$cp_style = "default";

	}
}

$default_page = new DefaultPage;


	}
}

$default_page = new DefaultPage;


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

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

Zeile 98Zeile 94
	if(!isset($mybb->input[$input]))
{
$mybb->input[$input] = '';

	if(!isset($mybb->input[$input]))
{
$mybb->input[$input] = '';

	}

	}

}

if($mybb->input['action'] == "unlock")

}

if($mybb->input['action'] == "unlock")

Zeile 128Zeile 124

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

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

		$plugins->run_hooks("admin_unlock_end");

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

		{

		{

			$db->delete_query("awaitingactivation", "uid='".(int)$user['uid']."' AND code='".$db->escape_string($mybb->input['token'])."' AND type='l'");
$db->update_query("adminoptions", array('loginlockoutexpiry' => 0, 'loginattempts' => 0), "uid='".(int)$user['uid']."'");

admin_redirect("index.php");
}
else

			$db->delete_query("awaitingactivation", "uid='".(int)$user['uid']."' AND code='".$db->escape_string($mybb->input['token'])."' AND type='l'");
$db->update_query("adminoptions", array('loginlockoutexpiry' => 0, 'loginattempts' => 0), "uid='".(int)$user['uid']."'");

admin_redirect("index.php");
}
else

		{

		{

			$error = $lang->error_invalid_token;
}
}

			$error = $lang->error_invalid_token;
}
}

Zeile 164Zeile 160
		if($admin_session)
{
admin_redirect("index.php");

		if($admin_session)
{
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");

Zeile 188Zeile 184

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

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


	{
$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 !== false && $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 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 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 345Zeile 342

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

			{

			{

				$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

			$plugins->run_hooks("admin_login_lockout");

// Did we hit lockout for the first time? Send the unlock email to the administrator

Zeile 369Zeile 366
				$db->delete_query("awaitingactivation", "uid='".(int)$login_user['uid']."' AND type='l'");
$lockout_array = array(
"uid" => $login_user['uid'],

				$db->delete_query("awaitingactivation", "uid='".(int)$login_user['uid']."' AND type='l'");
$lockout_array = array(
"uid" => $login_user['uid'],

					"dateline" => TIME_NOW,
"code" => random_str(),
"type" => "l"

					"dateline" => TIME_NOW,
"code" => random_str(),
"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);

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

			}

			}


log_admin_action(array(
'type' => 'admin_locked_out',


log_admin_action(array(
'type' => 'admin_locked_out',

Zeile 397Zeile 394
{
// No admin session - show message on the login screen
if(!isset($mybb->cookies['adminsid']))

{
// No admin session - show message on the login screen
if(!isset($mybb->cookies['adminsid']))

	{

	{

		$login_message = "";
}
// Otherwise, check admin session

		$login_message = "";
}
// Otherwise, check admin session

Zeile 407Zeile 404
		$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 417Zeile 414

// Fetch the user from the admin session
$mybb->user = get_user($admin_session['uid']);


// Fetch the user from the admin session
$mybb->user = get_user($admin_session['uid']);





			// Login key has changed - force logout
if(!$mybb->user['uid'] || $mybb->user['loginkey'] !== $admin_session['loginkey'])
{

			// Login key has changed - force logout
if(!$mybb->user['uid'] || $mybb->user['loginkey'] !== $admin_session['loginkey'])
{

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

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

						{
$valid_ip = true;
break;
}
}


						{
$valid_ip = true;
break;
}
}


					// IP doesn't match properly - show message on logon screen
if(!$valid_ip)
{

					// IP doesn't match properly - show message on logon screen
if(!$valid_ip)
{

Zeile 500Zeile 497
{
$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 515
}
$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 530Zeile 531
	$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(!empty($mybb->user['uid']))

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

 

// 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
if($admin_session['sid'])


// Update the session information in the DB
if($admin_session['sid'])

	{

	{

		$db->update_query("adminsessions", array('lastactive' => TIME_NOW, 'ip' => $db->escape_binary(my_inet_pton(get_ip()))), "sid='".$db->escape_string($admin_session['sid'])."'");

		$db->update_query("adminsessions", array('lastactive' => TIME_NOW, 'ip' => $db->escape_binary(my_inet_pton(get_ip()))), "sid='".$db->escape_string($admin_session['sid'])."'");

	}

	}


// Fetch administrator permissions
$mybb->admin['permissions'] = get_admin_permissions($mybb->user['uid']);
}


// Fetch administrator permissions
$mybb->admin['permissions'] = get_admin_permissions($mybb->user['uid']);
}

 

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

// Check if any of the layout generation classes we can override exist in the style file
$classes = array(
"Page" => "DefaultPage",
"SidebarItem" => "DefaultSidebarItem",
"PopupMenu" => "DefaultPopupMenu",
"Table" => "DefaultTable",
"Form" => "DefaultForm",
"FormContainer" => "DefaultFormContainer"
);
foreach($classes as $style_name => $default_name)
{
// Style does not have this layout generation class, create it
if(!class_exists($style_name))
{
eval("class {$style_name} extends {$default_name} { }");
}
}

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


// Do not have a valid Admin user, throw back to login page.
if(!isset($mybb->user['uid']) || $logged_out == true)
{
if($logged_out == true)
{


// Do not have a valid Admin user, throw back to login page.
if(!isset($mybb->user['uid']) || $logged_out == true)
{
if($logged_out == true)
{

		$default_page->show_login($lang->success_logged_out);

		$page->show_login($lang->success_logged_out);

	}
elseif($fail_check == 1)
{

	}
elseif($fail_check == 1)
{

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

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

	}
else
{

	}
else
{

Zeile 566Zeile 611
			echo json_encode(array("errors" => array("login")));
exit;
}

			echo json_encode(array("errors" => array("login")));
exit;
}

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

		$page->show_login($login_message, "error");

	}
}


	}
}


Zeile 603Zeile 648
		$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
{
// Wrong code -> close session (aka logout)
$db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");
my_unsetcookie('adminsid');

	}
else
{
// Wrong code -> close session (aka logout)
$db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");
my_unsetcookie('adminsid');





		// Now test whether we need to lock this guy completly
$db->update_query("adminoptions", array("loginattempts" => "loginattempts+1"), "uid='{$mybb->user['uid']}'", '', true);

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

// Have we attempted too many times?

		// Now test whether we need to lock this guy completly
$db->update_query("adminoptions", array("loginattempts" => "loginattempts+1"), "uid='{$mybb->user['uid']}'", '', true);

$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 650Zeile 694
				)
);


				)
);


			$default_page->show_lockedout();

			$page->show_lockedout();

		}

// Still here? Show a custom login page

		}

// Still here? Show a custom login page

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


		$page->show_login($lang->my2fa_failed, "error");
}
}


// Show our 2FA page
if(!empty($admin_options['authsecret']) && $admin_session['authenticated'] != 1)
{

// Show our 2FA page
if(!empty($admin_options['authsecret']) && $admin_session['authenticated'] != 1)
{

	$default_page->show_2fa();
}

// Now the user is fully authenticated setup their personal options
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'];
}

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

// Check if any of the layout generation classes we can override exist in the style file
$classes = array(
"Page" => "DefaultPage",
"SidebarItem" => "DefaultSidebarItem",
"PopupMenu" => "DefaultPopupMenu",
"Table" => "DefaultTable",
"Form" => "DefaultForm",
"FormContainer" => "DefaultFormContainer"
);
foreach($classes as $style_name => $default_name)
{
// Style does not have this layout generation class, create it
if(!class_exists($style_name))
{
eval("class {$style_name} extends {$default_name} { }");
}

	$page->show_2fa();






































}

}


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

 

$page->add_breadcrumb_item($lang->home, "index.php");



$page->add_breadcrumb_item($lang->home, "index.php");


Zeile 806Zeile 810
	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;