Vergleich admin/index.php - 1.8.9 - 1.8.16

  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;
}
}
else if($mybb->input['uid'])

			$error = $lang->error_invalid_username;
}
}
else if($mybb->input['uid'])

	{

	{

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

		$user = get_user($mybb->input['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)

		{

		{

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

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

		else
{
$error = $lang->error_invalid_token;

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

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

Zeile 182Zeile 190
	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(!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);


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


		}

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


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

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

Zeile 197Zeile 207
			if($loginattempts['loginlockoutexpiry'] == 0)
{
$db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'");

			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 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 287Zeile 299
			$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, "lax");

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


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


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)

		{

		{

			$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 346Zeile 360
			{
$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 446Zeile 462
				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 460Zeile 476
						if($exploded_ip[$i] == $exploded_admin_ip[$i])
{
++$matches;

						if($exploded_ip[$i] == $exploded_admin_ip[$i])
{
++$matches;

						}

						}

						if($matches == ADMIN_IPV6_SEGMENTS)
{
$valid_ip = true;
break;
}

						if($matches == ADMIN_IPV6_SEGMENTS)
{
$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 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'])."'");

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

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

	{

	{

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

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

Zeile 518Zeile 536
{
$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'];
}

 

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


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

	}


	}


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

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

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

	}
elseif($fail_check == 1)
{

	}
elseif($fail_check == 1)
{

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

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

	}
else
{

	}
else
{

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

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

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

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

	}
}


	}
}


Zeile 672Zeile 650
				)
);


				)
);


			$page->show_lockedout();

			$default_page->show_lockedout();

		}

		}





		// Still here? Show a custom login page

		// Still here? Show a custom login page

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

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

	$page->show_2fa();






































	$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 = new Page;
$page->style = $cp_style;


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



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