X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=18fd084d45f53da630e732fa215638e04f581c8f;hp=76d85f5876d76c3a0f3835fc2a5753f2c4984dd1;hb=d476e02cca701687022b734b396ca49267c5e103;hpb=e71e9e1380d65ccd06beef6fbc594bec10371f5f diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 76d85f5876..18fd084d45 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -1,7 +1,7 @@ ".$ltr.""; + $OUT .= "".$ltr.""; } else { // Output link to letter - $OUT .= "".$ltr.""; + $OUT .= "".$ltr.""; } if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) { @@ -66,148 +69,148 @@ function alpha($sortby, $colspan, $return=false) { } } // END - while - define('__ALPHA_LIST', $OUT); - // Load template - $OUT = LOAD_TEMPLATE("admin_list_user_alpha", true); - if ($return) { + $OUT = loadTemplate('admin_list_user_alpha', true, $OUT); + if ($return === true) { // Return generated code return $OUT; } else { // Output generated code - OUTPUT_HTML($OUT); + outputHtml($OUT); } } // 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 addSortLinks ($letter, $sortby, $colspan, $return=false) { + $OUT = ''; + if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', 0); + if (!isGetRequestElementSet('page')) setRequestGetElement('page' , 0); // Add page and offset - $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']); + $add = '&page=' . getRequestElement('page') . '&offset=' . getRequestElement('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 (isGetRequestElementSet('status')) $add .= '&mode=' . getRequestElement('status'); + elseif (isGetRequestElementSet('mode')) $add .= '&mode=' . getRequestElement('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('EMAIL_ADDRESS'), + 'REMOTE_ADDR' => getMessage('REMOTE_IP') ); // Add nickname if extension is installed - if (EXT_IS_ACTIVE("nickname")) { - $list['nickname'] = NICKNAME; - } + if (isExtensionActive('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)); + $content['list'] = substr($OUT, 0, -13); // Load template - $OUT = LOAD_TEMPLATE("admin_list_user_sort", true); - if ($return) { + $OUT = loadTemplate('admin_list_user_sort', true, $content); + + // Should we return or output? + if ($return === true) { // Return code return $OUT; } else { // Output code - OUTPUT_HTML($OUT); + outputHtml($OUT); } } // Add page navigation -function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) { - if (!$show_form) { - // Empty row - define('__FORM_HEADER', " "); - } else { - // 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', " "); - } else { - // Add line without bottom border - define('__FORM_FOOTER', " "); - } - - $OUT = ""; +function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false) { + // @TODO These two constants are no longer used, maybe we reactivate this code? + //if ($show_form === true) { + // // Load form for changing number of lines + // define('__FORM_HEADER', loadTemplate('admin_list_user_sort_form', true)); + // define('__FORM_FOOTER', ' '); + //} else { + // // Empty row + // define('__FORM_HEADER', ' '); + // define('__FORM_FOOTER', ' '); + //} + + $OUT = ''; for ($page = 1; $page <= $PAGES; $page++) { - if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) { - $OUT .= "-"; + if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) { + $OUT .= '-'; } else { - if (empty($_GET['letter'])) $_GET['letter'] = _ALL2; - if (empty($_GET['sortby'])) $_GET['sortby'] = "userid"; + if (!isGetRequestElementSet('letter')) setRequestGetElement('letter', getMessage('_ALL2')); + if (!isGetRequestElementSet('sortby')) setRequestGetElement('sortby', 'userid'); // Base link - $OUT .= ""; + // Letter and so on + $OUT .= '&letter=' . getRequestElement('letter') . '&sortby=' . getRequestElement('sortby') . '&page=' . $page . '&offset=' . $offset . '">'; } $OUT .= $page; - if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) { - $OUT .= "-"; + if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) { + $OUT .= '-'; } else { - $OUT .= ""; + $OUT .= ''; } - if ($page < $PAGES) $OUT .= " | "; + if ($page < $PAGES) $OUT .= ' | '; } // END - for - define('__PAGENAV_LIST', $OUT); + // Remember the list + $content['list'] = $OUT; // Load template - $OUT = LOAD_TEMPLATE("admin_list_user_pagenav", true); - if ($return) { + $OUT = loadTemplate('admin_list_user_pagenav', true, $content); + if ($return === true) { // Return code return $OUT; } else { // Output code - OUTPUT_HTML($OUT); + outputHtml($OUT); } } // 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 (isAdmin()) $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); + list($userid) = 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&userid=' . bigintval($userid); } // END - if // Free memory @@ -218,16 +221,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; + $refid = '0'; // Is the extension version fine? - if (GET_EXT_VERSION("user") >= "0.3.4") { + if (getExtensionVersion('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 = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, " AND `rand_confirmed` >= ".getConfig('user_min_confirmed').""); // Do we have at least one? if ($totalUsers > 0) { @@ -235,8 +236,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` >= {?user_min_confirmed?} ORDER BY `rand_confirmed` DESC LIMIT %s, 1", + array($randNum), __FUNCTION__, __LINE__); // Do we have one entry there? if (SQL_NUMROWS($result) == 1) { @@ -244,8 +245,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 @@ -258,201 +259,213 @@ function SELECT_RANDOM_REFID () { } // Do the user login -function USER_DO_LOGIN ($uid, $passwd) { +function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.php?module=index&what=login&login=') { + // Init variables + $dmy = ''; + $add = ''; + $errorCode = '0'; + $ext = ''; + // Add last_login if available - $LAST = ""; - if (GET_EXT_VERSION("sql_patches") >= "0.2.8") { - $LAST = ", last_login"; + $lastOnline = ''; + if (getExtensionVersion('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))) { + if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) { // 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); + fetchUserData($userid, 'nickname'); + } elseif (isNicknameUsed($userid)) { + // No nickname installed + $errorCode = getCode('EXTENSION_PROBLEM'); + $ext = 'nickname'; } 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); + fetchUserData($userid); } - // 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 = ""; + // Load entry + $content = getUserDataArray(); + if (!empty($content['userid'])) $userid = bigintval($content['userid']); + // Is there an entry? + if (((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) || ($content['userid'] == $userid)) { // 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 - SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET password='%s' WHERE userid=%s AND status='CONFIRMED' LIMIT 1", - array($hash, $uid), __FILE__, __LINE__); + // @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'], $userid), __FUNCTION__, __LINE__); // No login bonus by default - // @TODO Make this filter working: $ADDON = RUN_FILTER('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; - if ((GET_EXT_VERSION("bonus") >= "0.2.2") && ($probe >= getConfig('login_timeout'))) { + $probe = time() - $content['last_online']; + if (!empty($content['last_login'])) $probe = time() - $content['last_login']; + if ((isExtensionInstalledAndNewer('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; + $add = ', `login_bonus`=`login_bonus`+{?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'); + if ((getExtensionVersion('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('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 = RUN_FILTER('do_login', array('uid' => $uid, 'hash' => $hash, 'addon' => $ADDON)); - $GLOBALS['userid'] = $uid; + // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); + setMemberId($userid); // Try to set session data (which shall normally always work!) - if ((set_session('userid', $uid )) && (set_session('u_hash', $hash))) { + if ((setSession('userid', $userid )) && (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), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1", + array($userid), __FUNCTION__, __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"; + // Is a success URL set? + if (empty($successUrl)) { + // Procedure to checking for login data + if (($GLOBALS['bonus_payed']) && (isExtensionActive('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"; + // Use this URL + $URL = $successUrl; } } else { // Cannot update counter! - $URL = "modules.php?module=index&what=login&login=".CODE_CNTR_FAILED; + $errorCode = getCode('CNTR_FAILED'); } } else { // Cookies not setable! - $URL = "modules.php?module=index&what=login&login=".CODE_NO_COOKIES; + $errorCode = getCode('NO_COOKIES'); } - } elseif (GET_EXT_VERSION("sql_patches") >= "0.4.7") { + } elseif (getExtensionVersion('sql_patches') >= '0.6.1') { // Update failture counter - SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET login_failtures=login_failtures+1,last_failture=NOW() WHERE userid=%s LIMIT 1", - array($uid), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1", + array($userid), __FUNCTION__, __LINE__); // Wrong password! - $URL = "modules.php?module=index&what=login&login=".CODE_WRONG_PASS; + $errorCode = getCode('WRONG_PASS'); } - } elseif ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $uid)) { + } elseif (((isExtensionActive('nickname')) && (isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $userid)) { // Other account status? - // @TODO Can this query be saved??? - $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); - + if (fetchUserData($userid)) { // Create an error code from given status - $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status); + $errorCode = generateErrorCodeFromUserStatus(getUserData('status')); } else { - // ID not found! - $ERROR = CODE_WRONG_ID; + // id not found! + $errorCode = 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; + } elseif ($errorCode == '0') { + // id not found! + $errorCode = getCode('WRONG_ID'); } + // Error code provided? + if ($errorCode > 0) { + // Then reconstruct the URL + $URL = $errorUrl . $errorCode; + + // Extension set? Then add it as well. + if (!empty($ext)) $URL .= '&ext=' . $ext; + } // END - if + // Return URL return $URL; } // Try to send a new password for the given user account -function USER_DO_NEW_PASSWORD ($email, $uid) { +function doNewUserPassword ($email, $userid) { // 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))) { + // @TODO We should try to rewrite this to fetchUserData() somehow + if ((isExtensionActive('nickname')) && (isNicknameOrUserid($userid))) { // 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__); - } elseif (($uid > 0) && (empty($email))) { + $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `nickname`='%s' OR `userid`='%s' OR `email`='%s' LIMIT 1", + array($userid, $userid, $email), __FUNCTION__, __LINE__); + } elseif (($userid > 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($userid)), __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; + logDebugMessage(__FUNCTION__, __LINE__, 'Userid is not set! BUG!'); + $errorCode = getCode('WRONG_ID'); } // Any entry found? if (SQL_NUMROWS($result) == 1) { // This data is valid, so we create a new pass... :-) - list($uid, $status) = SQL_FETCHROW($result); + list($userid, $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), $userid), __FUNCTION__, __LINE__); // Prepare data and message for email - $msg = LOAD_EMAIL_TEMPLATE("new-pass", array('new_pass' => $NEW_PASS), $uid); + $message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS, 'nickname' => $userid), $userid); // ... and send it away - SEND_EMAIL($uid, GUEST_NEW_PASSWORD, $msg); + sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message); // Output note to user - LOAD_TEMPLATE("admin_settings_saved", false, GUEST_NEW_PASSWORD_SEND); + loadTemplate('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.""); + // id or email is wrong + loadTemplate('admin_settings_saved', false, '{--GUEST_WRONG_ID_EMAIL--}'); } // Return the error code - return $ERROR; + return $errorCode; } // [EOF]