X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=ec3958a6455f70468f6ed8815f4b6fe713056254;hp=1e802cdb4de52b50b6f7b7b08cbccbdf0904b711;hb=f928ad2bed60fa256d0641eaf6d2c027a2944688;hpb=3608f72d51e8126720024704398cf738e61f890b
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 1e802cdb4d..ec3958a645 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Spezielle Funktionen fuer die user-Erweiterung *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -33,30 +38,29 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
}
// Add links for selecting some users
function alpha ($sortby, $colspan, $return=false) {
- global $_CONFIG;
- if (empty($_GET['offset'])) $_GET['offset'] = 0;
- $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']);
- if (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['mode']);
+ 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');
/* Creates the list of letters and makes them a link. */
- $alphabet = array(_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",_OTHERS);
+ $alphabet = explode(',', 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'));
$num = count($alphabet) - 1;
- $OUT = "";
+ $OUT = '';
while (list($counter, $ltr) = each($alphabet)) {
- if ($_GET['letter'] == $ltr) {
+ if (REQUEST_GET('letter') == $ltr) {
// Current letter is letter from URL
$OUT .= "".$ltr."";
} else {
// Output link to letter
- $OUT .= "".$ltr."";
+ $OUT .= "".$ltr."";
}
if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
@@ -70,7 +74,7 @@ function alpha ($sortby, $colspan, $return=false) {
// Load template
$OUT = LOAD_TEMPLATE("admin_list_user_alpha", true);
- if ($return) {
+ if ($return === true) {
// Return generated code
return $OUT;
} else {
@@ -80,47 +84,47 @@ function alpha ($sortby, $colspan, $return=false) {
}
// Add links for sorting
-function SortLinks($letter, $sortby, $colspan, $return=false) {
- $OUT = "";
- if (empty($_GET['offset'])) $_GET['offset'] = 0;
- if (empty($_GET['page'])) $_GET['page'] = 0;
+function SortLinks ($letter, $sortby, $colspan, $return=false) {
+ $OUT = '';
+ if (!REQUEST_ISSET_GET('offset')) REQUEST_SET_GET('offset', 0);
+ if (!REQUEST_ISSET_GET('page')) REQUEST_SET_GET('page' , 0);
// Add page and offset
- $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']);
+ $add = "&page=".REQUEST_GET('page')."&offset=".REQUEST_GET('offset');
// Add status or mode
- if (!empty($_GET['status'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['status']);
- elseif (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_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 = _ALL2;
+ if ($letter == "front") $letter = getMessage('_ALL2');
// Prepare array with all possible sorters
$list = array(
- 'userid' => _UID,
- 'family' => FAMILY_NAME,
- 'email' => ADDY,
- 'REMOTE_ADDR' => REMOTE_IP
+ 'userid' => getMessage('_UID'),
+ 'family' => getMessage('FAMILY_NAME'),
+ 'email' => getMessage('ADDY'),
+ 'REMOTE_ADDR' => getMessage('REMOTE_IP')
);
// Add nickname if extension is installed
- if (EXT_IS_ACTIVE("nickname")) {
- $list['nickname'] = NICKNAME;
- }
+ if (EXT_IS_ACTIVE('nickname')) {
+ $list['nickname'] = getMessage('NICKNAME');
+ } // END - if
foreach ($list as $sort => $title) {
if ($sortby == $sort) {
- $OUT .= "".$title." | ";
+ $OUT .= "" . $title . " | ";
} else {
- $OUT .= "".$title." | ";
+ $OUT .= "" . $title . " | ";
}
} // END - foreach
define('__SORT_LIST', substr($OUT, 0, -13));
// Load template
- $OUT = LOAD_TEMPLATE("admin_list_user_sort", true);
- if ($return) {
+ $OUT = LOAD_TEMPLATE('admin_list_user_sort', true);
+ if ($return === true) {
// Return code
return $OUT;
} else {
@@ -130,58 +134,52 @@ function SortLinks($letter, $sortby, $colspan, $return=false) {
}
// Add page navigation
-function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
- if (!$show_form) {
- // Empty row
- define('__FORM_HEADER', "| |
");
- } else {
+function ADD_PAGENAV ($PAGES, $offset, $show_form, $colspan,$return=false) {
+ if ($show_form) {
// Load form for changing number of lines
- define('__FORM_HEADER', LOAD_TEMPLATE("admin_list_user_sort_form", true));
- }
-
- if (!$show_form) {
- // Add line with bottom border
- define('__FORM_FOOTER', "| |
");
+ define('__FORM_HEADER', LOAD_TEMPLATE('admin_list_user_sort_form', true));
+ define('__FORM_FOOTER', '| |
');
} else {
- // Add line without bottom border
- define('__FORM_FOOTER', "| |
");
+ // Empty row
+ define('__FORM_HEADER', '| |
');
+ define('__FORM_FOOTER', '| |
');
}
- $OUT = "";
+ $OUT = '';
for ($page = 1; $page <= $PAGES; $page++) {
- if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) {
- $OUT .= "-";
+ if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) {
+ $OUT .= '-';
} else {
- if (empty($_GET['letter'])) $_GET['letter'] = _ALL2;
- if (empty($_GET['sortby'])) $_GET['sortby'] = "userid";
+ if (!REQUEST_ISSET_GET('letter')) REQUEST_SET_GET('letter', getMessage('_ALL2'));
+ if (!REQUEST_ISSET_GET('sortby')) REQUEST_SET_GET('sortby', 'userid');
// Base link
- $OUT .= "";
+ // Letter and so on
+ $OUT .= '&letter=' . REQUEST_GET('letter') . '&sortby=' . REQUEST_GET('sortby') . '&page=' . $page . '&offset=' . $offset . '">';
}
$OUT .= $page;
- if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) {
- $OUT .= "-";
+ if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) {
+ $OUT .= '-';
} else {
- $OUT .= "";
+ $OUT .= '';
}
- if ($page < $PAGES) $OUT .= " | ";
+ if ($page < $PAGES) $OUT .= ' | ';
} // END - for
define('__PAGENAV_LIST', $OUT);
// Load template
- $OUT = LOAD_TEMPLATE("admin_list_user_pagenav", true);
- if ($return) {
+ $OUT = LOAD_TEMPLATE('admin_list_user_pagenav', true);
+ if ($return === true) {
// Return code
return $OUT;
} else {
@@ -191,23 +189,27 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
}
// Create email link to user's account
-function USER_CREATE_EMAIL_LINK($email, $mod="admin") {
+function generateUserEmailLink($email, $mod = 'admin') {
// Show contact link only if user is confirmed by default
- $locked = " AND status='CONFIRMED'";
+ $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",
- array($email), __FILE__, __LINE__);
+ if (IS_ADMIN()) $locked = '';
+
+ $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&u_id=".bigintval($uid);
+ $email = '{!URL!}/modules.php?module=' . $mod . '&what=user_contct&uid=' . bigintval($uid);
} // END - if
// Free memory
@@ -218,16 +220,14 @@ WHERE email='%s'".$locked." LIMIT 1",
}
// Selects a random user id as the new referal id if they have at least X confirmed mails in this run
-function SELECT_RANDOM_REFID () {
- global $_CONFIG;
-
+function determineRandomReferalId () {
// Default is zero refid
$refid = 0;
// Is the extension version fine?
- if (GET_EXT_VERSION("user") >= "0.3.4") {
+ if (GET_EXT_VERSION('user') >= '0.3.4') {
// Get all user ids
- $totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true, " AND `rand_confirmed` >= ".getConfig('user_min_confirmed')."");
+ $totalUsers = GET_TOTAL_DATA('CONFIRMED', 'user_data', 'userid', 'status', true, " AND `rand_confirmed` >= ".getConfig('user_min_confirmed')."");
// Do we have at least one?
if ($totalUsers > 0) {
@@ -235,8 +235,8 @@ function SELECT_RANDOM_REFID () {
$randNum = mt_rand(0, ($totalUsers - 1));
// Look for random user
- $result = SQL_QUERY_ESC("SELECT `userid` FROM `"._MYSQL_PREFIX."_user_data` WHERE `status`='CONFIRMED' AND `rand_confirmed` >= %s ORDER BY `rand_confirmed` DESC LIMIT %s, 1",
- array(getConfig('user_min_confirmed'), $randNum), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' AND `rand_confirmed` >= %s ORDER BY `rand_confirmed` DESC LIMIT %s, 1",
+ array(getConfig('user_min_confirmed'), $randNum), __FUNCTION__, __LINE__);
// Do we have one entry there?
if (SQL_NUMROWS($result) == 1) {
@@ -244,8 +244,8 @@ function SELECT_RANDOM_REFID () {
list($refid) = SQL_FETCHROW($result);
// Reset this user's counter
- SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET `rand_confirmed`=0 WHERE userid=%s LIMIT 1",
- array($refid), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `rand_confirmed`=0 WHERE `userid`=%s LIMIT 1",
+ array($refid), __FUNCTION__, __LINE__);
} // END - if
// Free result
@@ -259,165 +259,172 @@ function SELECT_RANDOM_REFID () {
// Do the user login
function USER_DO_LOGIN ($uid, $passwd) {
+ // Init variables
+ $dmy = '';
+
// Add last_login if available
- $LAST = "";
- if (GET_EXT_VERSION("sql_patches") >= "0.2.8") {
- $LAST = ", last_login";
+ $lastOnline = '';
+ if (GET_EXT_VERSION('sql_patches') >= '0.2.8') {
+ $lastOnline = ', last_login';
} // END - if
- // 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".$LAST." FROM `"._MYSQL_PREFIX."_user_data` WHERE nickname='%s' AND status='CONFIRMED' LIMIT 1",
- array($uid), __FILE__, __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".$LAST." FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
- array($uid, $hash), __FILE__, __LINE__);
- list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
- }
-
- // Is there an entry?
- if ((SQL_NUMROWS($result) == 1) && ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $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)) {
- // Just set the hash to the password from DB... :)
- $hash = $password;
+ // Init array
+ $content = array(
+ 'password' => '',
+ 'userid' => '',
+ '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__);
} else {
- // Hash password with improved way for comparsion
- $hash = generateHash($passwd, substr($password, 0, -40));
+ // 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__);
}
- if ($hash == $password) {
- // New hashed password found so let's generate a new one
- $hash = generateHash($passwd);
+ // Load entry
+ $content = SQL_FETCHARRAY($result);
+ if (!empty($content['userid'])) $uid = bigintval($content['userid']);
- // ... and update database
- SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET password='%s' WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
- array($hash, $uid), __FILE__, __LINE__);
+ // Is there an entry?
+ if ((SQL_NUMROWS($result) == 1) && ((isNicknameUsed($content['userid'] === true) && (!empty($content['userid']))) || ($content['userid'] == $uid))) {
+ // Free result
+ SQL_FREERESULT($result);
- // No login bonus by default
- // @TODO Make this filter working: $ADDON = RUN_FILTER('post_login_update', array('login' => $login, 'online' => $online));
- $BONUS = false;
+ // 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));
+ }
- // Probe for last online timemark
- $probe = time() - $online;
- if (!empty($login)) $probe = time() - $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",
+ // 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')
- );
- $BONUS = 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);
-
- // Update global array
- // @TODO Make this filter working: $URL = RUN_FILTER('do_login', array('uid' => $uid, 'hash' => $hash, 'addon' => $ADDON));
- $GLOBALS['userid'] = $uid;
-
- // Try to set session data (which shall normally always work!)
- if ((set_session('userid', $uid )) && (set_session('u_hash', $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), __FILE__, __LINE__);
- if (SQL_AFFECTEDROWS() == 1) {
- // Procedure to checking for login data
- if (($BONUS) && (EXT_IS_ACTIVE("bonus"))) {
- // Bonus added (just displaying!)
- $URL = "modules.php?module=chk_login&mode=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) {
+ // 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=bonus';
+ } else {
+ // Bonus not added
+ $URL = 'modules.php?module=chk_login&mode=login';
+ }
} else {
- // Bonus not added
- $URL = "modules.php?module=chk_login&mode=login";
+ // Cannot update counter!
+ $URL = 'modules.php?module=index&what=login&login='.getCode('CNTR_FAILED');
}
} else {
- // Cannot update counter!
- $URL = "modules.php?module=index&what=login&login=".CODE_CNTR_FAILED;
+ // 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__);
+
+ // 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 {
- // Cookies not setable!
- $URL = "modules.php?module=index&what=login&login=".CODE_NO_COOKIES;
+ // ID not found!
+ $errorCode = getCode('WRONG_ID');
}
- } 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), __FILE__, __LINE__);
- // Wrong password!
- $URL = "modules.php?module=index&what=login&login=".CODE_WRONG_PASS;
- }
- } elseif ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $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), __FILE__, __LINE__);
-
- // Entry found?
- if (SQL_NUMROWS($result) == 1) {
- // Load status
- list($status) = SQL_FETCHROW($result);
-
- // Create an error code from given status
- $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
+ // Construct URL
+ $URL = 'modules.php?module=index&what=login&login='.$errorCode;
} else {
// ID not found!
- $ERROR = CODE_WRONG_ID;
+ $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_ID');
}
- // Construct URL
- $URL = "modules.php?module=index&what=login&login=".$ERROR;
- } else {
- // ID not found!
- $URL = "modules.php?module=index&what=login&login=".CODE_WRONG_ID;
- }
-
- // Return URL
- return $URL;
+ // Return URL
+ return $URL;
}
// Try to send a new password for the given user account
function USER_DO_NEW_PASSWORD ($email, $uid) {
// Compile email when found in address (only secure chars!)
- if (!empty($email)) $email = str_replace("{DOT}", '.', $email);
+ if (!empty($email)) $email = str_replace('{DOT}', '.', $email);
// Init result and error
- $ERROR = "";
+ $errorCode = '';
$result = false;
// Probe userid/nickname
- if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) {
+ if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE($uid))) {
// Nickname entered
- $result = SQL_QUERY_ESC("SELECT userid, status FROM `"._MYSQL_PREFIX."_user_data` WHERE nickname='%s' OR email='%s' LIMIT 1",
- array($uid, $email), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' OR `email`='%s' LIMIT 1",
+ array($uid, $email), __FUNCTION__, __LINE__);
} elseif (($uid > 0) && (empty($email))) {
// Direct userid entered
- $result = SQL_QUERY_ESC("SELECT userid, status FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
- array(bigintval($uid)), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
+ array(bigintval($uid)), __FUNCTION__, __LINE__);
} elseif (!empty($email)) {
// Email entered
- $result = SQL_QUERY_ESC("SELECT userid, status FROM `"._MYSQL_PREFIX."_user_data` WHERE email='%s' LIMIT 1",
- array($email), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `email`='%s' LIMIT 1",
+ array($email), __FUNCTION__, __LINE__);
} else {
// Userid not set!
- DEBUG_LOG(__FUNCTION__, __LINE__, "Userid is not set! BUG!");
- $ERROR = CODE_WRONG_ID;
+ DEBUG_LOG(__FUNCTION__, __LINE__, 'Userid is not set! BUG!');
+ $errorCode = getCode('WRONG_ID');
}
// Any entry found?
@@ -425,34 +432,34 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
// This data is valid, so we create a new pass... :-)
list($uid, $status) = SQL_FETCHROW($result);
- if ($status == "CONFIRMED") {
+ if ($status == 'CONFIRMED') {
// Ooppps, this was missing! ;-) We should update the database...
- $NEW_PASS = GEN_PASS();
- SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET password='%s' WHERE userid=%s LIMIT 1",
- array(generateHash($NEW_PASS), $uid), __FILE__, __LINE__);
+ $NEW_PASS = generatePassword();
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `password`='%s' WHERE `userid`=%s LIMIT 1",
+ array(generateHash($NEW_PASS), $uid), __FUNCTION__, __LINE__);
// Prepare data and message for email
- $msg = LOAD_EMAIL_TEMPLATE("new-pass", array('new_pass' => $NEW_PASS), $uid);
+ $message = LOAD_EMAIL_TEMPLATE('new-pass', array('new_pass' => $NEW_PASS), $uid);
// ... and send it away
- SEND_EMAIL($uid, GUEST_NEW_PASSWORD, $msg);
+ sendEmail($uid, getMessage('GUEST_NEW_PASSWORD'), $message);
// Output note to user
- LOAD_TEMPLATE("admin_settings_saved", false, GUEST_NEW_PASSWORD_SEND);
+ 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 = generateErrorCodeFromUserStatus($status);
// Load URL
- LOAD_URL("modules.php?module=index&what=login&login=".$ERROR);
+ redirectToUrl('modules.php?module=index&what=login&login='.$errorCode);
}
} else {
// ID or email is wrong
- LOAD_TEMPLATE("admin_settings_saved", false, "".GUEST_WRONG_ID_EMAIL."");
+ LOAD_TEMPLATE('admin_settings_saved', false, '{--GUEST_WRONG_ID_EMAIL--}');
}
// Return the error code
- return $ERROR;
+ return $errorCode;
}
// [EOF]