Naming convention applied to language strings, new API function added:

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index eb6c96c344a88ebf4d5fa5dd47bf3922759ff829..c3304a72fee35db3c32684f3d7932a8b34cb5dc3 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -467,7 +467,7 @@ function doNewUserPassword ($email, $userid) {
                }
        } else {
                // id or email is wrong
-               loadTemplate('admin_settings_saved', false, '<span class="guest_failed">{--GUEST_WRONG_ID_EMAIL--}</span>');
+               loadTemplate('admin_settings_saved', false, '<span class="notice">{--GUEST_WRONG_ID_EMAIL--}</span>');
        }
 
        // Return the error code
@@ -651,36 +651,59 @@ LIMIT 1",
 
 // Does resend the user's confirmation link for given email address
 function doResendUserConfirmationLink ($email) {
+       // Email address not registered is default message
+       $message = '{--EMAIL_404--}';
+
        // Confirmation link requested
        if (fetchUserData($email, 'email')) {
                // Email address found
                $content = getUserDataArray();
 
-               // Detect status
-               switch ($content['status']) {
-                       case 'UNCONFIRMED': // Account not confirmed
-                               // Load email template
-                               $message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
+               // Is the account unconfirmed?
+               if ($content['status'] == 'UNCONFIRMED') {
+                       // Load email template
+                       $message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
 
-                               // Send email
-                               sendEmail($email, '{--REQUEST_CONFIRM_LINK_SUBJECT--}', $message);
+                       // Send email
+                       sendEmail($email, '{--GUEST_REQUEST_CONFIRM_LINK_SUBJECT--}', $message);
+               } // END - if
 
-                               // And set message
-                               $content['message'] = '{--CONFIRM_LINK_SENT--}';
-                               break;
+               // Create message based on the status
+               $message = getConfirmationMessageFromUserStatus($content['status']);
+       } // END - if
 
-                       case 'CONFIRMED': // Account already confirmed
-                               $content['message'] = '{--LOGIN_ID_CONFIRMED--}';
-                               break;
+       // Output message
+       loadTemplate('admin_settings_saved', false, $message);
+}
 
-                       case 'LOCKED': // Account is locked
-                               $content['message'] = '{--LOGIN_ID_LOCKED--}';
-                               break;
-               } // END - switch
-       } else {
-               // Email address not registered
-               $content['message'] = '{--EMAIL_404--}';
-       }
+// Get a message (somewhat translation) from user status for confirmation link.
+// This is different to translateUserStatus() in text messages.
+function getConfirmationMessageFromUserStatus ($status) {
+       // Default is 'UNKNOWN'
+       $message = getMaskedMessage('GUEST_LOGIN_ID_UNKNOWN_STATUS', $status);
+
+       // Which status is it?
+       switch ($status) {
+               case 'UNCONFIRMED': // Account is unconfirmed
+                       // And set message
+                       $message = '{--GUEST_CONFIRM_LINK_SENT--}';
+                       break;
+
+               case 'CONFIRMED': // Account already confirmed
+                       $message = '{--GUEST_LOGIN_ID_CONFIRMED--}';
+                       break;
+
+               case 'LOCKED': // Account is locked
+                       $message = '{--GUEST_LOGIN_ID_LOCKED--}';
+                       break;
+
+               default: // This should not happen
+                       debug_report_bug(__FUNCTION__, __LINE__, 'Unknown user status ' . $status . ' detected.');
+                       break;
+       } // END - switch
+
+       // Return message
+       return $message;
 }
 
 // Expression call-back function for fetching user data