Changeset 3921 for extensions/NBC_UserAdvManager/branches/2.11/admin/UserAdvManager_admin.php

Timestamp:

Sep 27, 2009, 6:24:29 PM (15 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager] Merged from Trunk in Branch 2.11

File:

• extensions/NBC_UserAdvManager/branches/2.11/admin/UserAdvManager_admin.php (modified) (3 diffs)

extensions/NBC_UserAdvManager/branches/2.11/admin/UserAdvManager_admin.php

@@ -384 +384 @@
   $conf_nbc_UserAdvManager_ConfirmMail = isset($conf['nbc_UserAdvManager_ConfirmMail']) ? explode(";" , $conf['nbc_UserAdvManager_ConfirmMail']) : array();
         
-  if (isset($conf_nbc_UserAdvManager[2]) and $conf_nbc_UserAdvManager[2]=='true' and isset($conf_nbc_UserAdvManager[3]) and $conf_nbc_UserAdvManager[3] <> '-1' and isset($conf_nbc_UserAdvManager_ConfirmMail[0]) and $conf_nbc_UserAdvManager_ConfirmMail[0]=='true')
+  if (isset($conf_nbc_UserAdvManager[2]) and $conf_nbc_UserAdvManager[2]=='true' and ((isset($conf_nbc_UserAdvManager[3]) and $conf_nbc_UserAdvManager[3] <> '-1') or (isset($conf_nbc_UserAdvManager[9]) and $conf_nbc_UserAdvManager[9] <> '-1')) and isset($conf_nbc_UserAdvManager_ConfirmMail[0]) and $conf_nbc_UserAdvManager_ConfirmMail[0]=='true')
   {
 // +-----------------------------------------------------------------------+
@@ -747 +747 @@
                         }
                 }
+                
 
 // +-----------------------------------------------------------------------+
@@ -848 +849 @@
                 (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true'))
                 ? l10n('is_high_enabled') : l10n('is_high_disabled');
+
+                        $expiration = expiration($local_user['id']);
               
-                        if (isset($conf_nbc_UserAdvManager_ConfirmMail[1]) and $conf_nbc_UserAdvManager_ConfirmMail[0]=='true' )
-        {
-                $template->append(
-                'users',
-                array(
-                        'ID' => $local_user['id'],
-                'CHECKED' => $checked,
-                'U_PROFILE' => $profile_url.$local_user['id'],
-                'U_PERM' => $perm_url.$local_user['id'],
-                'USERNAME' => $local_user['username']
-                                                        .($local_user['id'] == $conf['guest_id']
-                                                        ? '<BR />['.l10n('is_the_guest').']' : '')
-                .($local_user['id'] == $conf['default_user_id']
-                ? '<BR />['.l10n('is_the_default').']' : ''),
-                                                'STATUS' => l10n('user_status_'.
-                                                        $local_user['status']).(($local_user['adviser'] == 'true')
-                ? '<BR />['.l10n('adviser').']' : ''),
-                                                'EMAIL' => get_email_address_as_display_text($local_user['email']),
-                'GROUPS' => $groups_string,
-                'REGISTRATION' => $local_user['registration_date'],
-                                        )
-                                );
-                        }
+                $template->append(
+                'users',
+        array(
+                'ID' => $local_user['id'],
+                'CHECKED' => $checked,
+                'U_PROFILE' => $profile_url.$local_user['id'],
+                'U_PERM' => $perm_url.$local_user['id'],
+                'USERNAME' => $local_user['username']
+                                                .($local_user['id'] == $conf['guest_id']
+                                                ? '<BR />['.l10n('is_the_guest').']' : '')
+                .($local_user['id'] == $conf['default_user_id']
+                ? '<BR />['.l10n('is_the_default').']' : ''),
+                                        'STATUS' => l10n('user_status_'.
+                                                $local_user['status']).(($local_user['adviser'] == 'true')
+                ? '<BR />['.l10n('adviser').']' : ''),
+                                        'EMAIL' => get_email_address_as_display_text($local_user['email']),
+                'GROUPS' => $groups_string,
+                'REGISTRATION' => $local_user['registration_date'],
+                'EXPIRATION' => $expiration,
+                                )
+                        );
                 }