Fixed now

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index d343e5269a145606db2412e6c81d9ef3701bc2ac..7e4ee7c1b5e290a18634fc78b52d9e6d2c2be2c2 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -392,11 +392,11 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                        // Create an error code from given status
                        $errorCode = generateErrorCodeFromUserStatus($status);
                } else {
-                       // ID not found!
+                       // id not found!
                        $errorCode = getCode('WRONG_ID');
                }
        } else {
-               // ID not found!
+               // id not found!
                $errorCode = getCode('WRONG_ID');
        }
 
@@ -450,7 +450,7 @@ function doNewUserPassword ($email, $userid) {
                                array(generateHash($NEW_PASS), $userid), __FUNCTION__, __LINE__);
 
                        // Prepare data and message for email
-                       $message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS), $userid);
+                       $message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS, 'nickname' => $userid), $userid);
 
                        // ... and send it away
                        sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
@@ -465,7 +465,7 @@ function doNewUserPassword ($email, $userid) {
                        redirectToUrl('modules.php?module=index&what=login&login='.$errorCode);
                }
        } else {
-               // ID or email is wrong
+               // id or email is wrong
                loadTemplate('admin_settings_saved', false, '<span class="guest_failed">{--GUEST_WRONG_ID_EMAIL--}</span>');
        }