$OUT .= "<strong>".$ltr."</strong>";
} else {
// Output link to letter
- $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&what=".getWhat();
+ $OUT .= "<a href=\"{?URL?}/modules.php?module=admin&what=".getWhat();
if (REQUEST_ISSET_GET('mode')) $OUT .= "&mode=".REQUEST_GET('mode');
$OUT .= "&letter=".$ltr."&sortby=".$sortby.$add."\">".$ltr."</a>";
}
if ($sortby == $sort) {
$OUT .= "<strong>" . $title . "</strong> | ";
} else {
- $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&what=list_user&letter=" . $letter . "&sortby=" . $sort.$add . "\">" . $title . "</a> | ";
+ $OUT .= "<a href=\"{?URL?}/modules.php?module=admin&what=list_user&letter=" . $letter . "&sortby=" . $sort.$add . "\">" . $title . "</a> | ";
}
} // END - foreach
if (!REQUEST_ISSET_GET('sortby')) REQUEST_SET_GET('sortby', 'userid');
// Base link
- $OUT .= '<a href="{!URL!}/modules.php?module=admin&what=' . getWhat();
+ $OUT .= '<a href="{?URL?}/modules.php?module=admin&what=' . getWhat();
// Add status or mode
if (REQUEST_ISSET_GET('status')) $OUT .= '&mode=' . REQUEST_GET('status');
}
// Create email link to user's account
-function generateUserEmailLink($email, $mod='admin') {
+function generateUserEmailLink($email, $mod = 'admin') {
// Show contact link only if user is confirmed by default
$locked = " AND `status`='CONFIRMED'";
// But admins shall always see it
if (IS_ADMIN()) $locked = '';
- $result = SQL_QUERY_ESC("SELECT `userid`
-FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE `email`='%s'" . $locked." LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT
+ `userid`
+FROM
+ `{!_MYSQL_PREFIX!}_user_data`
+WHERE
+ `email`='%s'" . $locked."
+LIMIT 1",
array($email), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load userid
list($uid) = SQL_FETCHROW($result);
// Rewrite email address to contact link
- $email = '{!URL!}/modules.php?module=' . $mod . '&what=user_contct&uid=' . bigintval($uid);
+ $email = '{?URL?}/modules.php?module=' . $mod . '&what=user_contct&uid=' . bigintval($uid);
} // END - if
// Free memory
}
// Do the user login
-function USER_DO_LOGIN ($uid, $passwd) {
+function USER_DO_LOGIN ($uid, $passwd, $successUrl = '') {
// Init variables
- $dmy = '';
+ $dmy = ''; $add = '';
// Add last_login if available
$lastOnline = '';
if (GET_EXT_VERSION('sql_patches') >= '0.2.8') {
- $lastOnline = ', last_login';
+ $lastOnline = ', `last_login`';
} // END - if
// Init array
'last_online' => 0,
'last_login' => 0,
'hash' => ''
- );
+ );
- // Check login data
- if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE($uid))) {
- // Nickname entered
- $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' AND `status`='CONFIRMED' LIMIT 1",
- array($uid), __FUNCTION__, __LINE__);
+ // Check login data
+ if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE($uid))) {
+ // Nickname entered
+ $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' AND `status`='CONFIRMED' LIMIT 1",
+ array($uid), __FUNCTION__, __LINE__);
+ } else {
+ // Direct userid entered
+ $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
+ array($uid, $content['hash']), __FUNCTION__, __LINE__);
+ }
+
+ // Load entry
+ $content = SQL_FETCHARRAY($result);
+ if (!empty($content['userid'])) $uid = bigintval($content['userid']);
+
+ // Is there an entry?
+ if ((SQL_NUMROWS($result) == 1) && ((isNicknameUsed($content['userid'] === true) && (!empty($content['userid']))) || ($content['userid'] == $uid))) {
+ // Free result
+ SQL_FREERESULT($result);
+
+ // Check for old MD5 passwords
+ if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) {
+ // Just set the hash to the password from DB... :)
+ $content['hash'] = $content['password'];
} else {
- // Direct userid entered
- $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
- array($uid, $content['hash']), __FUNCTION__, __LINE__);
+ // Hash password with improved way for comparsion
+ $content['hash'] = generateHash($passwd, substr($content['password'], 0, -40));
}
- // Load entry
- $content = SQL_FETCHARRAY($result);
- if (!empty($content['userid'])) $uid = bigintval($content['userid']);
+ // Does the password match the hash?
+ if ($content['hash'] == $content['password']) {
+ // New hashed password found so let's generate a new one
+ $content['hash'] = generateHash($passwd);
+
+ // ... and update database
+ // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `password`='%s' WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
+ array($content['hash'], $uid), __FUNCTION__, __LINE__);
+
+ // No login bonus by default
+ $GLOBALS['bonus_payed'] = false;
+
+ // Probe for last online timemark
+ $probe = time() - $content['last_online'];
+ if (!empty($content['last_login'])) $probe = time() - $content['last_login'];
+ if ((GET_EXT_VERSION('bonus') >= '0.2.2') && ($probe >= getConfig('login_timeout'))) {
+ // Add login bonus to user's account
+ $add = sprintf(", `login_bonus`=`login_bonus`+%s",
+ (float)getConfig('login_bonus')
+ );
+ $GLOBALS['bonus_payed'] = true;
- // Is there an entry?
- if ((SQL_NUMROWS($result) == 1) && ((isNicknameUsed($content['userid'] === true) && (!empty($content['userid']))) || ($content['userid'] == $uid))) {
- // Free result
- SQL_FREERESULT($result);
+ // Subtract login bonus from userid's account or jackpot
+ if ((GET_EXT_VERSION('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) BONUS_POINTS_HANDLER('login_bonus');
+ } // END - if
- // Check for old MD5 passwords
- if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) {
- // Just set the hash to the password from DB... :)
- $content['hash'] = $content['password'];
- } else {
- // Hash password with improved way for comparsion
- $content['hash'] = generateHash($passwd, substr($content['password'], 0, -40));
- }
+ // Calculate new hash with the secret key and master salt together
+ $content['hash'] = generatePassString($content['hash']);
- // Does the password match the hash?
- if ($content['hash'] == $content['password']) {
- // New hashed password found so let's generate a new one
- $content['hash'] = generateHash($passwd);
-
- // ... and update database
- // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `password`='%s' WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
- array($content['hash'], $uid), __FUNCTION__, __LINE__);
-
- // No login bonus by default
- $GLOBALS['bonus_payed'] = false;
-
- // Probe for last online timemark
- $probe = time() - $content['last_online'];
- if (!empty($content['last_login'])) $probe = time() - $content['last_login'];
- if ((GET_EXT_VERSION('bonus') >= '0.2.2') && ($probe >= getConfig('login_timeout'))) {
- // Add login bonus to user's account
- $add = sprintf(", `login_bonus`=`login_bonus`+%s",
- (float)getConfig('login_bonus')
- );
- $GLOBALS['bonus_payed'] = true;
-
- // Subtract login bonus from userid's account or jackpot
- if ((GET_EXT_VERSION('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) BONUS_POINTS_HANDLER('login_bonus');
- } // END - if
-
- // Calculate new hash with the secret key and master salt together
- $content['hash'] = generatePassString($content['hash']);
-
- // Update global array
- // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
- setUserId($uid);
-
- // Try to set session data (which shall normally always work!)
- if ((setSession('userid', $uid )) && (setSession('u_hash', $content['hash']))) {
- // Update database records
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `total_logins`=`total_logins +1" . $add . " WHERE `userid`=%s LIMIT 1",
- array($uid), __FUNCTION__, __LINE__);
- if (SQL_AFFECTEDROWS() == 1) {
+ // Update global array
+ // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+ setUserId($uid);
+
+ // Try to set session data (which shall normally always work!)
+ if ((setSession('userid', $uid )) && (setSession('u_hash', $content['hash']))) {
+ // Update database records
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1",
+ array($uid), __FUNCTION__, __LINE__);
+ if (SQL_AFFECTEDROWS() == 1) {
+ // Is a success URL set?
+ if (empty($successUrl)) {
// Procedure to checking for login data
if (($GLOBALS['bonus_payed']) && (EXT_IS_ACTIVE('bonus'))) {
// Bonus added (just displaying!)
$URL = 'modules.php?module=chk_login&mode=login';
}
} else {
- // Cannot update counter!
- $URL = 'modules.php?module=index&what=login&login='.getCode('CNTR_FAILED');
+ // Use this URL
+ $URL = $successUrl;
}
} else {
- // Cookies not setable!
- $URL = 'modules.php?module=index&what=login&login='.getCode('NO_COOKIES');
+ // Cannot update counter!
+ $URL = 'modules.php?module=index&what=login&login='.getCode('CNTR_FAILED');
}
- } elseif (GET_EXT_VERSION('sql_patches') >= '0.6.1') {
- // Update failture counter
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1",
- array($uid), __FUNCTION__, __LINE__);
-
- // Wrong password!
- $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_PASS');
- }
- } elseif (((isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $uid)) {
- // Other account status?
- // @TODO Can this query be merged with above query?
- $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
- array($uid), __FUNCTION__, __LINE__);
-
- // Entry found?
- if (SQL_NUMROWS($result) == 1) {
- // Load status
- list($status) = SQL_FETCHROW($result);
-
- // Create an error code from given status
- $errorCode = generateErrorCodeFromUserStatus($status);
} else {
- // ID not found!
- $errorCode = getCode('WRONG_ID');
+ // Cookies not setable!
+ $URL = 'modules.php?module=index&what=login&login='.getCode('NO_COOKIES');
}
+ } elseif (GET_EXT_VERSION('sql_patches') >= '0.6.1') {
+ // Update failture counter
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1",
+ array($uid), __FUNCTION__, __LINE__);
- // Construct URL
- $URL = 'modules.php?module=index&what=login&login='.$errorCode;
+ // Wrong password!
+ $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_PASS');
+ }
+ } elseif (((isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $uid)) {
+ // Other account status?
+ // @TODO Can this query be merged with above query?
+ $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
+ array($uid), __FUNCTION__, __LINE__);
+
+ // Entry found?
+ if (SQL_NUMROWS($result) == 1) {
+ // Load status
+ list($status) = SQL_FETCHROW($result);
+
+ // Create an error code from given status
+ $errorCode = generateErrorCodeFromUserStatus($status);
} else {
// ID not found!
- $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_ID');
+ $errorCode = getCode('WRONG_ID');
}
- // Return URL
- return $URL;
+ // Construct URL
+ $URL = 'modules.php?module=index&what=login&login='.$errorCode;
+ } else {
+ // ID not found!
+ $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_ID');
+ }
+
+ // Return URL
+ return $URL;
}
// Try to send a new password for the given user account
projects / mailer.git / blobdiff