* -------------------------------------------------------------------- *
* Kurzbeschreibung : Spezielle Funktionen fuer die user-Erweiterung *
* -------------------------------------------------------------------- *
- * $Revision:: 856 $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009) $ *
+ * $Revision:: $ *
+ * $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
- * $Author:: stelzi $ *
+ * $Author:: $ *
* Needs to be in all Files and every File needs "svn propset *
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
// Add links for selecting some users
function alpha ($sortby, $colspan, $return=false) {
if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', 0);
- $ADD = "&page=".REQUEST_GET(('page'))."&offset=".REQUEST_GET(('offset'));
- if (REQUEST_ISSET_GET(('mode'))) $ADD .= "&mode=".REQUEST_GET(('mode'));
+ $add = "&page=".REQUEST_GET(('page'))."&offset=".REQUEST_GET(('offset'));
+ if (REQUEST_ISSET_GET(('mode'))) $add .= "&mode=".REQUEST_GET(('mode'));
/* Creates the list of letters and makes them a link. */
$alphabet = array(getMessage('_ALL2'),"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z",getMessage('_OTHERS'));
// Output link to letter
$OUT .= "<a href=\"{!URL!}/modules.php?module=admin&what=".$GLOBALS['what'];
if (REQUEST_ISSET_GET(('mode'))) $OUT .= "&mode=".REQUEST_GET(('mode'));
- $OUT .= "&letter=".$ltr."&sortby=".$sortby.$ADD."\">".$ltr."</a>";
+ $OUT .= "&letter=".$ltr."&sortby=".$sortby.$add."\">".$ltr."</a>";
}
if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
if (!REQUEST_ISSET_GET(('page'))) REQUEST_SET_GET('page' , 0);
// Add page and offset
- $ADD = "&page=".REQUEST_GET(('page'))."&offset=".REQUEST_GET(('offset'));
+ $add = "&page=".REQUEST_GET(('page'))."&offset=".REQUEST_GET(('offset'));
// Add status or mode
- if (REQUEST_ISSET_GET(('status'))) $ADD .= "&mode=".REQUEST_GET(('status'));
- elseif (REQUEST_ISSET_GET(('mode'))) $ADD .= "&mode=".REQUEST_GET(('mode'));
+ if (REQUEST_ISSET_GET(('status'))) $add .= "&mode=".REQUEST_GET(('status'));
+ elseif (REQUEST_ISSET_GET(('mode'))) $add .= "&mode=".REQUEST_GET(('mode'));
// Makes order by links..
if ($letter == "front") $letter = getMessage('_ALL2');
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
$result = SQL_QUERY_ESC("SELECT userid
FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE email='%s'".$locked." LIMIT 1",
+WHERE `email`='%s'".$locked." LIMIT 1",
array($email), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load userid
// Do the user login
function USER_DO_LOGIN ($uid, $passwd) {
+ // Init variables
+ $dmy = "";
+
// Add last_login if available
- $lastOnline = "";
+ $lastOnline = "";
if (GET_EXT_VERSION("sql_patches") >= "0.2.8") {
$lastOnline = ", last_login";
} // END - if
+ // Init array
+ $content = array(
+ 'password' => "",
+ 'userid' => "",
+ 'last_online' => 0,
+ 'last_login' => 0,
+ 'hash' => ""
+ );
+
// Check login data
- $password = ""; $uid2 = ""; $dmy = ""; $online = 0; $login = 0;
if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($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__);
- list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
- if (!empty($uid2)) $uid = bigintval($uid2);
} 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, $hash), __FUNCTION__, __LINE__);
- list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
+ 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) && ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $uid))) {
+ if ((SQL_NUMROWS($result) == 1) && ((($probe_nickname) && (!empty($content['userid']))) || ($content['userid'] == $uid))) {
// Free result
SQL_FREERESULT($result);
- // By default the hash is empty
- $hash = "";
-
// Check for old MD5 passwords
- if ((strlen($password) == 32) && (md5($passwd) == $password)) {
+ if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) {
// Just set the hash to the password from DB... :)
- $hash = $password;
+ $content['hash'] = $content['password'];
} else {
// Hash password with improved way for comparsion
- $hash = generateHash($passwd, substr($password, 0, -40));
+ $content['hash'] = generateHash($passwd, substr($content['password'], 0, -40));
}
- if ($hash == $password) {
+ // Does the password match the hash?
+ if ($content['hash'] == $content['password']) {
// New hashed password found so let's generate a new one
- $hash = generateHash($passwd);
+ $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($hash, $uid), __FUNCTION__, __LINE__);
+ array($content['hash'], $uid), __FUNCTION__, __LINE__);
// No login bonus by default
- // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', array('login' => $login, 'online' => $online));
- $BONUS = false;
+ $GLOBALS['bonus_payed'] = false;
// Probe for last online timemark
- $probe = time() - $online;
- if (!empty($login)) $probe = time() - $login;
+ $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",
+ $add = sprintf(", login_bonus=login_bonus+%s",
(float)getConfig('login_bonus')
);
- $BONUS = true;
+ $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
- // Init variables
- $login = false;
-
// Calculate new hash with the secret key and master salt together
- $hash = generatePassString($hash);
+ $content['hash'] = generatePassString($content['hash']);
// Update global array
- // @TODO Make this filter working: $URL = runFilterChain('do_login', array('uid' => $uid, 'hash' => $hash, 'addon' => $ADDON));
+ // @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 ((set_session('userid', $uid )) && (set_session('u_hash', $hash))) {
+ if ((set_session('userid', $uid )) && (set_session('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",
+ 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) {
// Procedure to checking for login data
- if (($BONUS) && (EXT_IS_ACTIVE("bonus"))) {
+ if (($GLOBALS['bonus_payed']) && (EXT_IS_ACTIVE("bonus"))) {
// Bonus added (just displaying!)
$URL = "modules.php?module=chk_login&mode=bonus";
} else {
// Wrong password!
$URL = "modules.php?module=index&what=login&login=".getCode('WRONG_PASS');
}
- } elseif ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $uid)) {
+ } elseif ((($probe_nickname) && (!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",
list($status) = SQL_FETCHROW($result);
// Create an error code from given status
- $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
+ $errorCode = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
} else {
// ID not found!
- $ERROR = getCode('WRONG_ID');
+ $errorCode = getCode('WRONG_ID');
}
// Construct URL
- $URL = "modules.php?module=index&what=login&login=".$ERROR;
+ $URL = "modules.php?module=index&what=login&login=".$errorCode;
} else {
// ID not found!
$URL = "modules.php?module=index&what=login&login=".getCode('WRONG_ID');
if (!empty($email)) $email = str_replace("{DOT}", '.', $email);
// Init result and error
- $ERROR = "";
+ $errorCode = "";
$result = false;
// Probe userid/nickname
} else {
// Userid not set!
DEBUG_LOG(__FUNCTION__, __LINE__, "Userid is not set! BUG!");
- $ERROR = getCode('WRONG_ID');
+ $errorCode = getCode('WRONG_ID');
}
// Any entry found?
LOAD_TEMPLATE("admin_settings_saved", false, getMessage('GUEST_NEW_PASSWORD_SEND'));
} else {
// Account is locked or unconfirmed
- $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
+ $errorCode = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
// Load URL
- LOAD_URL("modules.php?module=index&what=login&login=".$ERROR);
+ LOAD_URL("modules.php?module=index&what=login&login=".$errorCode);
}
} else {
// ID or email is wrong
}
// Return the error code
- return $ERROR;
+ return $errorCode;
}
// [EOF]
projects / mailer.git / blobdiff