More misc fixes and rewrites (sorry, lame description)

[mailer.git] / inc / libs / user_functions.php

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 08c90e20bfa1c745e09636aa106e697813d6261e..ec3958a6455f70468f6ed8815f4b6fe713056254 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -189,16 +189,20 @@ function ADD_PAGENAV ($PAGES, $offset, $show_form, $colspan,$return=false) {
 }
 
 // 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
@@ -435,10 +439,10 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
                                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
-                       sendEmail($uid, getMessage('GUEST_NEW_PASSWORD'), $msg);
+                       sendEmail($uid, getMessage('GUEST_NEW_PASSWORD'), $message);
 
                        // Output note to user
                        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND'));