Vergleich inc/functions_user.php - 1.6.6 - 1.6.13

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 6Zeile 6
 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * $Id: functions_user.php 5616 2011-09-20 13:24:59Z Tomm $

 * $Id$

 */

/**

 */

/**

Zeile 40Zeile 40
{
global $db;


{
global $db;


	$query = $db->simple_select("users", "COUNT(*) as user", "LOWER(username)='".$db->escape_string(my_strtolower($username))."'", array('limit' => 1));


	$username = $db->escape_string(my_strtolower($username));
$query = $db->simple_select("users", "COUNT(*) as user", "LOWER(username)='".$username."' OR LOWER(email)='".$username."'", array('limit' => 1));


if($db->fetch_field($query, 'user') == 1)
{


if($db->fetch_field($query, 'user') == 1)
{

Zeile 61Zeile 62
 */
function validate_password_from_username($username, $password)
{

 */
function validate_password_from_username($username, $password)
{

	global $db;

$query = $db->simple_select("users", "uid,username,password,salt,loginkey,coppauser,usergroup", "LOWER(username)='".$db->escape_string(my_strtolower($username))."'", array('limit' => 1));
















	global $db, $mybb;

$username = $db->escape_string(my_strtolower($username));
switch($mybb->settings['username_method'])
{
case 0:
$query = $db->simple_select("users", "uid,username,password,salt,loginkey,coppauser,usergroup", "LOWER(username)='".$username."'", array('limit' => 1));
break;
case 1:
$query = $db->simple_select("users", "uid,username,password,salt,loginkey,coppauser,usergroup", "LOWER(email)='".$username."'", array('limit' => 1));
break;
case 2:
$query = $db->simple_select("users", "uid,username,password,salt,loginkey,coppauser,usergroup", "LOWER(username)='".$username."' OR LOWER(email)='".$username."'", array('limit' => 1));
break;
default:
$query = $db->simple_select("users", "uid,username,password,salt,loginkey,coppauser,usergroup", "LOWER(username)='".$username."'", array('limit' => 1));
break;
}


$user = $db->fetch_array($query);
if(!$user['uid'])


$user = $db->fetch_array($query);
if(!$user['uid'])

	{

	{

		return false;
}
else

		return false;
}
else

Zeile 87Zeile 103
function validate_password_from_uid($uid, $password, $user = array())
{
global $db, $mybb;

function validate_password_from_uid($uid, $password, $user = array())
{
global $db, $mybb;

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

	if(isset($mybb->user['uid']) && $mybb->user['uid'] == $uid)

	{
$user = $mybb->user;
}

	{
$user = $mybb->user;
}

Zeile 97Zeile 113
		$user = $db->fetch_array($query);
}
if(!$user['salt'])

		$user = $db->fetch_array($query);
}
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']

		// 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']."'", 1);
}


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


Zeile 119Zeile 135
	if(salt_password(md5($password), $user['salt']) == $user['password'])
{
return $user;

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

	}
else
{

	}
else
{

		return false;
}
}

		return false;
}
}

Zeile 158Zeile 174

// Create new password based on salt
$saltedpw = salt_password($password, $salt);


// Create new password based on salt
$saltedpw = salt_password($password, $salt);





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


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


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

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





	$plugins->run_hooks("password_changed");

return $newpassword;

	$plugins->run_hooks("password_changed");

return $newpassword;

Zeile 180Zeile 196
 * @return string The password hash.
*/
function salt_password($password, $salt)

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

{

{

	return md5(md5($salt).$password);
}


	return md5(md5($salt).$password);
}


Zeile 296Zeile 312
 * 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.

 * 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.
* @return boolean True when success, false when otherwise.
*/

 * @param int (Optional) The uid of the user who's list to update.
* @return boolean True when success, false when otherwise.
*/

function remove_subscribed_thread($tid, $uid="")
{
global $mybb, $db;

function remove_subscribed_thread($tid, $uid="")
{
global $mybb, $db;

Zeile 415Zeile 431
 *
*/
function usercp_menu_messenger()

 *
*/
function usercp_menu_messenger()

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












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

$usercp_nav_messenger = $templates->get("usercp_nav_messenger");
// Hide tracking link if no permission
$tracking = '';
if($mybb->usergroup['cantrackpms'])
{
$tracking = $templates->get("usercp_nav_messenger_tracking");
}
eval("\$ucp_nav_tracking = \"". $tracking ."\";");

$folderlinks = '';

	$foldersexploded = explode("$%%$", $mybb->user['pmfolders']);
foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);
$folderinfo[1] = get_pm_folder_name($folderinfo[0], $folderinfo[1]);
if($folderinfo[0] == 4)

	$foldersexploded = explode("$%%$", $mybb->user['pmfolders']);
foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);
$folderinfo[1] = get_pm_folder_name($folderinfo[0], $folderinfo[1]);
if($folderinfo[0] == 4)

		{

		{

			$class = "usercp_nav_trash_pmfolder";
}
else if($folderlinks)

			$class = "usercp_nav_trash_pmfolder";
}
else if($folderlinks)

Zeile 439Zeile 465
		$folderlinks .= "<div><a href=\"private.php?fid=$folderinfo[0]\" class=\"usercp_nav_item {$class}\">$folderinfo[1]</a></div>\n";
}


		$folderlinks .= "<div><a href=\"private.php?fid=$folderinfo[0]\" class=\"usercp_nav_item {$class}\">$folderinfo[1]</a></div>\n";
}


	eval("\$usercpmenu .= \"".$templates->get("usercp_nav_messenger")."\";");

	eval("\$usercpmenu .= \"".$usercp_nav_messenger."\";");

}

/**
* Constructs the usercp profile menu.

}

/**
* Constructs the usercp profile menu.

 *
*/

 *
*/

function usercp_menu_profile()
{
global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapsed, $collapsedimg;

function usercp_menu_profile()
{
global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapsed, $collapsedimg;

Zeile 473Zeile 499
function usercp_menu_misc()
{
global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapsed, $collapsedimg;

function usercp_menu_misc()
{
global $db, $mybb, $templates, $theme, $usercpmenu, $lang, $collapsed, $collapsedimg;

 

$draftstart = $draftend = $draftcount = '';


$query = $db->simple_select("posts", "COUNT(*) AS draftcount", "visible='-2' AND uid='".$mybb->user['uid']."'");
$count = $db->fetch_array($query);


$query = $db->simple_select("posts", "COUNT(*) AS draftcount", "visible='-2' AND uid='".$mybb->user['uid']."'");
$count = $db->fetch_array($query);

Zeile 537Zeile 565
	if(intval($uid) == 0)
{
$uid = $mybb->user['uid'];

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

 
	}

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

	}

// Update total number of messages.

	}

// Update total number of messages.

Zeile 555Zeile 590
		$pmcount['unreadpms'] = $unread['pms_unread'];
}


		$pmcount['unreadpms'] = $unread['pms_unread'];
}


	if(is_array($pmcount))

	if(!empty($pmcount))

	{

	{

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

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

	}
return $pmcount;
}

	}
return $pmcount;
}