| Zeile 11 | Zeile 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');
header('Referrer-Policy: no-referrer');
|
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 41 | 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");
}
// Load global language phrases
$lang->load("global");
|
$lang->set_language($mybb->settings['cplanguage'], "admin");
}
// Load global language phrases
$lang->load("global");
|
| $lang->load("messages", true);
|
if(function_exists('mb_internal_encoding') && !empty($lang->settings['charset']))
{
@mb_internal_encoding($lang->settings['charset']);
|
if(function_exists('mb_internal_encoding') && !empty($lang->settings['charset']))
{
@mb_internal_encoding($lang->settings['charset']);
|
}
header("Content-type: text/html; charset={$lang->settings['charset']}");
| }
header("Content-type: text/html; charset={$lang->settings['charset']}");
|
$time = TIME_NOW;
$errors = null;
if(is_dir(MYBB_ROOT."install") && !file_exists(MYBB_ROOT."install/lock"))
{
$mybb->trigger_generic_error("install_directory");
|
$time = TIME_NOW;
$errors = null;
if(is_dir(MYBB_ROOT."install") && !file_exists(MYBB_ROOT."install/lock"))
{
$mybb->trigger_generic_error("install_directory");
|
}
| }
|
$ip_address = get_ip();
unset($user);
|
$ip_address = get_ip();
unset($user);
|
| Zeile 79 | Zeile 80 |
|---|
else
{
$cp_style = "default";
|
else
{
$cp_style = "default";
|
}
}
$default_page = new DefaultPage;
| }
}
$default_page = new DefaultPage;
|
$logged_out = false;
$fail_check = 0;
|
$logged_out = false;
$fail_check = 0;
|
| Zeile 100 | Zeile 101 |
|---|
{
$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;
}
}
| $error = $lang->error_invalid_username;
}
}
|
| Zeile 113 | Zeile 117 |
|---|
{
$user = get_user($mybb->input['uid']);
if(!$user['uid'])
|
{
$user = get_user($mybb->input['uid']);
if(!$user['uid'])
|
{
| {
|
$error = $lang->error_invalid_uid;
}
}
| $error = $lang->error_invalid_uid;
}
}
|
| Zeile 122 | Zeile 126 |
|---|
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'");
|
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)
{
$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']."'");
|
// 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");
|
admin_redirect("index.php");
|
}
| }
|
else
{
$error = $lang->error_invalid_token;
}
}
|
else
{
$error = $lang->error_invalid_token;
}
}
|
|
|
$default_page->show_lockout_unlock($error, 'error');
}
elseif($mybb->input['do'] == "login")
{
|
$default_page->show_lockout_unlock($error, 'error');
}
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']))
|
{
| {
|
// Check admin session
$query = $db->simple_select("adminsessions", "sid", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");
$admin_session = $db->fetch_field($query, 'sid');
| // Check admin session
$query = $db->simple_select("adminsessions", "sid", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");
$admin_session = $db->fetch_field($query, 'sid');
|
| Zeile 152 | Zeile 160 |
|---|
if($admin_session)
{
admin_redirect("index.php");
|
if($admin_session)
{
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'])
{
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']))
{
|
// Validate PIN first
if(!empty($config['secret_pin']) && (empty($mybb->input['pin']) || $mybb->input['pin'] != $config['secret_pin']))
{
|
$default_page->show_login($lang->error_invalid_secret_pin, "error");
| $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);
}
$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);
}
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 170 | Zeile 243 |
|---|
));
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']);
}
|
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 187 | Zeile 260 |
|---|
$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']}'");
|
$sid = md5(uniqid(microtime(true), true));
| $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 208 | 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();
// Only reset the loginattempts when we're really logged in and the user doesn't need to enter a 2fa code
|
);
$db->insert_query("adminsessions", $admin_session);
$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']}'");
}
|
my_setcookie("adminsid", $sid, '', true);
| my_setcookie("adminsid", $sid, '', true, "strict");
|
my_setcookie('acploginattempts', 0);
$post_verify = false;
| my_setcookie('acploginattempts', 0);
$post_verify = false;
|
| Zeile 253 | 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]);
}
|
}
}
| }
}
|
| Zeile 264 | Zeile 345 |
|---|
{
$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')));
|
if($login_user['uid'] > 0)
| $plugins->run_hooks("admin_login_fail");
$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)
{
$db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'");
}
|
{
// 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']."'");
}
|
| |
$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 314 | Zeile 399 |
|---|
{
// No admin session - show message on the login screen
if(!isset($mybb->cookies['adminsid']))
|
{
// No admin session - show message on the login screen
if(!isset($mybb->cookies['adminsid']))
|
{
| {
|
$login_message = "";
}
// Otherwise, check admin session
| $login_message = "";
}
// Otherwise, check admin session
|
| Zeile 324 | 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 336 | Zeile 421 |
|---|
$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);
}
else
| unset($mybb->user);
}
else
|
| Zeile 350 | Zeile 435 |
|---|
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;
|
| Zeile 383 | Zeile 500 |
|---|
if($mybb->input['action'] == "logout" && $mybb->user)
{
|
if($mybb->input['action'] == "logout" && $mybb->user)
{
|
if(verify_post_check($mybb->input['my_post_key']))
| $plugins->run_hooks("admin_logout");
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 401 | 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'])
{
$uid = 0;
| if($mybb->usergroup['cancp'] != 1 && !$is_super_admin || !$mybb->user['uid'])
{
$uid = 0;
|
| Zeile 419 | Zeile 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);
|
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
}
if(!empty($admin_options['cpstyle']) && file_exists(MYBB_ADMIN_DIR."/styles/{$admin_options['cpstyle']}/main.css"))
{
$cp_style = $admin_options['cpstyle'];
}
|
// 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 446 | Zeile 574 |
|---|
if(file_exists(MYBB_ADMIN_DIR."/styles/{$cp_style}/style.php"))
{
require_once MYBB_ADMIN_DIR."/styles/{$cp_style}/style.php";
|
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(
|
// Check if any of the layout generation classes we can override exist in the style file
$classes = array(
|
| Zeile 468 | Zeile 596 |
|---|
$page = new Page;
$page->style = $cp_style;
|
$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)
{
| // Do not have a valid Admin user, throw back to login page.
if(!isset($mybb->user['uid']) || $logged_out == true)
{
|
| Zeile 478 | Zeile 606 |
|---|
}
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
|
{
| {
|
// 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)
{
| // 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)
{
|
| Zeile 531 | Zeile 643 |
|---|
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 541 | Zeile 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 556 | 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 597 | Zeile 708 |
|---|
}
// 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 704 | 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(!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;
|