| Zeile 41 | Zeile 41 |
|---|
*/
public $login_data = array();
|
*/
public $login_data = array();
|
| | /**
* @var bool
*/
|
public $captcha_verified = true;
|
public $captcha_verified = true;
|
|
/**
* @var bool|captcha
*/
|
private $captcha = false;
|
private $captcha = false;
|
|
/**
* @var int
*/
|
public $username_method = null;
|
public $username_method = null;
|
| | /**
* @param int $check_captcha
*/
|
function verify_attempts($check_captcha = 0)
{
global $db, $mybb;
$user = &$this->data;
|
function verify_attempts($check_captcha = 0)
{
global $db, $mybb;
$user = &$this->data;
|
|
|
if($check_captcha)
{
if(!isset($mybb->cookies['loginattempts']))
| if($check_captcha)
{
if(!isset($mybb->cookies['loginattempts']))
|
| Zeile 63 | Zeile 75 |
|---|
{
$this->captcha_verified = false;
$this->verify_captcha();
|
{
$this->captcha_verified = false;
$this->verify_captcha();
|
}
}
}
| }
}
}
/**
* @return bool
*/
|
function verify_captcha()
{
global $db, $mybb;
| function verify_captcha()
{
global $db, $mybb;
|
| Zeile 106 | Zeile 121 |
|---|
}
}
|
}
}
|
| | /**
* @return bool
*/
|
function verify_username()
{
$this->get_login_data();
if(!$this->login_data['uid'])
|
function verify_username()
{
$this->get_login_data();
if(!$this->login_data['uid'])
|
{
$this->invalid_combination();
return false;
| {
$this->invalid_combination();
return false;
|
}
|
}
|
}
| |
|
|
| | return true;
}
/**
* @param bool $strict
*
* @return bool
*/
|
function verify_password($strict = true)
{
|
function verify_password($strict = true)
{
|
global $db, $mybb;
| global $db, $mybb, $plugins;
|
$this->get_login_data();
|
$this->get_login_data();
|
|
|
if(empty($this->login_data['username']))
{
// Username must be validated to apply a password to
$this->invalid_combination();
return false;
}
|
if(empty($this->login_data['username']))
{
// Username must be validated to apply a password to
$this->invalid_combination();
return false;
}
|
| |
$args = array(
'this' => &$this,
'strict' => &$strict,
);
$plugins->run_hooks('datahandler_login_verify_password_start', $args);
|
$user = &$this->data;
|
$user = &$this->data;
|
$password = md5($user['password']);
| |
if(!$this->login_data['uid'] || $this->login_data['uid'] && !$this->login_data['salt'] && $strict == false)
{
$this->invalid_combination();
|
if(!$this->login_data['uid'] || $this->login_data['uid'] && !$this->login_data['salt'] && $strict == false)
{
$this->invalid_combination();
|
}
| }
|
if($strict == true)
{
if(!$this->login_data['salt'])
{
// Generate a salt for this user and assume the password stored in db is a plain md5 password
$this->login_data['salt'] = generate_salt();
|
if($strict == true)
{
if(!$this->login_data['salt'])
{
// Generate a salt for this user and assume the password stored in db is a plain md5 password
$this->login_data['salt'] = generate_salt();
|
$this->login_data['password'] = salt_password($this->login_data['password'], $this->login_data['salt']);
| $this->login_data['password'] = create_password_hash($this->login_data['password'], $this->login_data['salt']);
|
$sql_array = array(
"salt" => $this->login_data['salt'],
|
$sql_array = array(
"salt" => $this->login_data['salt'],
|
| Zeile 167 | Zeile 197 |
|---|
}
}
|
}
}
|
$salted_password = md5(md5($this->login_data['salt']).$password);
| $plugins->run_hooks('datahandler_login_verify_password_end', $args);
|
|
|
if($salted_password != $this->login_data['password'])
| if(!verify_user_password($this->login_data, $user['password']))
|
{
$this->invalid_combination(true);
return false;
}
|
{
$this->invalid_combination(true);
return false;
}
|
}
| |
|
|
| | return true;
}
/**
* @param bool $show_login_attempts
*/
|
function invalid_combination($show_login_attempts = false)
{
global $db, $lang, $mybb;
|
function invalid_combination($show_login_attempts = false)
{
global $db, $lang, $mybb;
|
|
|
// Don't show an error when the captcha was wrong!
if(!$this->captcha_verified)
{
| // Don't show an error when the captcha was wrong!
if(!$this->captcha_verified)
{
|
| Zeile 188 | Zeile 223 |
|---|
$login_text = '';
if($show_login_attempts)
|
$login_text = '';
if($show_login_attempts)
|
{
| {
|
if($mybb->settings['failedlogincount'] != 0 && $mybb->settings['failedlogintext'] == 1)
{
$logins = login_attempt_check(false) + 1;
| if($mybb->settings['failedlogincount'] != 0 && $mybb->settings['failedlogintext'] == 1)
{
$logins = login_attempt_check(false) + 1;
|
| Zeile 217 | Zeile 252 |
|---|
$user = &$this->data;
$options = array(
|
$user = &$this->data;
$options = array(
|
'fields' => array('uid', 'username', 'password', 'salt', 'loginkey', 'coppauser', 'usergroup', 'loginattempts'),
| 'fields' => '*',
|
'username_method' => (int)$settings['username_method']
);
| 'username_method' => (int)$settings['username_method']
);
|
| Zeile 229 | Zeile 264 |
|---|
$this->login_data = get_user_by_username($user['username'], $options);
}
|
$this->login_data = get_user_by_username($user['username'], $options);
}
|
| | /**
* @return bool
*/
|
function validate_login()
{
global $plugins, $mybb;
| function validate_login()
{
global $plugins, $mybb;
|
| Zeile 237 | Zeile 275 |
|---|
$plugins->run_hooks('datahandler_login_validate_start', $this);
|
$plugins->run_hooks('datahandler_login_validate_start', $this);
|
$this->verify_attempts($mybb->settings['captchaimage']);
| if(!defined('IN_ADMINCP'))
{
$this->verify_attempts($mybb->settings['captchaimage']);
}
|
if(array_key_exists('username', $user))
{
|
if(array_key_exists('username', $user))
{
|
| Zeile 260 | Zeile 301 |
|---|
return true;
}
|
return true;
}
|
| | /**
* @return bool true
*/
|
function complete_login()
{
global $plugins, $db, $mybb, $session;
| function complete_login()
{
global $plugins, $db, $mybb, $session;
|