| 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 188 | Zeile 184 |
|---|
// 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");
| {
$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)
{
|
if($login_user['uid'] > 0)
{
|
| 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 220 | Zeile 216 |
|---|
"type" => "l"
);
$db->insert_query("awaitingactivation", $lockout_array);
|
"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);
| $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);
|
| Zeile 247 | 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 267 | Zeile 263 |
|---|
$plugins->run_hooks("admin_login_success");
|
$plugins->run_hooks("admin_login_success");
|
$db->delete_query("adminsessions", "uid='{$mybb->user['uid']}'");
| $db->delete_query("adminsessions", "uid='{$mybb->user['uid']}'");
|
$sid = md5(random_str(50));
$useragent = $_SERVER['HTTP_USER_AGENT'];
if(my_strlen($useragent) > 200)
{
$useragent = my_substr($useragent, 0, 200);
|
$sid = md5(random_str(50));
$useragent = $_SERVER['HTTP_USER_AGENT'];
if(my_strlen($useragent) > 200)
{
$useragent = my_substr($useragent, 0, 200);
|
}
| }
|
// Create a new admin session for this user
$admin_session = array(
|
// Create a new admin session for this user
$admin_session = array(
|
| 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, "strict");
|
my_setcookie('acploginattempts', 0);
$post_verify = false;
| my_setcookie('acploginattempts', 0);
$post_verify = false;
|
| Zeile 321 | Zeile 318 |
|---|
// So what do we do? We know that parameters are devided by ampersands
// That means we must get to work!
$parameters = explode('&', $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=')
{
| // Remove our first member if it's for the module
if(substr($parameters[0], 0, 8) == '?module=')
{
|
| 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)
{
$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");
|
$plugins->run_hooks("admin_login_lockout");
|
| Zeile 386 | Zeile 388 |
|---|
'username' => $login_user['username'],
)
);
|
'username' => $login_user['username'],
)
);
|
|
|
$default_page->show_lockedout();
}
| $default_page->show_lockedout();
}
|
| 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;
}
else
{
$admin_session['data'] = my_unserialize($admin_session['data']);
|
{
$login_message = $lang->error_invalid_admin_session;
}
else
{
$admin_session['data'] = my_unserialize($admin_session['data']);
|
|
|
// 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']);
|
| Zeile 462 | Zeile 464 |
|---|
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 500 | Zeile 502 |
|---|
{
$plugins->run_hooks("admin_logout");
|
{
$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(empty($mybb->usergroup['cancp']) && !$is_super_admin || !$mybb->user['uid'])
|
{
$uid = 0;
if(isset($mybb->user['uid']))
| {
$uid = 0;
if(isset($mybb->user['uid']))
|
| Zeile 537 | Zeile 543 |
|---|
$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 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 658 | 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 806 | 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;
|