Vergleich inc/functions_user.php - 1.8.6 - 1.8.27

  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

	}
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 110Zeile 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;

Zeile 127Zeile 121
 * @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="")
{

 */
function update_password($uid, $password, $salt="")
{

Zeile 155Zeile 150

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

{

{

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

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

 
}

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

}

/**

}

/**

Zeile 192Zeile 263
 * Generates a 50 character random login key.
*
* @return string The login key.

 * Generates a 50 character random login key.
*
* @return string The login key.

 */

 */

function generate_loginkey()
{
return random_str(50);

function generate_loginkey()
{
return random_str(50);

Zeile 200Zeile 271

/**
* 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 $uid 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 234Zeile 305
	$db->update_query("users", $sql_array, "uid='{$uid}'");

return $loginkey;

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

return $loginkey;


}

/**


}

/**

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

Zeile 249Zeile 320
function add_subscribed_thread($tid, $notification=1, $uid=0)
{
global $mybb, $db;

function add_subscribed_thread($tid, $notification=1, $uid=0)
{
global $mybb, $db;





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

if(!$uid)

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

if(!$uid)

	{

	{

		return false;
}

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

		return false;
}

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

	if(!$subscription['tid'])

	if(empty($subscription) || !$subscription['tid'])

	{
$insert_array = array(
'uid' => (int)$uid,
'tid' => (int)$tid,
'notification' => (int)$notification,

	{
$insert_array = array(
'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 338Zeile 407

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

	if(!$fsubscription['fid'])

	if(empty($fsubscription) || !$fsubscription['fid'])

	{
$insert_array = array(
'fid' => $fid,

	{
$insert_array = array(
'fid' => $fid,

Zeile 383Zeile 452
function usercp_menu()
{
global $mybb, $templates, $theme, $plugins, $lang, $usercpnav, $usercpmenu;

function usercp_menu()
{
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 410Zeile 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)) ? $lang->expcol_expand : $lang->expcol_collapse;

	$usercp_nav_messenger = $templates->get("usercp_nav_messenger");
// Hide tracking link if no permission
$tracking = '';
if($mybb->usergroup['cantrackpms'])

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

		$tracking = $templates->get("usercp_nav_messenger_tracking");
}
eval("\$ucp_nav_tracking = \"". $tracking ."\";");

Zeile 451Zeile 529
		$folder_name = $folderinfo[1];

eval("\$folderlinks .= \"".$templates->get("usercp_nav_messenger_folder")."\";");

		$folder_name = $folderinfo[1];

eval("\$folderlinks .= \"".$templates->get("usercp_nav_messenger_folder")."\";");

	}


	}


	if(!isset($collapsedimg['usercppms']))

	if(!isset($collapsedimg['usercppms']))

	{

	{

		$collapsedimg['usercppms'] = '';
}

if(!isset($collapsed['usercppms_e']))
{
$collapsed['usercppms_e'] = '';

		$collapsedimg['usercppms'] = '';
}

if(!isset($collapsed['usercppms_e']))
{
$collapsed['usercppms_e'] = '';

	}


	}


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

/**
* Constructs the usercp profile menu.

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

/**
* Constructs the usercp profile menu.

 *
*/

 *
*/

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)
{
eval("\$changenameop = \"".$templates->get("usercp_nav_changename")."\";");

	$changenameop = '';
if($mybb->usergroup['canchangename'] != 0)
{
eval("\$changenameop = \"".$templates->get("usercp_nav_changename")."\";");

	}


	}


	$changesigop = '';
if($mybb->usergroup['canusesig'] == 1 && ($mybb->usergroup['canusesigxposts'] == 0 || $mybb->usergroup['canusesigxposts'] > 0 && $mybb->user['postnum'] > $mybb->usergroup['canusesigxposts']))
{

	$changesigop = '';
if($mybb->usergroup['canusesig'] == 1 && ($mybb->usergroup['canusesigxposts'] == 0 || $mybb->usergroup['canusesigxposts'] > 0 && $mybb->user['postnum'] > $mybb->usergroup['canusesigxposts']))
{

Zeile 487Zeile 565
		{
eval("\$changesigop = \"".$templates->get("usercp_nav_editsignature")."\";");
}

		{
eval("\$changesigop = \"".$templates->get("usercp_nav_editsignature")."\";");
}

	}


	}


	if(!isset($collapsedimg['usercpprofile']))

	if(!isset($collapsedimg['usercpprofile']))

	{

	{

		$collapsedimg['usercpprofile'] = '';
}

if(!isset($collapsed['usercpprofile_e']))
{
$collapsed['usercpprofile_e'] = '';

		$collapsedimg['usercpprofile'] = '';
}

if(!isset($collapsed['usercpprofile_e']))
{
$collapsed['usercpprofile_e'] = '';

	}

	}





 
	$expaltext = (in_array("usercpprofile", $collapse)) ? $lang->expcol_expand : $lang->expcol_collapse;

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


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


Zeile 508Zeile 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 524Zeile 603
	if($mybb->settings['enableattachments'] != 0)
{
eval("\$attachmentop = \"".$templates->get("usercp_nav_attachments")."\";");

	if($mybb->settings['enableattachments'] != 0)
{
eval("\$attachmentop = \"".$templates->get("usercp_nav_attachments")."\";");

	}


	}


	if(!isset($collapsedimg['usercpmisc']))

	if(!isset($collapsedimg['usercpmisc']))

	{

	{

		$collapsedimg['usercpmisc'] = '';

		$collapsedimg['usercpmisc'] = '';

	}


	}


	if(!isset($collapsed['usercpmisc_e']))
{
$collapsed['usercpmisc_e'] = '';

	if(!isset($collapsed['usercpmisc_e']))
{
$collapsed['usercpmisc_e'] = '';

	}


	}


	$profile_link = get_profile_link($mybb->user['uid']);

	$profile_link = get_profile_link($mybb->user['uid']);

 
	$expaltext = (in_array("usercpmisc", $collapse)) ? $lang->expcol_expand : $lang->expcol_collapse;

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


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


Zeile 645Zeile 725

switch($fid)
{


switch($fid)
{

		case 1:

		case 0:

			return $lang->folder_inbox;

			return $lang->folder_inbox;

 
			break;
case 1:
return $lang->folder_unread;

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

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

			break;

			break;

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

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

Zeile 671Zeile 754
function generate_question($old_qid=0)
{
global $db;

function generate_question($old_qid=0)
{
global $db;





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

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

	}

	}

	else
{
$order_by = 'RAND()';
}

	else
{
$order_by = 'RAND()';
}

	



$excl_old = '';

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

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