| Zeile 88 | Zeile 88 |
|---|
if(!$user['password'])
{
$user = get_user($uid);
|
if(!$user['password'])
{
$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
$password_fields = create_password($user['password'], false, $user);
$db->update_query("users", $password_fields, "uid='".$user['uid']."'");
| |
}
if(!$user['loginkey'])
| }
if(!$user['loginkey'])
|
| Zeile 246 | Zeile 240 |
|---|
$password_fields = create_password($password, $user['salt'], $user);
return my_hash_equals($user['password'], $password_fields['password']);
|
$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;
| |
}
}
| }
}
|
| Zeile 291 | Zeile 251 |
|---|
function generate_salt()
{
return random_str(8);
|
function generate_salt()
{
return random_str(8);
|
}
/**
| }
/**
|
* Generates a 50 character random login key.
*
* @return string The login key.
| * Generates a 50 character random login key.
*
* @return string The login key.
|
| Zeile 301 | Zeile 261 |
|---|
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).
|
| Zeile 310 | Zeile 270 |
|---|
* @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 = generate_salt();
$sql_array = array(
|
| Zeile 320 | Zeile 280 |
|---|
$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.
*
|
| Zeile 331 | Zeile 291 |
|---|
function update_loginkey($uid)
{
global $db;
|
function update_loginkey($uid)
{
global $db;
|
|
|
$loginkey = generate_loginkey();
$sql_array = array(
"loginkey" => $loginkey
| $loginkey = generate_loginkey();
$sql_array = array(
"loginkey" => $loginkey
|
| Zeile 367 | 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(empty($subscription) || !$subscription['tid'])
|
{
$insert_array = array(
'uid' => (int)$uid,
'tid' => (int)$tid,
'notification' => (int)$notification,
'dateline' => TIME_NOW
|
{
$insert_array = array(
'uid' => (int)$uid,
'tid' => (int)$tid,
'notification' => (int)$notification,
'dateline' => TIME_NOW
|
);
$db->insert_query("threadsubscriptions", $insert_array);
}
else
| );
$db->insert_query("threadsubscriptions", $insert_array);
}
else
|
{
// Subscription exists - simply update notification
$update_array = array(
"notification" => (int)$notification
);
$db->update_query("threadsubscriptions", $update_array, "uid='{$uid}' AND tid='{$tid}'");
|
{
// Subscription exists - simply update notification
$update_array = array(
"notification" => (int)$notification
);
$db->update_query("threadsubscriptions", $update_array, "uid='{$uid}' AND tid='{$tid}'");
|
}
return true;
}
/**
| }
return true;
}
/**
|
* 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.
*
|
| Zeile 397 | Zeile 357 |
|---|
* @return boolean True when success, false when otherwise.
*/
function remove_subscribed_thread($tid, $uid=0)
|
* @return boolean True when success, false when otherwise.
*/
function remove_subscribed_thread($tid, $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;
}
|
$db->delete_query("threadsubscriptions", "tid='".$tid."' AND uid='{$uid}'");
return true;
| $db->delete_query("threadsubscriptions", "tid='".$tid."' AND uid='{$uid}'");
return true;
|
| Zeile 429 | Zeile 389 |
|---|
if(!$uid)
{
$uid = $mybb->user['uid'];
|
if(!$uid)
{
$uid = $mybb->user['uid'];
|
}
| }
|
if(!$uid)
{
|
if(!$uid)
{
|
| Zeile 441 | Zeile 401 |
|---|
$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 460 | 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 521 | 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 = '';
| $usercp_nav_messenger = $templates->get("usercp_nav_messenger");
// Hide tracking link if no permission
$tracking = '';
|
| Zeile 583 | 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 610 | 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 619 | 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 = '';
$draftcount = $lang->ucp_nav_drafts;
|
$draftstart = $draftend = '';
$draftcount = $lang->ucp_nav_drafts;
|
| Zeile 628 | Zeile 590 |
|---|
$count = $db->fetch_field($query, 'draftcount');
if($count > 0)
|
$count = $db->fetch_field($query, 'draftcount');
if($count > 0)
|
{
| {
|
$draftcount = $lang->sprintf($lang->ucp_nav_drafts_active, my_number_format($count));
}
| $draftcount = $lang->sprintf($lang->ucp_nav_drafts_active, my_number_format($count));
}
|
| Zeile 648 | 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 756 | 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 782 | 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;
|