Moved SQL queries to 'register' hook, fixed language problem in ext-holiday

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index b568c879ad36a0402d5a9e358d2b9fe9a6eab951..fc9e433269468fd62ee476bda07543b5941637c0 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -125,7 +123,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
        } // END - foreach
 
        // Add list and colspan
-       $content['list'] = substr($OUT, 0, -13);
+       $content['list'] = substr($OUT, 0, -1);
        $content['colspan2'] = $colspan;
 
        // Load template
@@ -200,7 +198,7 @@ function addPageNavigation ($numPages, $offset, $showForm, $colspan, $return=fal
 }
 
 // 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'";
 
@@ -234,7 +232,7 @@ LIMIT 1",
 // @TODO Double-check configuration entry here
 function determineRandomReferalId () {
        // Default is zero refid
-       $refid = '0';
+       $refid = null;
 
        // Is the extension version fine?
        if (isExtensionInstalledAndNewer('user', '0.3.4')) {
@@ -467,7 +465,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
@@ -649,6 +647,63 @@ LIMIT 1",
        loadTemplate('admin_settings_saved', false, $content['message']);
 }
 
+// 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();
+
+               // 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, '{--GUEST_REQUEST_CONFIRM_LINK_SUBJECT--}', $message);
+               } // END - if
+
+               // Create message based on the status
+               $message = getConfirmationMessageFromUserStatus($content['status']);
+       } // END - if
+
+       // Output message
+       loadTemplate('admin_settings_saved', false, $message);
+}
+
+// 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
 function doExpressionUser ($data) {
        // Use current userid by default