Changeset 26934

Timestamp:

Jan 23, 2014, 10:38:19 PM (10 years ago)

Author:

Eric

Message:

Piwigo 2.6 compliance - Step 34 and final:
Improve confirmation and information email sending workflow

File:

• extensions/UserAdvManager/trunk/include/functions.inc.php (modified) (7 diffs)

extensions/UserAdvManager/trunk/include/functions.inc.php

@@ -142 +142 @@
 
     // --------------------------------------------------------------------------------------------------------------------
-    // Workflow when admins have to validate registrations (CONFIRM_MAIL = local)
-    // No validation needed when admins add users if ADMINCONFMAIL is set to OFF - users are considered as valid by default
-    // Else a notification email with validation link is send to admins
-    // Finally when a user registers himself, a notification email with validation link is send to admins
+    // Workflow when admins have to validate registrations (CONFIRM_MAIL = local):
+    // 1- A confirmation email with validation link is send to users added by admins
+    // 2- Else no validation needed when admins add users if ADMINCONFMAIL is set to OFF - users are considered as valid by
+    // default and no information email is send to user from UAM (Piwigo will do that by checking the option box)
+    // 3- Finally when a user registers himself, a notification email with validation link is send to admins
     // --------------------------------------------------------------------------------------------------------------------
     if (isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'local')
     {
-      if (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'true')
+      if (is_admin() and (isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'true'))
       {
         SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true); 
       }
-      elseif (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false')
+      elseif (is_admin() and (isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false'))
       {
         SetValidated($register_user['id']);
-        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
+        // Pending information email - Managed by Piwigo
+        //SendMail2User(2, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
       }
       elseif (!is_admin())
@@ -164 +166 @@
     }
     // --------------------------------------------------------------------------------------------------------------------
-    // Workflow when users have to validate their registration (CONFIRM_MAIL = true)
-    // No validation needed when admins add users if ADMINCONFMAIL is set to OFF - users are considered as valid by default
-    // Else an email with validation link is send to user
-    // Finally when a user registers himself, an email with validation link is send to him
+    // Workflow when users have to validate their registration (CONFIRM_MAIL = true):
+    // 1- A confirmation email with validation link is send to users added by admins
+    // 2- ELse no validation needed when admins add users if ADMINCONFMAIL is set to OFF - users are considered as valid by
+    // default and no information email is send to user from UAM (Piwigo will do that by checking the option box)
+    // 3- Finally when a user registers himself, an email with validation link is send to him
     // --------------------------------------------------------------------------------------------------------------------
     elseif (isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'true')
     {
-      if (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'true')
+      if (is_admin() and (isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'true'))
       {
         SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true); 
       }
-      elseif (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false')
+      elseif (is_admin() and (isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false'))
       {
         SetValidated($register_user['id']);
-        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
+        // Pending information email - Managed by Piwigo
+        //SendMail2User(2, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
       }
       elseif (!is_admin())
@@ -317 +321 @@
       }
 
-      $typemail = 2;
-
-      // Send email
+      // Send information email
       if ((isset($conf_UAM['MAIL_INFO']) and $conf_UAM['MAIL_INFO'] == 'true') or $confirm_mail_need)
       {
@@ -330 +332 @@
         list($username) = pwg_db_fetch_row(pwg_query($query));
 
-        SendMail2User($typemail, $user['id'], $username, $_POST['use_new_pwd'], $_POST['mail_address'], $confirm_mail_need);
+        SendMail2User(2, $user['id'], $username, $_POST['use_new_pwd'], $_POST['mail_address'], $confirm_mail_need);
       }
     }
@@ -1196 +1198 @@
   }
 
+//       $converted_res = ($confirm) ? 'true' : 'false';
+//       UAMLog($typemail,$converted_res,$conf_UAM['CONFIRM_MAIL'],$subject);
 
 // Sending the email with subject and contents
@@ -1217 +1221 @@
 
 
-        if (isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'true' and $confirm) // Confirmation email send to users
+        if ((isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL'] == 'true') and $confirm) // Confirmation email send to users
         {
           // Adding gallery URL at the end of the email
@@ -1273 +1277 @@
 
 
-        if (isset($conf_UAM['MAIL_INFO']) and $conf_UAM['MAIL_INFO'] == 'true') // Information email send to users
+        if ((isset($conf_UAM['MAIL_INFO']) and $conf_UAM['MAIL_INFO'] == 'true') and $typemail <> 1) // Information email send to users
         {
           // Adding gallery URL at the end of the email