| Zeile 56 | Zeile 56 |
|---|
global $mybb;
$options = array(
|
global $mybb;
$options = array(
|
'fields' => array('username', 'password', 'salt', 'loginkey', 'coppauser', 'usergroup'),
| 'fields' => '*',
|
'username_method' => $mybb->settings['username_method'],
);
| 'username_method' => $mybb->settings['username_method'],
);
|
| Zeile 87 | Zeile 87 |
|---|
}
if(!$user['password'])
{
|
}
if(!$user['password'])
{
|
$query = $db->simple_select("users", "uid,username,password,salt,loginkey,usergroup", "uid='".(int)$uid."'");
$user = $db->fetch_array($query);
| $user = get_user($uid);
|
}
if(!$user['salt'])
{
// Generate a salt for this user and assume the password stored in db is a plain md5 password
$user['salt'] = generate_salt();
|
}
if(!$user['salt'])
{
// Generate a salt for this user and assume the password stored in db is a plain md5 password
$user['salt'] = generate_salt();
|
$user['password'] = salt_password($user['password'], $user['salt']);
| $user['password'] = create_password_hash($user['password'], $user['salt'], $user);
|
$sql_array = array(
"salt" => $user['salt'],
"password" => $user['password']
| $sql_array = array(
"salt" => $user['salt'],
"password" => $user['password']
|
| Zeile 110 | Zeile 109 |
|---|
);
$db->update_query("users", $sql_array, "uid = ".$user['uid']);
}
|
);
$db->update_query("users", $sql_array, "uid = ".$user['uid']);
}
|
if(salt_password(md5($password), $user['salt']) === $user['password'])
| if(verify_user_password($user, $password))
|
{
return $user;
}
| {
return $user;
}
|
| Zeile 165 | Zeile 164 |
|---|
$plugins->run_hooks("password_changed");
return $newpassword;
|
$plugins->run_hooks("password_changed");
return $newpassword;
|
}
/**
* Salts a password based on a supplied salt.
| }
/**
* Salts a password based on a supplied salt.
|
*
* @param string $password The md5()'ed password.
* @param string $salt The salt.
|
*
* @param string $password The md5()'ed password.
* @param string $salt The salt.
|
| | * @return string The password hash.
* @deprecated deprecated since version 1.8.9 Please use other alternatives.
*/
function salt_password($password, $salt)
{
return md5(md5($salt).$password);
}
/**
* Salts a password based on a supplied salt.
*
* @param string $password The input password.
* @param string $salt The salt used by the MyBB algorithm.
* @param string $user (Optional) An array containing password-related data.
|
* @return string The password hash.
*/
|
* @return string The password hash.
*/
|
function salt_password($password, $salt)
| function create_password_hash($password, $salt, $user = false)
{
global $plugins;
$hash = null;
$parameters = compact('password', 'salt', 'user', 'hash');
if(!defined('IN_INSTALL') && !defined('IN_UPGRADE'))
{
$plugins->run_hooks('create_password_hash', $parameters);
}
if(!is_null($parameters['hash']))
{
return $parameters['hash'];
}
else
{
return md5(md5($salt).md5($password));
}
}
/**
* Compares user's password data against provided input.
*
* @param array $user An array containing password-related data.
* @param string $password The plain-text input password.
* @return bool Result of the comparison.
*/
function verify_user_password($user, $password)
{
global $plugins;
$result = null;
$parameters = compact('user', 'password', 'result');
if(!defined('IN_INSTALL') && !defined('IN_UPGRADE'))
{
$plugins->run_hooks('verify_user_password', $parameters);
}
if(!is_null($parameters['result']))
{
return $parameters['result'];
}
else
{
$hashed_password = create_password_hash($password, $user['salt'], $user);
return my_hash_equals($user['password'], $hashed_password);
}
}
/**
* Performs a timing attack safe string comparison.
*
* @param string $known_string The first string to be compared.
* @param string $user_string The second, user-supplied string to be compared.
* @return bool Result of the comparison.
*/
function my_hash_equals($known_string, $user_string)
|
{
|
{
|
return md5(md5($salt).$password);
| if(version_compare(PHP_VERSION, '5.6.0', '>='))
{
return hash_equals($known_string, $user_string);
}
else
{
$known_string_length = my_strlen($known_string);
$user_string_length = my_strlen($user_string);
if($user_string_length != $known_string_length)
{
return false;
}
$result = 0;
for($i = 0; $i < $known_string_length; $i++)
{
$result |= ord($known_string[$i]) ^ ord($user_string[$i]);
}
return $result === 0;
}
|
}
/**
| }
/**
|
| Zeile 240 | Zeile 337 |
|---|
/**
* Adds a thread to a user's thread subscription list.
|
/**
* Adds a thread to a user's thread subscription list.
|
* If no uid is supplied, the currently logged in user's id will be used.
*
| * If no uid is supplied, the currently logged in user's id will be used.
*
|
* @param int $tid The tid of the thread to add to the list.
* @param int $notification (Optional) The type of notification to receive for replies (0=none, 1=email, 2=pm)
* @param int $uid (Optional) The uid of the user who's list to update.
| * @param int $tid The tid of the thread to add to the list.
* @param int $notification (Optional) The type of notification to receive for replies (0=none, 1=email, 2=pm)
* @param int $uid (Optional) The uid of the user who's list to update.
|
| Zeile 315 | Zeile 412 |
|---|
* If no uid is supplied, the currently logged in user's id will be used.
*
* @param int $fid The fid of the forum to add to the list.
|
* If no uid is supplied, the currently logged in user's id will be used.
*
* @param int $fid The fid of the forum to add to the list.
|
* @param int $uid (Optional) The uid of the user who's list to update.
* @return boolean True when success, false when otherwise.
*/
| * @param int $uid (Optional) The uid of the user who's list to update.
* @return boolean True when success, false when otherwise.
*/
|
function add_subscribed_forum($fid, $uid=0)
{
global $mybb, $db;
| function add_subscribed_forum($fid, $uid=0)
{
global $mybb, $db;
|
| Zeile 386 | Zeile 483 |
|---|
$lang->load("usercpnav");
// Add the default items as plugins with separated priorities of 10
|
$lang->load("usercpnav");
// Add the default items as plugins with separated priorities of 10
|
if($mybb->settings['enablepms'] != 0)
| if($mybb->settings['enablepms'] != 0 && $mybb->usergroup['canusepms'] == 1)
|
{
$plugins->add_hook("usercp_menu", "usercp_menu_messenger", 10);
}
|
{
$plugins->add_hook("usercp_menu", "usercp_menu_messenger", 10);
}
|
$plugins->add_hook("usercp_menu", "usercp_menu_profile", 20);
$plugins->add_hook("usercp_menu", "usercp_menu_misc", 30);
| if($mybb->usergroup['canusercp'] == 1)
{
$plugins->add_hook("usercp_menu", "usercp_menu_profile", 20);
$plugins->add_hook("usercp_menu", "usercp_menu_misc", 30);
}
|
// Run the plugin hooks
$plugins->run_hooks("usercp_menu");
global $usercpmenu;
|
// Run the plugin hooks
$plugins->run_hooks("usercp_menu");
global $usercpmenu;
|
| |
if($mybb->usergroup['canusercp'] == 1)
{
eval("\$ucp_nav_home = \"".$templates->get("usercp_nav_home")."\";");
}
|
eval("\$usercpnav = \"".$templates->get("usercp_nav")."\";");
|
eval("\$usercpnav = \"".$templates->get("usercp_nav")."\";");
|