Vergleich admin/index.php - 1.8.4 - 1.8.9

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

$shutdown_queries = $shutdown_functions = array();

send_page_headers();


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

$shutdown_queries = $shutdown_functions = array();

send_page_headers();

 

header('X-Frame-Options: SAMEORIGIN');


if(!isset($config['admin_dir']) || !file_exists(MYBB_ROOT.$config['admin_dir']."/inc/class_page.php"))
{
$config['admin_dir'] = basename(dirname(__FILE__));


if(!isset($config['admin_dir']) || !file_exists(MYBB_ROOT.$config['admin_dir']."/inc/class_page.php"))
{
$config['admin_dir'] = basename(dirname(__FILE__));

}

define('MYBB_ADMIN_DIR', MYBB_ROOT.$config['admin_dir'].'/');

}

define('MYBB_ADMIN_DIR', MYBB_ROOT.$config['admin_dir'].'/');


define('COPY_YEAR', my_date('Y', TIME_NOW));



define('COPY_YEAR', my_date('Y', TIME_NOW));


Zeile 46Zeile 49
		$mybb->settings['cplanguage'] = "english";
}
$lang->set_language($mybb->settings['cplanguage'], "admin");

		$mybb->settings['cplanguage'] = "english";
}
$lang->set_language($mybb->settings['cplanguage'], "admin");

}

}


// Load global language phrases
$lang->load("global");


// Load global language phrases
$lang->load("global");

 
$lang->load("messages", true);


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


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

Zeile 60Zeile 64

$time = TIME_NOW;
$errors = null;


$time = TIME_NOW;
$errors = null;





if(is_dir(MYBB_ROOT."install") && !file_exists(MYBB_ROOT."install/lock"))
{
$mybb->trigger_generic_error("install_directory");

if(is_dir(MYBB_ROOT."install") && !file_exists(MYBB_ROOT."install/lock"))
{
$mybb->trigger_generic_error("install_directory");

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

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

	}
else

	}
else

	{
$cp_style = "default";
}

	{
$cp_style = "default";
}

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


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


	// Validate PIN first
if(!empty($config['secret_pin']) && (empty($mybb->input['pin']) || $mybb->input['pin'] != $config['secret_pin']))


	// Determine login method
$login_lang_string = $lang->error_invalid_username_password;
switch($mybb->settings['username_method'])

	{

	{

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































































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

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

// Did we hit lockout for the first time? Send the unlock email to the administrator
if($loginattempts['loginattempts'] == $mybb->settings['maxloginattempts'])
{
$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"
);
$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',
'uid' => (int)$login_user['uid'],
'username' => $login_user['username'],
)
);

$default_page->show_lockedout();
}
else
{
$default_page->show_login($login_lang_string, "error");
}

	}

$loginhandler->set_data(array(

	}

$loginhandler->set_data(array(

Zeile 170Zeile 237
	));

if($loginhandler->validate_login() == true)

	));

if($loginhandler->validate_login() == true)

	{

	{

		$mybb->user = get_user($loginhandler->login_data['uid']);
}


		$mybb->user = get_user($loginhandler->login_data['uid']);
}


Zeile 182Zeile 249
					'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();
}

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

$sid = md5(uniqid(microtime(true), true));


				)
);

$default_page->show_lockedout();
}

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

$sid = md5(random_str(50));


		$useragent = $_SERVER['HTTP_USER_AGENT'];

		$useragent = $_SERVER['HTTP_USER_AGENT'];

		if(my_strlen($useragent) > 100)

		if(my_strlen($useragent) > 200)

		{

		{

			$useragent = my_substr($useragent, 0, 100);

			$useragent = my_substr($useragent, 0, 200);

		}

// Create a new admin session for this user

		}

// Create a new admin session for this user

Zeile 213Zeile 280
		$admin_session['data'] = array();

// Only reset the loginattempts when we're really logged in and the user doesn't need to enter a 2fa code

		$admin_session['data'] = array();

// Only reset the loginattempts when we're really logged in and the user doesn't need to enter a 2fa code

		$query = $db->simple_select("adminoptions", "2fasecret", "uid='{$mybb->user['uid']}'");

		$query = $db->simple_select("adminoptions", "authsecret", "uid='{$mybb->user['uid']}'");

		$admin_options = $db->fetch_array($query);

		$admin_options = $db->fetch_array($query);

		if(empty($admin_options['2fasecret']))

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

Zeile 238Zeile 305
				$qstring = str_replace('action=logout', '', $qstring);
$qstring = preg_replace('#&+#', '&', $qstring);
$qstring = str_replace('?&', '?', $qstring);

				$qstring = str_replace('action=logout', '', $qstring);
$qstring = preg_replace('#&+#', '&', $qstring);
$qstring = str_replace('?&', '?', $qstring);





				// So what do we do? We know that parameters are devided by ampersands
// That means we must get to work!
$parameters = explode('&', $qstring);

// Remove our first member if it's for the module
if(substr($parameters[0], 0, 8) == '?module=')

				// So what do we do? We know that parameters are devided by ampersands
// That means we must get to work!
$parameters = explode('&', $qstring);

// Remove our first member if it's for the module
if(substr($parameters[0], 0, 8) == '?module=')

				{

				{

					unset($parameters[0]);
}

foreach($parameters as $key => $param)
{
$params = explode("=", $param);

					unset($parameters[0]);
}

foreach($parameters as $key => $param)
{
$params = explode("=", $param);





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

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

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

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

		}

		}

	}
else
{
$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));

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

	}
else
{
$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));

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 278Zeile 345
			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 308Zeile 375
		}

$fail_check = 1;

		}

$fail_check = 1;

	}
}

	}
}

else
{
// No admin session - show message on the login screen

else
{
// No admin session - show message on the login screen

Zeile 336Zeile 403
			$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 350Zeile 417
					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;
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;

					$matches = 0;
$valid_ip = false;

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

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

					}


					}


					// 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 388Zeile 487
		$db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");
my_unsetcookie('adminsid');
$logged_out = true;

		$db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");
my_unsetcookie('adminsid');
$logged_out = true;

	}
}


	}
}


if(!isset($mybb->user['usergroup']))
{
$mybbgroups = 1;

if(!isset($mybb->user['usergroup']))
{
$mybbgroups = 1;

Zeile 404Zeile 503
$is_super_admin = is_super_admin($mybb->user['uid']);

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

$is_super_admin = is_super_admin($mybb->user['uid']);

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

{

{

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

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

Zeile 425Zeile 524
		$cp_language = $admin_options['cplanguage'];
$lang->set_language($cp_language, "admin");
$lang->load("global"); // Reload global language vars

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

	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 444Zeile 544

// 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 458Zeile 558
	"FormContainer" => "DefaultFormContainer"
);
foreach($classes as $style_name => $default_name)

	"FormContainer" => "DefaultFormContainer"
);
foreach($classes as $style_name => $default_name)

{

{

	// Style does not have this layout generation class, create it
if(!class_exists($style_name))
{

	// Style does not have this layout generation class, create it
if(!class_exists($style_name))
{

Zeile 478Zeile 578
	}
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 531Zeile 615
	require_once MYBB_ROOT."inc/3rdparty/2fa/GoogleAuthenticator.php";
$auth = new PHPGangsta_GoogleAuthenticator;


	require_once MYBB_ROOT."inc/3rdparty/2fa/GoogleAuthenticator.php";
$auth = new PHPGangsta_GoogleAuthenticator;


	$test = $auth->verifyCode($admin_options['2fasecret'], $mybb->get_input('code'));

	$test = $auth->verifyCode($admin_options['authsecret'], $mybb->get_input('code'));


// Either the code was okay or it was a recovery code
if($test === true || $recovery === true)


// Either the code was okay or it was a recovery code
if($test === true || $recovery === true)

Zeile 597Zeile 681
}

// Show our 2FA page

}

// Show our 2FA page

if(!empty($admin_options['2fasecret']) && $admin_session['authenticated'] != 1)

if(!empty($admin_options['authsecret']) && $admin_session['authenticated'] != 1)

{
$page->show_2fa();
}

{
$page->show_2fa();
}

Zeile 704Zeile 788
	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(!isset($mybb->input['my_post_key']) || $mybb->post_code !== $mybb->input['my_post_key'])

		{
$mybb->request_method = "get";
$page->show_post_verify_error = true;

		{
$mybb->request_method = "get";
$page->show_post_verify_error = true;