// Add links for selecting some users
function alpha ($sortby, $colspan, $return=false) {
- if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', 0);
+ if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', 0);
$add = '&page='.getRequestElement('page').'&offset='.getRequestElement('offset');
if (isGetRequestElementSet('mode')) $add .= '&mode='.getRequestElement('mode');
// Add links for sorting
function addSortLinks ($letter, $sortby, $colspan, $return=false) {
$OUT = '';
- if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', 0);
- if (!isGetRequestElementSet('page')) setRequestGetElement('page' , 0);
+ if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', 0);
+ if (!isGetRequestElementSet('page')) setGetRequestElement('page' , 0);
// Add page and offset
$add = '&page=' . getRequestElement('page') . '&offset=' . getRequestElement('offset');
if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
$OUT .= '<strong>-';
} else {
- if (!isGetRequestElementSet('letter')) setRequestGetElement('letter', getMessage('_ALL2'));
- if (!isGetRequestElementSet('sortby')) setRequestGetElement('sortby', 'userid');
+ if (!isGetRequestElementSet('letter')) setGetRequestElement('letter', getMessage('_ALL2'));
+ if (!isGetRequestElementSet('sortby')) setGetRequestElement('sortby', 'userid');
// Base link
$OUT .= '<a href="{%url=modules.php?module=admin&what=' . getWhat();
if (!empty($content['userid'])) $userid = bigintval($content['userid']);
// Is there an entry?
- if (((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) || ($content['userid'] == $userid)) {
+ if ((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
// Check for old MD5 passwords
- if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) {
+ if ((strlen(getUserData('password')) == 32) && (md5($passwd) == getUserData('password'))) {
// Just set the hash to the password from DB... :)
- $content['hash'] = $content['password'];
+ $content['hash'] = getUserData('password');
} else {
// Hash password with improved way for comparsion
- $content['hash'] = generateHash($passwd, substr($content['password'], 0, -40));
+ $content['hash'] = generateHash($passwd, substr(getUserData('password'), 0, -40));
}
// Does the password match the hash?
- if ($content['hash'] == $content['password']) {
+ if ($content['hash'] == getUserData('password')) {
// New hashed password found so let's generate a new one
$content['hash'] = generateHash($passwd);
$GLOBALS['bonus_payed'] = false;
// Probe for last online timemark
- $probe = time() - $content['last_online'];
- if (!empty($content['last_login'])) $probe = time() - $content['last_login'];
+ $probe = time() - getUserData('last_online');
+ if (getUserData('last_login') > 0) $probe = time() - getUserData('last_login');
+
if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && ($probe >= getConfig('login_timeout'))) {
// Add login bonus to user's account
$add = ', `login_bonus`=`login_bonus`+{?login_bonus?}';
// Wrong password!
$errorCode = getCode('WRONG_PASS');
}
- } elseif (((isExtensionActive('nickname')) && (isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $userid)) {
- // Other account status?
- if (fetchUserData($userid)) {
- // Create an error code from given status
- $errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
- } else {
- // id not found!
- $errorCode = getCode('WRONG_ID');
- }
- } elseif ($errorCode == '0') {
- // id not found!
+ } elseif (getUserData('status') != 'CONFIRMED') {
+ // Create an error code from given status
+ $errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
+
+ // Set userid in session
+ setSession('current_userid', getUserData('userid'));
+ } elseif (!isUserDataValid()) {
+ // User id not found!
$errorCode = getCode('WRONG_ID');
+ } else {
+ // Unknown error
+ $errorCode = getCode('UNKNOWN_ERROR');
}
// Error code provided?