| 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 67 | Zeile 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;
|
|
|
$logged_out = false;
$fail_check = 0;
$post_verify = true;
foreach(array('action', 'do', 'module') as $input)
|
$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(!isset($mybb->input[$input]))
{
$mybb->input[$input] = '';
|
| Zeile 112 | Zeile 108 |
|---|
{
$user = get_user_by_username($mybb->input['username'], array('fields' => '*'));
|
{
$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 121 | 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 144 | Zeile 140 |
|---|
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")
|
| Zeile 179 | Zeile 175 |
|---|
break;
case 1: // Email only
$login_lang_string = $lang->sprintf($login_lang_string, $lang->login_email);
|
break;
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']))
|
// 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");
if($login_user['uid'] > 0)
| {
$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);
}
| {
$db->update_query("adminoptions", array("loginattempts" => "loginattempts+1"), "uid='".(int)$login_user['uid']."'", '', true);
}
|
| Zeile 201 | Zeile 197 |
|---|
$loginattempts = login_attempt_check_acp($login_user['uid'], true);
// Have we attempted too many times?
|
$loginattempts = login_attempt_check_acp($login_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 230 | Zeile 226 |
|---|
'type' => 'admin_locked_out',
'uid' => (int)$login_user['uid'],
'username' => $login_user['username'],
|
'type' => 'admin_locked_out',
'uid' => (int)$login_user['uid'],
'username' => $login_user['username'],
|
)
);
| )
);
|
$default_page->show_lockedout();
|
$default_page->show_lockedout();
|
}
| }
|
else
{
$default_page->show_login($login_lang_string, "error");
}
|
else
{
$default_page->show_login($login_lang_string, "error");
}
|
}
| }
|
$loginhandler->set_data(array(
'username' => $mybb->input['username'],
'password' => $mybb->input['password']
| $loginhandler->set_data(array(
'username' => $mybb->input['username'],
'password' => $mybb->input['password']
|
| 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 268 | Zeile 264 |
|---|
$plugins->run_hooks("admin_login_success");
$db->delete_query("adminsessions", "uid='{$mybb->user['uid']}'");
|
$plugins->run_hooks("admin_login_success");
$db->delete_query("adminsessions", "uid='{$mybb->user['uid']}'");
|
|
|
$sid = md5(random_str(50));
$useragent = $_SERVER['HTTP_USER_AGENT'];
| $sid = md5(random_str(50));
$useragent = $_SERVER['HTTP_USER_AGENT'];
|
| 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);
| my_setcookie("adminsid", $sid, '', true, "lax");
|
my_setcookie('acploginattempts', 0);
$post_verify = false;
| my_setcookie('acploginattempts', 0);
$post_verify = false;
|
| Zeile 345 | Zeile 342 |
|---|
$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 407 | Zeile 404 |
|---|
$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 462 | Zeile 459 |
|---|
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
|
$hex = unpack("H*hex", my_inet_pton($ip_address));
| $hex = unpack("H*hex", my_inet_pton($ip_address));
|
$expanded_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex['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']);
| $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);
| $expanded_admin_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex_admin['hex']), 0, -1);
$exploded_ip = explode(":", $expanded_ip);
|
| Zeile 492 | Zeile 489 |
|---|
}
}
}
|
}
}
}
|
}
}
| }
}
|
}
if($mybb->input['action'] == "logout" && $mybb->user)
|
}
if($mybb->input['action'] == "logout" && $mybb->user)
|
{
| {
|
$plugins->run_hooks("admin_logout");
if(verify_post_check($mybb->input['my_post_key']))
| $plugins->run_hooks("admin_logout");
if(verify_post_check($mybb->input['my_post_key']))
|
| Zeile 509 | Zeile 506 |
|---|
}
if(!isset($mybb->user['usergroup']))
|
}
if(!isset($mybb->user['usergroup']))
|
{
| {
|
$mybbgroups = 1;
}
else
{
$mybbgroups = $mybb->user['usergroup'].",".$mybb->user['additionalgroups'];
|
$mybbgroups = 1;
}
else
{
$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($mybb->usergroup['cancp'] != 1 && !$is_super_admin || !$mybb->user['uid'])
{
|
| Zeile 537 | Zeile 538 |
|---|
$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"))
| // Only update language / theme once fully authenticated
if(empty($admin_options['authsecret']) || $admin_session['authenticated'] == 1)
|
{
|
{
|
$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['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'];
| 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
| }
// Update the session information in the DB
|
| Zeile 643 | Zeile 648 |
|---|
$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 658 | Zeile 662 |
|---|
$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 806 | Zeile 810 |
|---|
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->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;
|