Zeile 56 | Zeile 56 |
---|
global $mybb;
$options = array(
|
global $mybb;
$options = array(
|
'fields' => array('username', 'password', 'salt', 'loginkey', 'coppauser', 'usergroup'),
| 'fields' => '*',
|
'username_method' => $mybb->settings['username_method'], );
$user = get_user_by_username($username, $options);
|
'username_method' => $mybb->settings['username_method'], );
$user = get_user_by_username($username, $options);
|
if(!$user['uid'])
| if(!$user)
|
{ return false; }
| { return false; }
|
Zeile 87 | Zeile 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); } 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']."'");
| $user = get_user($uid);
|
}
if(!$user['loginkey'])
| }
if(!$user['loginkey'])
|
Zeile 110 | Zeile 98 |
---|
); $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; }
|
Zeile 132 | Zeile 120 |
---|
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 156 | Zeile 144 |
---|
// 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 $password The md5()'ed password. * @param string $salt The salt. * @return string The password hash.
|
* @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 263 | Zeile 327 |
---|
$query = $db->simple_select("threadsubscriptions", "*", "tid='".(int)$tid."' AND uid='".(int)$uid."'"); $subscription = $db->fetch_array($query);
|
$query = $db->simple_select("threadsubscriptions", "*", "tid='".(int)$tid."' AND uid='".(int)$uid."'"); $subscription = $db->fetch_array($query);
|
if(!$subscription['tid'])
| if(!$subscription)
|
{ $insert_array = array( 'uid' => (int)$uid,
| { $insert_array = array( 'uid' => (int)$uid,
|
Zeile 312 | Zeile 376 |
---|
/** * 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.
| * 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)
|
* * @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;
| { global $mybb, $db;
if(!$uid) { $uid = $mybb->user['uid']; }
if(!$uid) { return false;
|
}
|
}
|
|
|
$fid = (int)$fid; $uid = (int)$uid;
$query = $db->simple_select("forumsubscriptions", "*", "fid='".$fid."' AND uid='{$uid}'", array('limit' => 1));
|
$fid = (int)$fid; $uid = (int)$uid;
$query = $db->simple_select("forumsubscriptions", "*", "fid='".$fid."' AND uid='{$uid}'", array('limit' => 1));
|
$fsubscription = $db->fetch_array($query); if(!$fsubscription['fid']) {
| $fsubscription = $db->fetch_array($query); if(!$fsubscription) {
|
$insert_array = array( 'fid' => $fid, 'uid' => $uid ); $db->insert_query("forumsubscriptions", $insert_array);
|
$insert_array = array( 'fid' => $fid, 'uid' => $uid ); $db->insert_query("forumsubscriptions", $insert_array);
|
}
return true; }
| }
return true; }
|
/** * Removes a forum from a user's forum subscription list.
| /** * Removes a forum from a user's forum subscription list.
|
Zeile 356 | Zeile 420 |
---|
* @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;
|
Zeile 364 | Zeile 428 |
---|
if(!$uid) { $uid = $mybb->user['uid'];
|
if(!$uid) { $uid = $mybb->user['uid'];
|
}
| }
|
if(!$uid) {
| if(!$uid) {
|
Zeile 382 | Zeile 446 |
---|
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 409 | Zeile 481 |
---|
*/ 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 450 | Zeile 523 |
---|
$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."\";"); }
| eval("\$usercpmenu .= \"".$usercp_nav_messenger."\";"); }
|
Zeile 471 | Zeile 544 |
---|
*/ 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)
| $changenameop = ''; if($mybb->usergroup['canchangename'] != 0)
|
Zeile 498 | Zeile 571 |
---|
$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 507 | Zeile 581 |
---|
*/ 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 = '';
| $draftstart = $draftend = $attachmentop = '';
|
$draftcount = $lang->ucp_nav_drafts;
$query = $db->simple_select("posts", "COUNT(pid) AS draftcount", "visible = '-2' AND uid = '{$mybb->user['uid']}'");
| $draftcount = $lang->ucp_nav_drafts;
$query = $db->simple_select("posts", "COUNT(pid) AS draftcount", "visible = '-2' AND uid = '{$mybb->user['uid']}'");
|
Zeile 536 | Zeile 610 |
---|
}
$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 644 | Zeile 719 |
---|
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 670 | Zeile 748 |
---|
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;
|