| Zeile 92 | Zeile 92 |
|---|
if(!$user['salt'])
{
// Generate a salt for this user and assume the password stored in db is a plain md5 password
|
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'] = create_password_hash($user['password'], $user['salt'], $user);
$sql_array = array(
"salt" => $user['salt'],
"password" => $user['password']
);
$db->update_query("users", $sql_array, "uid='".$user['uid']."'");
| $password_fields = create_password($user['password'], false, $user);
$db->update_query("users", $password_fields, "uid='".$user['uid']."'");
|
}
if(!$user['loginkey'])
| }
if(!$user['loginkey'])
|
| Zeile 148 | Zeile 143 |
|---|
$salt = generate_salt();
}
$newpassword['salt'] = $salt;
|
$salt = generate_salt();
}
$newpassword['salt'] = $salt;
|
}
| }
|
// Create new password based on salt
$saltedpw = salt_password($password, $salt);
// Generate new login key
$loginkey = generate_loginkey();
|
// Create new password based on salt
$saltedpw = salt_password($password, $salt);
// Generate new login key
$loginkey = generate_loginkey();
|
|
|
// Update password and login key in database
$newpassword['password'] = $saltedpw;
$newpassword['loginkey'] = $loginkey;
| // Update password and login key in database
$newpassword['password'] = $saltedpw;
$newpassword['loginkey'] = $loginkey;
|
| Zeile 164 | Zeile 159 |
|---|
$plugins->run_hooks("password_changed");
return $newpassword;
|
$plugins->run_hooks("password_changed");
return $newpassword;
|
}
/**
| }
/**
|
* Salts a password based on a supplied salt.
*
* @param string $password The md5()'ed password.
| * Salts a password based on a supplied salt.
*
* @param string $password The md5()'ed password.
|
| Zeile 183 | Zeile 178 |
|---|
* Salts a password based on a supplied salt.
*
* @param string $password The input 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 $salt (Optional) The salt used by the MyBB algorithm.
|
* @param string $user (Optional) An array containing password-related data.
|
* @param string $user (Optional) An array containing password-related data.
|
* @return string The password hash.
*/
function create_password_hash($password, $salt, $user = false)
{
global $plugins;
$hash = null;
$parameters = compact('password', 'salt', 'user', 'hash');
| * @return array Password-related fields.
*/
function create_password($password, $salt = false, $user = false)
{
global $plugins;
$fields = null;
$parameters = compact('password', 'salt', 'user', 'fields');
if(!defined('IN_INSTALL') && !defined('IN_UPGRADE'))
{
$plugins->run_hooks('create_password', $parameters);
}
if(!is_null($parameters['fields']))
{
$fields = $parameters['fields'];
}
else
{
if(!$salt)
{
$salt = generate_salt();
}
$hash = md5(md5($salt).md5($password));
|
|
|
if(!defined('IN_INSTALL') && !defined('IN_UPGRADE'))
{
$plugins->run_hooks('create_password_hash', $parameters);
}
| $fields = array(
'salt' => $salt,
'password' => $hash,
);
}
|
|
|
if(!is_null($parameters['hash']))
{
return $parameters['hash'];
}
else
{
return md5(md5($salt).md5($password));
}
| return $fields;
|
}
/**
| }
/**
|
| Zeile 236 | Zeile 243 |
|---|
}
else
{
|
}
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)
{
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]);
}
| $password_fields = create_password($password, $user['salt'], $user);
|
|
|
return $result === 0;
| return my_hash_equals($user['password'], $password_fields['password']);
|
}
}
| }
}
|
| Zeile 514 | Zeile 487 |
|---|
*/
function usercp_menu_messenger()
{
|
*/
function usercp_menu_messenger()
{
|
global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapsed, $collapsedimg;
| global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapse, $collapsed, $collapsedimg;
|
|
|
| | $expaltext = (in_array("usercppms", $collapse)) ? "[+]" : "[-]";
|
$usercp_nav_messenger = $templates->get("usercp_nav_messenger");
// Hide tracking link if no permission
$tracking = '';
| $usercp_nav_messenger = $templates->get("usercp_nav_messenger");
// Hide tracking link if no permission
$tracking = '';
|
| Zeile 576 | Zeile 550 |
|---|
*/
function usercp_menu_profile()
{
|
*/
function usercp_menu_profile()
{
|
global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapsed, $collapsedimg;
| global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapse, $collapsed, $collapsedimg;
|
$changenameop = '';
if($mybb->usergroup['canchangename'] != 0)
|
$changenameop = '';
if($mybb->usergroup['canchangename'] != 0)
|
| Zeile 603 | Zeile 577 |
|---|
$collapsed['usercpprofile_e'] = '';
}
|
$collapsed['usercpprofile_e'] = '';
}
|
| | $expaltext = (in_array("usercpprofile", $collapse)) ? "[+]" : "[-]";
|
eval("\$usercpmenu .= \"".$templates->get("usercp_nav_profile")."\";");
}
| eval("\$usercpmenu .= \"".$templates->get("usercp_nav_profile")."\";");
}
|
| Zeile 612 | Zeile 587 |
|---|
*/
function usercp_menu_misc()
{
|
*/
function usercp_menu_misc()
{
|
global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapsed, $collapsedimg;
| global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapse, $collapsed, $collapsedimg;
|
$draftstart = $draftend = '';
$draftcount = $lang->ucp_nav_drafts;
|
$draftstart = $draftend = '';
$draftcount = $lang->ucp_nav_drafts;
|
| Zeile 641 | Zeile 616 |
|---|
}
$profile_link = get_profile_link($mybb->user['uid']);
|
}
$profile_link = get_profile_link($mybb->user['uid']);
|
| | $expaltext = (in_array("usercpmisc", $collapse)) ? "[+]" : "[-]";
|
eval("\$usercpmenu .= \"".$templates->get("usercp_nav_misc")."\";");
}
| eval("\$usercpmenu .= \"".$templates->get("usercp_nav_misc")."\";");
}
|