Vergleich inc/functions_user.php - 1.8.0 - 1.8.7

  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
);

Zeile 49Zeile 47
/**
* 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(
'fields' => array('username', 'password', 'salt', 'loginkey', 'coppauser', 'usergroup'),


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

Zeile 67Zeile 65
	if(!$user['uid'])
{
return false;

	if(!$user['uid'])
{
return false;

	}

	}


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


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

Zeile 75Zeile 73
/**
* 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 88Zeile 86
		$user = $mybb->user;
}
if(!$user['password'])

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

	{

	{

		$query = $db->simple_select("users", "uid,username,password,salt,loginkey,usergroup", "uid='".(int)$uid."'");
$user = $db->fetch_array($query);
}

		$query = $db->simple_select("users", "uid,username,password,salt,loginkey,usergroup", "uid='".(int)$uid."'");
$user = $db->fetch_array($query);
}

Zeile 105Zeile 103
	}

if(!$user['loginkey'])

	}

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'])
{
return $user;
}
else

	if(salt_password(md5($password), $user['salt']) === $user['password'])
{
return $user;
}
else

	{
return false;
}

	{
return false;
}

Zeile 125Zeile 123
/**
* 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.
*/
function update_password($uid, $password, $salt="")

 * @return array The new password.
*/
function update_password($uid, $password, $salt="")

Zeile 157Zeile 155

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


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





	// Update password and login key in database
$newpassword['password'] = $saltedpw;
$newpassword['loginkey'] = $loginkey;
$db->update_query("users", $newpassword, "uid='$uid'");

	// Update password and login key in database
$newpassword['password'] = $saltedpw;
$newpassword['loginkey'] = $loginkey;
$db->update_query("users", $newpassword, "uid='$uid'");





	$plugins->run_hooks("password_changed");

	$plugins->run_hooks("password_changed");





	return $newpassword;

	return $newpassword;

}


}


/**
* 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.
*/
function salt_password($password, $salt)
{
return md5(md5($salt).$password);

 * @return string The password hash.
*/
function salt_password($password, $salt)
{
return md5(md5($salt).$password);

}

}


/**
* Generates a random salt


/**
* Generates a random salt

Zeile 196Zeile 194
 * @return string The login key.
*/
function generate_loginkey()

 * @return string The login key.
*/
function generate_loginkey()

{

{

	return random_str(50);
}

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

	return random_str(50);
}

/**
* 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)

Zeile 213Zeile 211
	$salt = generate_salt();
$sql_array = array(
"salt" => $salt

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

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

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


return $salt;
}


return $salt;
}

Zeile 222Zeile 220
/**
* 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.

 * @return string The new login key.

 */

 */

function update_loginkey($uid)
{
global $db;

function update_loginkey($uid)
{
global $db;

Zeile 243Zeile 241
 * 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;


if(!$uid)
{


if(!$uid)
{

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

if(!$uid)
{

		$uid = $mybb->user['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 268
			'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 287
 * 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 302

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="")
{

 * 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'];

	global $mybb, $db;

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

	}


	}


	if(!$uid)
{

	if(!$uid)
{

		return;

		return false;

	}

$fid = (int)$fid;

	}

$fid = (int)$fid;

	$uid = (int)$uid;

	$uid = (int)$uid;


$query = $db->simple_select("forumsubscriptions", "*", "fid='".$fid."' AND uid='{$uid}'", array('limit' => 1));
$fsubscription = $db->fetch_array($query);


$query = $db->simple_select("forumsubscriptions", "*", "fid='".$fid."' AND uid='{$uid}'", array('limit' => 1));
$fsubscription = $db->fetch_array($query);

Zeile 356Zeile 352
 * 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)
{


if(!$uid)
{

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

if(!$uid)
{

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

if(!$uid)
{

		return;

		return false;

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


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


Zeile 513Zeile 509
	global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapsed, $collapsedimg;

$draftstart = $draftend = '';

	global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapsed, $collapsedimg;

$draftstart = $draftend = '';

	$draftcount = $lang->ucp_nav_drafts;


	$draftcount = $lang->ucp_nav_drafts;


	$query = $db->simple_select("posts", "COUNT(pid) AS draftcount", "visible = '-2' AND uid = '{$mybb->user['uid']}'");
$count = $db->fetch_field($query, 'draftcount');


	$query = $db->simple_select("posts", "COUNT(pid) AS draftcount", "visible = '-2' AND uid = '{$mybb->user['uid']}'");
$count = $db->fetch_field($query, 'draftcount');


Zeile 545Zeile 541
/**
* 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 570
			if($title['posts'] <= $user['postnum'])
{
$usertitle = $title;

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

 
				break;

			}
}


			}
}


Zeile 584Zeile 581
/**
* 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 631Zeile 628
/**
* 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 666Zeile 663
/**
* 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 715
/**
* 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)