Changeset 14635 for extensions/UserAdvManager

Timestamp:

May 1, 2012, 2:52:04 PM (13 years ago)

Author:

Eric

Message:

Bug 2628 fixed - Php notice when email is not mandatory for registration

Location:

extensions/UserAdvManager/trunk

Files:

• admin/UAM_admin.php (modified) (2 diffs)
• changelog.txt.php (modified) (1 diff)

extensions/UserAdvManager/trunk/admin/UAM_admin.php

@@ -133 +133 @@
     $_POST['UAM_CustomRejectConnexion_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_CustomRejectConnexion_Text'])));
 
+
+  // Check if emails are mandatory for registrations (needed for email exclusion option)
+  // -----------------------------------------------------------------------------------
+  if ($conf['obligatory_user_mail_address'])
+  {
     // Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
     // --------------------------------------------------------------------------------------
@@ -140 +145 @@
       $UAM_Exclusionlist_Error = true;
     }
+  }
+  elseif (!$conf['obligatory_user_mail_address'])
+  {
+    $_POST['UAM_MailExclusion_List'] = '';
+  }
 
     // Consistency check between ConfirmMail and AutoMail - We cannot use GTAutoMail if ConfirmMail is disabled

extensions/UserAdvManager/trunk/changelog.txt.php

@@ -304 +304 @@
             Bug 2619 fixed - Confirmation email when registered user changes his email was not sent and user not demoted
             Bug 2620 fixed - Display of ConfirmMail, rejected and del_account pages have been improved
+            Bug 2628 fixed - Php notice when email is not mandatory for registration
 */
 ?>