Changeset 12689 for extensions/UserAdvManager/trunk/admin/UAM_admin.php

Timestamp:

Dec 2, 2011, 11:37:38 PM (12 years ago)

Author:

Eric

Message:

Bug 2524 fixed - The "Information email" option has been moved to "misc options" section of admin panel
Bug 2525 fixed - "Obligatory email for registrations" option is checked before using the email exclusion option
Bug 2526 fixed - "PWG stuff" option has been moved one step higher in admin panel
Bug 2527 fixed - "Confirmation for admins" option has been moved one step higher in admin panel
Bug 2528 fixed - The word "validation" for "registration validation" has been replaced by "confirmation"

File:

• extensions/UserAdvManager/trunk/admin/UAM_admin.php (modified) (3 diffs)

extensions/UserAdvManager/trunk/admin/UAM_admin.php

@@ -36 +36 @@
 $UAM_Illegal_Flag_Error2 = false;
 $UAM_Illegal_Flag_Error3 = false;
+$UAM_Email_Mandatory_Check = false;
 
 $dump_download = '';
@@ -516 +517 @@
                         )
           );
+  }
+
+  // Check if emails are mandatory for registrations (needed for email exclusion option)
+  // -----------------------------------------------------------------------------------
+  if (!$conf['obligatory_user_mail_address'])
+  {
+    $UAM_Email_Mandatory_Check = true;
   }
 
@@ -605 +613 @@
     'UAM_ERROR_REPORTS3'             => $UAM_Illegal_Flag_Error2,
     'UAM_ERROR_REPORTS4'             => $UAM_Illegal_Flag_Error3,
+    'UAM_EMAIL_MANDATORY'            => $UAM_Email_Mandatory_Check,
                 'UAM_CONFIRMMAIL_TIMEOUT_TRUE'   => $conf_UAM_ConfirmMail[0]=='true' ?  'checked="checked"' : '' ,
                 'UAM_CONFIRMMAIL_TIMEOUT_FALSE'  => $conf_UAM_ConfirmMail[0]=='false' ?  'checked="checked"' : '' ,