Vergleich inc/functions_user.php - 1.8.7 - 1.8.10

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 56Zeile 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 87Zeile 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']

		);

		);

		$db->update_query("users", $sql_array, "uid='".$user['uid']."'");
}

if(!$user['loginkey'])

		$db->update_query("users", $sql_array, "uid='".$user['uid']."'");
}

if(!$user['loginkey'])

	{

	{

		$user['loginkey'] = generate_loginkey();
$sql_array = array(
"loginkey" => $user['loginkey']
);
$db->update_query("users", $sql_array, "uid = ".$user['uid']);
}

		$user['loginkey'] = generate_loginkey();
$sql_array = array(
"loginkey" => $user['loginkey']
);
$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;

	}

	}

	else
{
return false;

	else
{
return false;

Zeile 127Zeile 126
 * @param string $password The md5()'ed password.
* @param string $salt (Optional) The salt of the user.
* @return array The new password.

 * @param string $password The md5()'ed password.
* @param string $salt (Optional) The salt of the user.
* @return array The new password.

 */


 * @deprecated deprecated since version 1.8.6 Please use other alternatives.
*/

function update_password($uid, $password, $salt="")
{
global $db, $plugins;

function update_password($uid, $password, $salt="")
{
global $db, $plugins;





	$newpassword = array();

// If no salt was specified, check in database first, if still doesn't exist, create one

	$newpassword = array();

// If no salt was specified, check in database first, if still doesn't exist, create one

Zeile 140Zeile 140
		$query = $db->simple_select("users", "salt", "uid='$uid'");
$user = $db->fetch_array($query);
if($user['salt'])

		$query = $db->simple_select("users", "salt", "uid='$uid'");
$user = $db->fetch_array($query);
if($user['salt'])

		{

		{

			$salt = $user['salt'];
}
else

			$salt = $user['salt'];
}
else

Zeile 164Zeile 164
	$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.
* @param string $salt The salt.
* @return string The password hash.

/**
* Salts a password based on a supplied 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)
{

 */
function salt_password($password, $salt)
{

Zeile 179Zeile 180
}

/**

}

/**

 * Generates a random salt


































































































 * 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.
*/
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)
{
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;
}
}

/**
* Generates a random salt

 *
* @return string The salt.
*/
function generate_salt()

 *
* @return string The salt.
*/
function generate_salt()

{

{

	return random_str(8);
}


	return random_str(8);
}


Zeile 203Zeile 301
 *
* @param int $uid The uid of the user to update.
* @return string The new salt.

 *
* @param int $uid The uid of the user to update.
* @return string The new salt.

 */

 */

function update_salt($uid)
{
global $db;

function update_salt($uid)
{
global $db;

Zeile 279Zeile 377
			"notification" => (int)$notification
);
$db->update_query("threadsubscriptions", $update_array, "uid='{$uid}' AND tid='{$tid}'");

			"notification" => (int)$notification
);
$db->update_query("threadsubscriptions", $update_array, "uid='{$uid}' AND tid='{$tid}'");

	}

	}

	return true;
}


	return true;
}


Zeile 355Zeile 453
 * @param int $fid The fid of the forum to remove from 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 $fid The fid of the forum to remove from the list.
* @param int $uid (Optional) The uid of the user who's list to update.
* @return boolean True when success, false when otherwise.

 */

 */

function remove_subscribed_forum($fid, $uid=0)
{
global $mybb, $db;

function remove_subscribed_forum($fid, $uid=0)
{
global $mybb, $db;


if(!$uid)


if(!$uid)

	{
$uid = $mybb->user['uid'];
}

	{
$uid = $mybb->user['uid'];
}

Zeile 383Zeile 481
	global $mybb, $templates, $theme, $plugins, $lang, $usercpnav, $usercpmenu;

$lang->load("usercpnav");

	global $mybb, $templates, $theme, $plugins, $lang, $usercpnav, $usercpmenu;

$lang->load("usercpnav");





	// Add the default items as plugins with separated priorities of 10

	// 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")."\";");