X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=d837789fe8b07b16b95e17c368fd1c8e3056abbc;hp=08c90e20bfa1c745e09636aa106e697813d6261e;hb=d897dae9f3b01f17fb59f2b96ba067b1a0f417b0;hpb=3f51c40f4fede87228216f9285b745a339e3891d diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 08c90e20bf..d837789fe8 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)) { - $OUT .= " ]
[ "; + $OUT .= ' ]
[ '; } elseif ( $counter != $num ) { - $OUT .= " | "; + $OUT .= ' | '; } } // END - while - define('__ALPHA_LIST', $OUT); - // Load template - $OUT = LOAD_TEMPLATE("admin_list_user_alpha", true); + $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) { +function addSortLinks ($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); + if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', 0); + if (!isGetRequestElementSet('page')) setRequestGetElement('page' , 0); // Add page and offset - $add = "&page=".REQUEST_GET('page')."&offset=".REQUEST_GET('offset'); + $add = '&page=' . getRequestElement('page') . '&offset=' . getRequestElement('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 (isGetRequestElementSet('status')) $add .= '&mode=' . getRequestElement('status'); + elseif (isGetRequestElementSet('mode')) $add .= '&mode=' . getRequestElement('mode'); // Makes order by links.. - if ($letter == "front") $letter = getMessage('_ALL2'); + if ($letter == 'front') $letter = getMessage('_ALL2'); // Prepare array with all possible sorters $list = array( 'userid' => getMessage('_UID'), - 'family' => getMessage('FAMILY_NAME'), - 'email' => getMessage('ADDY'), + 'family' => getMessage('FAMILY'), + 'email' => getMessage('EMAIL'), 'REMOTE_ADDR' => getMessage('REMOTE_IP') ); // Add nickname if extension is installed - if (EXT_IS_ACTIVE('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); + $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) { - // Load form for changing number of lines - define('__FORM_HEADER', LOAD_TEMPLATE('admin_list_user_sort_form', true)); - define('__FORM_FOOTER', ' '); - } else { - // Empty row - define('__FORM_HEADER', ' '); - define('__FORM_FOOTER', ' '); - } +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 == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) { + if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) { $OUT .= '-'; } else { - if (!REQUEST_ISSET_GET('letter')) REQUEST_SET_GET('letter', getMessage('_ALL2')); - if (!REQUEST_ISSET_GET('sortby')) REQUEST_SET_GET('sortby', 'userid'); + if (!isGetRequestElementSet('letter')) setRequestGetElement('letter', getMessage('_ALL2')); + if (!isGetRequestElementSet('sortby')) setRequestGetElement('sortby', 'userid'); // Base link - $OUT .= ''; + $OUT .= '&letter=' . getRequestElement('letter') . '&sortby=' . getRequestElement('sortby') . '&page=' . $page . '&offset=' . $offset . '%}">'; } $OUT .= $page; - if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) { + if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) { $OUT .= '-'; } else { $OUT .= ''; @@ -175,37 +175,42 @@ function ADD_PAGENAV ($PAGES, $offset, $show_form, $colspan,$return=false) { 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); + $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 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", + 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&uid=' . bigintval($uid); + $email = '{%url=modules.php?module=' . $mod . '&what=user_contct&userid=' . bigintval($userid) . '%}'; } // END - if // Free memory @@ -216,14 +221,15 @@ 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 +// @TODO Double-check configuration entry here 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) { @@ -231,8 +237,8 @@ function determineRandomReferalId () { $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), __FUNCTION__, __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) { @@ -240,7 +246,7 @@ function determineRandomReferalId () { 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", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=0 WHERE `userid`=%s LIMIT 1", array($refid), __FUNCTION__, __LINE__); } // END - if @@ -254,14 +260,17 @@ function determineRandomReferalId () { } // 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 $lastOnline = ''; - if (GET_EXT_VERSION('sql_patches') >= '0.2.8') { - $lastOnline = ', last_login'; + if (getExtensionVersion('sql_patches') >= '0.2.8') { + $lastOnline = ', `last_login`'; } // END - if // Init array @@ -271,79 +280,78 @@ function USER_DO_LOGIN ($uid, $passwd) { '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 { - // 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__); - } + // Check login data + if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) { + // Nickname entered + fetchUserData($userid, 'nickname'); + } elseif (isNicknameUsed($userid)) { + // No nickname installed + $errorCode = getCode('EXTENSION_PROBLEM'); + $ext = 'nickname'; + } else { + // Direct userid entered + fetchUserData($userid); + } - // Load entry - $content = SQL_FETCHARRAY($result); - if (!empty($content['userid'])) $uid = bigintval($content['userid']); + // Load entry + $content = getUserDataArray(); + if (!empty($content['userid'])) $userid = 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); + // Is there an entry? + if (((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) || ($content['userid'] == $userid)) { + // 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)); + } - // 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)); - } + // 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'], $userid), __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 ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && ($probe >= getConfig('login_timeout'))) { + // Add login bonus to user's account + $add = ', `login_bonus`=`login_bonus`+{?login_bonus?}'; + $GLOBALS['bonus_payed'] = true; + + // Subtract login bonus from userid's account or jackpot + if ((getExtensionVersion('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('login_bonus'); + } // END - if - // 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) { + // 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)); + setMemberId($userid); + + // Try to set session data (which shall normally always work!) + 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($userid), __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'))) { + if (($GLOBALS['bonus_payed']) && (isExtensionActive('bonus'))) { // Bonus added (just displaying!) $URL = 'modules.php?module=chk_login&mode=bonus'; } else { @@ -351,97 +359,97 @@ function USER_DO_LOGIN ($uid, $passwd) { $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! + $errorCode = 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! + $errorCode = getCode('COOKIES_DISABLED'); } + } elseif (getExtensionVersion('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($userid), __FUNCTION__, __LINE__); - // Construct URL - $URL = 'modules.php?module=index&what=login&login='.$errorCode; + // 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! - $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_ID'); + // id not found! + $errorCode = getCode('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; + // 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); - +function doNewUserPassword ($email, $userid) { // Init result and error $errorCode = ''; $result = false; // Probe userid/nickname - if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE($uid))) { + // @TODO We should try to rewrite this to fetchUserData() somehow + if (!empty($email)) { + // Email entered + $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `email`='%s' OR `email`='%s' LIMIT 1", + array($email, str_replace('.', '{DOT}', $email)), __FUNCTION__, __LINE__); + } elseif ((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), __FUNCTION__, __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)), __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), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", + array(bigintval($userid)), __FUNCTION__, __LINE__); } else { // Userid not set! - DEBUG_LOG(__FUNCTION__, __LINE__, 'Userid is not set! BUG!'); + 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') { // Ooppps, this was missing! ;-) We should update the database... $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__); + 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 - sendEmail($uid, getMessage('GUEST_NEW_PASSWORD'), $msg); + sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message); // Output note to user - LOAD_TEMPLATE('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND')); + loadTemplate('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND')); } else { // Account is locked or unconfirmed $errorCode = generateErrorCodeFromUserStatus($status); @@ -450,8 +458,8 @@ function USER_DO_NEW_PASSWORD ($email, $uid) { 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