Vergleich admin/index.php - 1.8.21 - 1.8.35

  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 67Zeile 63
$errors = null;

if(is_dir(MYBB_ROOT."install") && !file_exists(MYBB_ROOT."install/lock"))

$errors = null;

if(is_dir(MYBB_ROOT."install") && !file_exists(MYBB_ROOT."install/lock"))

{

{

	$mybb->trigger_generic_error("install_directory");
}

	$mybb->trigger_generic_error("install_directory");
}





$ip_address = get_ip();
unset($user);

// Load Admin CP style
if(!isset($cp_style))

$ip_address = get_ip();
unset($user);

// Load Admin CP style
if(!isset($cp_style))

{

{

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

	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;


Zeile 111Zeile 107
	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;

			$error = $lang->error_invalid_username;

		}
}

		}
}

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

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

	// Do we have the token? If so let's process it
if($mybb->input['token'] && $user['uid'])
{

Zeile 138Zeile 134
		{
$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']."'");

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


admin_redirect("index.php");
}

		else
{
$error = $lang->error_invalid_token;

		else
{
$error = $lang->error_invalid_token;

Zeile 176Zeile 172
	{
case 0: // Username only
$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username);

	{
case 0: // Username only
$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username);

			break;

			break;

		case 1: // Email only
$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_email);

		case 1: // Email only
$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_email);

			break;

			break;

		case 2: // Username and email
default:
$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username_and_password);
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");

		$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)
{
// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 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']."'");
}


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


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 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, "lax");

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

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


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


Zeile 332Zeile 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);
}

Zeile 342Zeile 344
	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");


		$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 367Zeile 369
			if($loginattempts['loginattempts'] == $mybb->settings['maxloginattempts'])
{
$db->delete_query("awaitingactivation", "uid='".(int)$login_user['uid']."' AND type='l'");

			if($loginattempts['loginattempts'] == $mybb->settings['maxloginattempts'])
{
$db->delete_query("awaitingactivation", "uid='".(int)$login_user['uid']."' AND type='l'");

				$lockout_array = array(

				$lockout_array = array(

					"uid" => $login_user['uid'],
"dateline" => TIME_NOW,
"code" => random_str(),

					"uid" => $login_user['uid'],
"dateline" => TIME_NOW,
"code" => random_str(),

Zeile 386Zeile 388
					'username' => $login_user['username'],
)
);

					'username' => $login_user['username'],
)
);





			$default_page->show_lockedout();
}


			$default_page->show_lockedout();
}


Zeile 405Zeile 407
	{
$query = $db->simple_select("adminsessions", "*", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");
$admin_session = $db->fetch_array($query);

	{
$query = $db->simple_select("adminsessions", "*", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");
$admin_session = $db->fetch_array($query);





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

		// 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 446Zeile 448
							++$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);

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

					}
}
else if(ADMIN_IPV6_SEGMENTS > 0 && strpos($ip_address, ':') !== false)

Zeile 482Zeile 484
							$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 499Zeile 501
if($mybb->input['action'] == "logout" && $mybb->user)
{
$plugins->run_hooks("admin_logout");

if($mybb->input['action'] == "logout" && $mybb->user)
{
$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 509Zeile 511
}

if(!isset($mybb->user['usergroup']))

}

if(!isset($mybb->user['usergroup']))

{

{

	$mybbgroups = 1;

	$mybbgroups = 1;

}

}

else

else

{

{

	$mybbgroups = $mybb->user['usergroup'].",".$mybb->user['additionalgroups'];

	$mybbgroups = $mybb->user['usergroup'].",".$mybb->user['additionalgroups'];

}

}

$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 536Zeile 542
{
$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'])

Zeile 546Zeile 569
	// 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
{
// If we have this error while retreiving it from an AJAX request, then send back a nice error
if(isset($mybb->input['ajax']) && $mybb->input['ajax'] == 1)

	}
else
{
// If we have this error while retreiving it from an AJAX request, then send back a nice error
if(isset($mybb->input['ajax']) && $mybb->input['ajax'] == 1)

		{

		{

			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 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 618Zeile 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 650Zeile 699
				)
);


				)
);


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