| Zeile 45 | Zeile 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 162 | Zeile 158 |
|---|
// Session found: redirect to index
if($admin_session)
|
// Session found: redirect to index
if($admin_session)
|
{
| {
|
admin_redirect("index.php");
|
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");
|
|
|
// Determine login method
$login_lang_string = $lang->error_invalid_username_password;
switch($mybb->settings['username_method'])
|
// Determine login method
$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 0: // Username only
$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username);
break;
|
| Zeile 185 | Zeile 181 |
|---|
$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username_and_password);
break;
}
|
$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']))
{
| // Validate PIN first
if(!empty($config['secret_pin']) && (empty($mybb->input['pin']) || $mybb->input['pin'] != $config['secret_pin']))
{
|
| Zeile 194 | Zeile 190 |
|---|
$plugins->run_hooks("admin_login_incorrect_pin");
if($login_user['uid'] > 0)
|
$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']."'");
}
// 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']);
| {
$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'])
{
$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);
}
| $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);
}
|
| Zeile 251 | Zeile 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 287 | Zeile 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 299 | Zeile 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 332 | Zeile 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);
|
}
}
else
{
| }
}
else
{
|
$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));
|
$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 399 | Zeile 401 |
|---|
if(!isset($mybb->cookies['adminsid']))
{
$login_message = "";
|
if(!isset($mybb->cookies['adminsid']))
{
$login_message = "";
|
}
| }
|
// Otherwise, check admin session
else
{
| // Otherwise, check admin session
else
{
|
| Zeile 407 | Zeile 409 |
|---|
$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 417 | Zeile 419 |
|---|
// 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 440 | Zeile 442 |
|---|
$matches = 0;
$valid_ip = false;
for($i = 0; $i < ADMIN_IP_SEGMENTS; ++$i)
|
$matches = 0;
$valid_ip = false;
for($i = 0; $i < ADMIN_IP_SEGMENTS; ++$i)
|
{
| {
|
if($exploded_ip[$i] == $exploded_admin_ip[$i])
|
if($exploded_ip[$i] == $exploded_admin_ip[$i])
|
{
| {
|
++$matches;
|
++$matches;
|
}
| }
|
if($matches == ADMIN_IP_SEGMENTS)
|
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)
{
// Expand IPv6 addresses
| else if(ADMIN_IPV6_SEGMENTS > 0 && strpos($ip_address, ':') !== false)
{
// Expand IPv6 addresses
|
| Zeile 466 | Zeile 468 |
|---|
$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);
|
$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;
| $exploded_ip = explode(":", $expanded_ip);
$exploded_admin_ip = explode(":", $expanded_admin_ip);
$matches = 0;
|
| Zeile 493 | Zeile 495 |
|---|
}
}
}
|
}
}
}
|
}
}
| }
}
|
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 518 | Zeile 520 |
|---|
}
$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 540 | Zeile 546 |
|---|
// Only update language / theme once fully authenticated
if(empty($admin_options['authsecret']) || $admin_session['authenticated'] == 1)
{
|
// Only update language / theme once fully authenticated
if(empty($admin_options['authsecret']) || $admin_session['authenticated'] == 1)
{
|
if(!empty($admin_options['cplanguage']) && file_exists(MYBB_ROOT."inc/languages/".$admin_options['cplanguage']."/admin/home_dashboard.lang.php"))
| if(!empty($admin_options['cplanguage']))
|
{
$cp_language = $admin_options['cplanguage'];
$lang->set_language($cp_language, "admin");
| {
$cp_language = $admin_options['cplanguage'];
$lang->set_language($cp_language, "admin");
|
| Zeile 661 | Zeile 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 809 | Zeile 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(!verify_post_check($mybb->input['my_post_key'], true))
| 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;
|