Changeset 13124 for extensions/UserAdvManager/branches/2.30/admin/UAM_admin.php

Timestamp:

Feb 12, 2012, 2:47:54 PM (12 years ago)

Author:

Eric

Message:

Merged from trunk to branch 2.30

File:

• extensions/UserAdvManager/branches/2.30/admin/UAM_admin.php (modified) (4 diffs)

extensions/UserAdvManager/branches/2.30/admin/UAM_admin.php

@@ -36 +36 @@
 $UAM_Illegal_Flag_Error2 = false;
 $UAM_Illegal_Flag_Error3 = false;
+$UAM_Email_Mandatory_Check = false;
 
 $dump_download = '';
@@ -52 +53 @@
                $my_base_url.'&tab=global');
   $tabsheet->add('userlist',
-                 l10n('UAM_Tab_UserList'),
+                 l10n('UAM_Tracking registered users'),
                  $my_base_url.'&tab=userlist');
 $tabsheet->add('usermanager',
-               l10n('UAM_Tab_UserManager'),
+               l10n('UAM_Tracking confirmations'),
                $my_base_url.'&tab=usermanager');
 $tabsheet->add('ghosttracker',
@@ -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"' : '' ,