Vergleich inc/functions_user.php - 1.8.0 - 1.8.13

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 11Zeile 11
/**
* Checks if a user with uid $uid exists in the database.
*

/**
* Checks if a user with uid $uid exists in the database.
*

 * @param int The uid to check for.

 * @param int $uid The uid to check for.

 * @return boolean True when exists, false when not.
*/
function user_exists($uid)

 * @return boolean True when exists, false when not.
*/
function user_exists($uid)

Zeile 32Zeile 32
/**
* Checks if $username already exists in the database.
*

/**
* Checks if $username already exists in the database.
*

 * @param string The username for check for.

 * @param string $username The username for check for.

 * @return boolean True when exists, false when not.
*/
function username_exists($username)
{

 * @return boolean True when exists, false when not.
*/
function username_exists($username)
{

	global $db;


 
	$options = array(
'username_method' => 2
);

	$options = array(
'username_method' => 2
);





	return (bool)get_user_by_username($username, $options);

	return (bool)get_user_by_username($username, $options);

}

/**

}

/**

 * Checks a password with a supplied username.
*

 * Checks a password with a supplied username.
*

 * @param string The username of the user.
* @param string The plain-text password.

 * @param string $username The username of the user.
* @param string $password The plain-text password.

 * @return boolean|array False when no match, array with user info when match.
*/
function validate_password_from_username($username, $password)

 * @return boolean|array False when no match, array with user info when match.
*/
function validate_password_from_username($username, $password)

{
global $db, $mybb;


{
global $mybb;


	$options = array(

	$options = array(

		'fields' => array('username', 'password', 'salt', 'loginkey', 'coppauser', 'usergroup'),

		'fields' => '*',

		'username_method' => $mybb->settings['username_method'],
);

		'username_method' => $mybb->settings['username_method'],
);





	$user = get_user_by_username($username, $options);

if(!$user['uid'])

	$user = get_user_by_username($username, $options);

if(!$user['uid'])

	{

	{

		return false;
}

		return false;
}





	return validate_password_from_uid($user['uid'], $password, $user);

	return validate_password_from_uid($user['uid'], $password, $user);

}

/**

}

/**

 * Checks a password with a supplied uid.
*

 * Checks a password with a supplied uid.
*

 * @param int The user id.
* @param string The plain-text password.
* @param string An optional user data array.

 * @param int $uid The user id.
* @param string $password The plain-text password.
* @param array $user An optional user data array.

 * @return boolean|array False when not valid, user data array when valid.
*/
function validate_password_from_uid($uid, $password, $user = array())

 * @return boolean|array False when not valid, user data array when valid.
*/
function validate_password_from_uid($uid, $password, $user = array())

Zeile 89Zeile 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

	}
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']);
$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 112Zeile 104
		);
$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;

	}
else
{
return false;
}
}

/**

	}
else
{
return false;
}
}

/**

 * Updates a user's password.
*

 * Updates a user's password.
*

 * @param int The user's id.
* @param string The md5()'ed password.
* @param string (Optional) The salt of the user.

 * @param int $uid The user's id.
* @param string $password The md5()'ed password.
* @param string $salt (Optional) The salt of the user.

 * @return array The new password.

 * @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;

$newpassword = array();

 */
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
if(!$salt)
{

	// If no salt was specified, check in database first, if still doesn't exist, create one
if(!$salt)
{

Zeile 144Zeile 137
		if($user['salt'])
{
$salt = $user['salt'];

		if($user['salt'])
{
$salt = $user['salt'];

		}

		}

		else
{
$salt = generate_salt();

		else
{
$salt = generate_salt();

Zeile 153Zeile 146
	}

// Create new password based on salt

	}

// Create new password based on salt

	$saltedpw = salt_password($password, $salt);

	$saltedpw = salt_password($password, $salt);


// Generate new login key
$loginkey = generate_loginkey();


// Generate new login key
$loginkey = generate_loginkey();

Zeile 162Zeile 155
	$newpassword['password'] = $saltedpw;
$newpassword['loginkey'] = $loginkey;
$db->update_query("users", $newpassword, "uid='$uid'");

	$newpassword['password'] = $saltedpw;
$newpassword['loginkey'] = $loginkey;
$db->update_query("users", $newpassword, "uid='$uid'");





	$plugins->run_hooks("password_changed");

return $newpassword;

	$plugins->run_hooks("password_changed");

return $newpassword;

Zeile 171Zeile 164
/**
* Salts a password based on a supplied salt.
*

/**
* Salts a password based on a supplied salt.
*

 * @param string The md5()'ed password.
* @param string The salt.

 * @param string $password The md5()'ed password.
* @param string $salt The salt.

 * @return string The password hash.

 * @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 181Zeile 175
}

/**

}

/**

 * Generates a random salt














































































































 * Salts a password based on a supplied salt.
*
* @param string $password The input password.
* @param string $salt (Optional) The salt used by the MyBB algorithm.
* @param string $user (Optional) An array containing password-related data.
* @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));

$fields = array(
'salt' => $salt,
'password' => $hash,
);
}

return $fields;
}

/**
* 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
{
$password_fields = create_password($password, $user['salt'], $user);

return my_hash_equals($user['password'], $password_fields['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.
*/

 *
* @return string The salt.
*/

Zeile 198Zeile 301
function generate_loginkey()
{
return random_str(50);

function generate_loginkey()
{
return random_str(50);

}

/**

}

/**

 * Updates a user's salt in the database (does not update a password).
*

 * Updates a user's salt in the database (does not update a password).
*

 * @param int The uid of the user to update.

 * @param int $uid The uid of the user to update.

 * @return string The new salt.
*/
function update_salt($uid)

 * @return string The new salt.
*/
function update_salt($uid)

{
global $db;


{
global $db;


	$salt = generate_salt();
$sql_array = array(
"salt" => $salt

	$salt = generate_salt();
$sql_array = array(
"salt" => $salt

Zeile 217Zeile 320
	$db->update_query("users", $sql_array, "uid='{$uid}'");

return $salt;

	$db->update_query("users", $sql_array, "uid='{$uid}'");

return $salt;

}

}


/**
* Generates a new login key for a user.
*


/**
* Generates a new login key for a user.
*

 * @param int The uid of the user to update.

 * @param int $uid The uid of the user to update.

 * @return string The new login key.
*/
function update_loginkey($uid)

 * @return string The new login key.
*/
function update_loginkey($uid)

{

{

	global $db;

$loginkey = generate_loginkey();

	global $db;

$loginkey = generate_loginkey();

Zeile 234Zeile 337
		"loginkey" => $loginkey
);
$db->update_query("users", $sql_array, "uid='{$uid}'");

		"loginkey" => $loginkey
);
$db->update_query("users", $sql_array, "uid='{$uid}'");





	return $loginkey;

}

	return $loginkey;

}

Zeile 243Zeile 346
 * 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.
*

 * 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.
*

 * @param int The tid of the thread to add to the list.
* @param int (Optional) The type of notification to receive for replies (0=none, 1=email, 2=pm)
* @param int (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.

 * @return boolean True when success, false when otherwise.
*/

 * @return boolean True when success, false when otherwise.
*/

function add_subscribed_thread($tid, $notification=1, $uid="")

function add_subscribed_thread($tid, $notification=1, $uid=0)

{
global $mybb, $db;


{
global $mybb, $db;


Zeile 259Zeile 362

if(!$uid)
{


if(!$uid)
{

		return;

		return false;

	}

$query = $db->simple_select("threadsubscriptions", "*", "tid='".(int)$tid."' AND uid='".(int)$uid."'");

	}

$query = $db->simple_select("threadsubscriptions", "*", "tid='".(int)$tid."' AND uid='".(int)$uid."'");

Zeile 270Zeile 373
			'uid' => (int)$uid,
'tid' => (int)$tid,
'notification' => (int)$notification,

			'uid' => (int)$uid,
'tid' => (int)$tid,
'notification' => (int)$notification,

			'dateline' => TIME_NOW,
'subscriptionkey' => md5(TIME_NOW.$uid.$tid)


			'dateline' => TIME_NOW



		);
$db->insert_query("threadsubscriptions", $insert_array);
}

		);
$db->insert_query("threadsubscriptions", $insert_array);
}

Zeile 291Zeile 392
 * Remove a thread from a user's thread subscription list.
* If no uid is supplied, the currently logged in user's id will be used.
*

 * Remove a thread from a user's thread subscription list.
* If no uid is supplied, the currently logged in user's id will be used.
*

 * @param int The tid of the thread to remove from the list.
* @param int (Optional) The uid of the user who's list to update.

 * @param int $tid The tid of the thread 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.
*/

 * @return boolean True when success, false when otherwise.
*/

function remove_subscribed_thread($tid, $uid="")

function remove_subscribed_thread($tid, $uid=0)

{
global $mybb, $db;


{
global $mybb, $db;


Zeile 306Zeile 407

if(!$uid)
{


if(!$uid)
{

		return;

		return false;

	}
$db->delete_query("threadsubscriptions", "tid='".$tid."' AND uid='{$uid}'");

	}
$db->delete_query("threadsubscriptions", "tid='".$tid."' AND uid='{$uid}'");


return true;
}



return true;
}


/**
* Adds a forum to a user's forum subscription list.

/**
* Adds a forum to a user's forum subscription list.

 * If no uid is supplied, the currently logged in user's id will be used.
*
* @param int The fid of the forum to add to the list.
* @param int (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="")
{
global $mybb, $db;

if(!$uid)
{
$uid = $mybb->user['uid'];
}

if(!$uid)
{
return;
}


 * 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.
*/
function add_subscribed_forum($fid, $uid=0)
{
global $mybb, $db;

if(!$uid)
{
$uid = $mybb->user['uid'];
}

if(!$uid)
{
return false;
}


	$fid = (int)$fid;
$uid = (int)$uid;


	$fid = (int)$fid;
$uid = (int)$uid;


Zeile 356Zeile 457
 * Removes a forum from a user's forum subscription list.
* If no uid is supplied, the currently logged in user's id will be used.
*

 * Removes a forum from a user's forum subscription list.
* If no uid is supplied, the currently logged in user's id will be used.
*

 * @param int The fid of the forum to remove from the list.
* @param int (Optional) The uid of the user who's list to update.

 * @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.
*/

 * @return boolean True when success, false when otherwise.
*/

function remove_subscribed_forum($fid, $uid="")

function remove_subscribed_forum($fid, $uid=0)

{
global $mybb, $db;

{
global $mybb, $db;


if(!$uid)
{
$uid = $mybb->user['uid'];
}



if(!$uid)
{
$uid = $mybb->user['uid'];
}


	if(!$uid)
{

	if(!$uid)
{

		return;

		return false;

	}
$db->delete_query("forumsubscriptions", "fid='".$fid."' AND uid='{$uid}'");

return true;

	}
$db->delete_query("forumsubscriptions", "fid='".$fid."' AND uid='{$uid}'");

return true;

}


}


/**
* Constructs the usercp navigation menu.
*

/**
* Constructs the usercp navigation menu.
*

Zeile 386Zeile 487
{
global $mybb, $templates, $theme, $plugins, $lang, $usercpnav, $usercpmenu;


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


	$lang->load("usercpnav");


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


Zeile 443Zeile 552
		else if($folderlinks)
{
$class = "usercp_nav_sub_pmfolder";

		else if($folderlinks)
{
$class = "usercp_nav_sub_pmfolder";

		}

		}

		else
{
$class = "usercp_nav_pmfolder";

		else
{
$class = "usercp_nav_pmfolder";

Zeile 545Zeile 654
/**
* Gets the usertitle for a specific uid.
*

/**
* Gets the usertitle for a specific uid.
*

 * @param int The uid of the user to get the usertitle of.

 * @param int $uid The uid of the user to get the usertitle of.

 * @return string The usertitle of the user.
*/

 * @return string The usertitle of the user.
*/

function get_usertitle($uid="")

function get_usertitle($uid=0)

{
global $db, $mybb;


{
global $db, $mybb;


Zeile 574Zeile 683
			if($title['posts'] <= $user['postnum'])
{
$usertitle = $title;

			if($title['posts'] <= $user['postnum'])
{
$usertitle = $title;

 
				break;

			}
}


			}
}


Zeile 584Zeile 694
/**
* Updates a users private message count in the users table with the number of pms they have.
*

/**
* Updates a users private message count in the users table with the number of pms they have.
*

 * @param int The user id to update the count for. If none, assumes currently logged in user.
* @param int Bitwise value for what to update. 1 = total, 2 = new, 4 = unread. Combinations accepted.
* @param int The unix timestamp the user with uid last visited. If not specified, will be queried.

 * @param int $uid The user id to update the count for. If none, assumes currently logged in user.
* @param int $count_to_update Bitwise value for what to update. 1 = total, 2 = new, 4 = unread. Combinations accepted.
* @return array The updated counters

 */
function update_pm_count($uid=0, $count_to_update=7)
{

 */
function update_pm_count($uid=0, $count_to_update=7)
{

Zeile 594Zeile 704

// If no user id, assume that we mean the current logged in user.
if((int)$uid == 0)


// If no user id, assume that we mean the current logged in user.
if((int)$uid == 0)

	{

	{

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

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

	}


	}


	$uid = (int)$uid;
$pmcount = array();
if($uid == 0)
{
return $pmcount;

	$uid = (int)$uid;
$pmcount = array();
if($uid == 0)
{
return $pmcount;

	}


	}


	// Update total number of messages.
if($count_to_update & 1)
{

	// Update total number of messages.
if($count_to_update & 1)
{

Zeile 622Zeile 732
	}

if(!empty($pmcount))

	}

if(!empty($pmcount))

	{

	{

		$db->update_query("users", $pmcount, "uid='".$uid."'");
}
return $pmcount;

		$db->update_query("users", $pmcount, "uid='".$uid."'");
}
return $pmcount;

Zeile 631Zeile 741
/**
* Return the language specific name for a PM folder.
*

/**
* Return the language specific name for a PM folder.
*

 * @param int The ID of the folder.
* @param string The folder name - can be blank, will use language default.

 * @param int $fid The ID of the folder.
* @param string $name The folder name - can be blank, will use language default.

 * @return string The name of the folder.
*/
function get_pm_folder_name($fid, $name="")

 * @return string The name of the folder.
*/
function get_pm_folder_name($fid, $name="")

Zeile 642Zeile 752
	if($name != '')
{
return $name;

	if($name != '')
{
return $name;

	}

	}


switch($fid)
{


switch($fid)
{

Zeile 651Zeile 761
			break;
case 2:
return $lang->folder_sent_items;

			break;
case 2:
return $lang->folder_sent_items;

			break;

			break;

		case 3:
return $lang->folder_drafts;

		case 3:
return $lang->folder_drafts;

			break;

			break;

		case 4:
return $lang->folder_trash;
break;
default:
return $lang->folder_untitled;

		case 4:
return $lang->folder_trash;
break;
default:
return $lang->folder_untitled;

	}

	}

}

}





/**
* Generates a security question for registration.
*

/**
* Generates a security question for registration.
*

 
 * @param int $old_qid Optional ID of the old question.

 * @return string The question session id.
*/

 * @return string The question session id.
*/

function generate_question()

function generate_question($old_qid=0)

{
global $db;


{
global $db;


	$query = $db->query("
SELECT qid, shown
FROM ".TABLE_PREFIX."questions
WHERE active='1'
ORDER BY RAND()
LIMIT 1
");









	if($db->type == 'pgsql' || $db->type == 'sqlite')
{
$order_by = 'RANDOM()';
}
else
{
$order_by = 'RAND()';
}

if($old_qid)
{
$excl_old = ' AND qid != '.(int)$old_qid;
}

$query = $db->simple_select('questions', 'qid, shown', "active=1{$excl_old}", array('limit' => 1, 'order_by' => $order_by));

	$question = $db->fetch_array($query);

if(!$db->num_rows($query))

	$question = $db->fetch_array($query);

if(!$db->num_rows($query))

Zeile 709Zeile 828
/**
* Check whether we can show the Purge Spammer Feature
*

/**
* Check whether we can show the Purge Spammer Feature
*

 * @param int The users post count
* @param int The usergroup of our user
* @param int The uid of our user

 * @param int $post_count The users post count
* @param int $usergroup The usergroup of our user
* @param int $uid The uid of our user

 * @return boolean Whether or not to show the feature
*/
function purgespammer_show($post_count, $usergroup, $uid)

 * @return boolean Whether or not to show the feature
*/
function purgespammer_show($post_count, $usergroup, $uid)