Vergleich admin/index.php - 1.6.9 - 1.6.10

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 62Zeile 62
unset($user);

// Load Admin CP style

 
unset($user);

// Load Admin CP style

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

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

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

 

foreach(array('action', 'do', 'module') as $input)
{
	if(!isset($mybb->input[$input]))
	{
		$mybb->input[$input] = '';
	}
}


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


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

Zeile 90Zeile 98
		if(!$user['uid'])
		{
			$error[] = $lang->error_invalid_username;

 
		if(!$user['uid'])
		{
			$error[] = $lang->error_invalid_username;

		}
	}

		}
	}

	else if($mybb->input['uid'])
	{
		$query = $db->simple_select("users", "*", "uid='".intval($mybb->input['uid'])."'");
		$user = $db->fetch_array($query);
		if(!$user['uid'])

 
	else if($mybb->input['uid'])
	{
		$query = $db->simple_select("users", "*", "uid='".intval($mybb->input['uid'])."'");
		$user = $db->fetch_array($query);
		if(!$user['uid'])

		{

		{

			$error[] = $lang->error_invalid_uid;
		}
	}

			$error[] = $lang->error_invalid_uid;
		}
	}

Zeile 109Zeile 117
		
		// 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='".intval($user['uid'])."' AND code='".$db->escape_string($mybb->input['token'])."' AND type='l'");
			$db->update_query("adminoptions", array('loginlockoutexpiry' => 0, 'loginattempts' => 0), "uid='".intval($user['uid'])."'");
			

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

Zeile 127Zeile 135
{	
	$user = validate_password_from_username($mybb->input['username'], $mybb->input['password']);
	if($user['uid'])

 
{	
	$user = validate_password_from_username($mybb->input['username'], $mybb->input['password']);
	if($user['uid'])

	{

	{

		$query = $db->simple_select("users", "*", "uid='".$user['uid']."'");
		$mybb->user = $db->fetch_array($query);
	}

		$query = $db->simple_select("users", "*", "uid='".$user['uid']."'");
		$mybb->user = $db->fetch_array($query);
	}

Zeile 165Zeile 173
		if(!empty($mybb->input['module']))
		{
			// $query_string should contain the module

 
		if(!empty($mybb->input['module']))
		{
			// $query_string should contain the module

			$query_string = '?module='.htmlspecialchars($mybb->input['module']);

			$query_string = '?module='.htmlspecialchars_uni($mybb->input['module']);

			
			// Now we look for any paramters passed in $_SERVER['QUERY_STRING']
			if($_SERVER['QUERY_STRING'])

			
			// Now we look for any paramters passed in $_SERVER['QUERY_STRING']
			if($_SERVER['QUERY_STRING'])

Zeile 189Zeile 197
				{
					$params = explode("=", $param);
					

				{
					$params = explode("=", $param);
					

					$query_string .= '&'.htmlspecialchars($params[0])."=".htmlspecialchars($params[1]);

					$query_string .= '&'.htmlspecialchars_uni($params[0])."=".htmlspecialchars_uni($params[1]);

				}
			}
		

				}
			}

Zeile 256Zeile 264
		// No matching admin session found - show message on login screen
		if(!$admin_session['sid'])
		{

 
		// No matching admin session found - show message on login screen
		if(!$admin_session['sid'])
		{

			$login_message = $lang->invalid_admin_session;

			$login_message = $lang->error_invalid_admin_session;

		}
		else
		{

		}
		else
		{

Zeile 317Zeile 325
	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'])."'");

		my_setcookie("adminsid", "");

		my_unsetcookie('adminsid');

		$logged_out = true;

 
		$logged_out = true;

	}
}

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

	}
}

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

{
	$mybbgroups = 1;

 
{
	$mybbgroups = 1;

}

}

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

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

Zeile 334Zeile 342

if($mybb->usergroup['cancp'] != 1 || !$mybb->user['uid'])
{

 

if($mybb->usergroup['cancp'] != 1 || !$mybb->user['uid'])
{

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






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

	unset($mybb->user);

 
	unset($mybb->user);

	my_setcookie("adminsid", "");

	my_unsetcookie('adminsid');

}

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

}

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

Zeile 346Zeile 359
	
	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"))
	{

		$page->style = $cp_style = $admin_options['cpstyle'];

		$cp_style = $admin_options['cpstyle'];

	}

	// Update the session information in the DB

	}

	// Update the session information in the DB

Zeile 387Zeile 400
$page->style = $cp_style;

// Do not have a valid Admin user, throw back to login page.

 
$page->style = $cp_style;

// Do not have a valid Admin user, throw back to login page.

if(!$mybb->user['uid'] || $logged_out == true)

if(!isset($mybb->user['uid']) || $logged_out == true)

{	
	if($logged_out == true)
	{

{	
	if($logged_out == true)
	{

Zeile 400Zeile 413
	else
	{
		// If we have this error while retreiving it from an AJAX request, then send back a nice error

 
	else
	{
		// If we have this error while retreiving it from an AJAX request, then send back a nice error

		if($mybb->input['ajax'] == 1)

		if(isset($mybb->input['ajax']) && $mybb->input['ajax'] == 1)

		{
			echo "<error>login</error>";
			die;

		{
			echo "<error>login</error>";
			die;

Zeile 467Zeile 480
else
{
	$current_module = explode("-", $mybb->input['module'], 2);

 
else
{
	$current_module = explode("-", $mybb->input['module'], 2);

 
}

if(!isset($current_module[1]))
{
	$current_module[1] = 'home';

}

if($mybb->input['module'] && isset($modules[$current_module[0]]))

}

if($mybb->input['module'] && isset($modules[$current_module[0]]))