Changeset 3920 for extensions/NBC_UserAdvManager

Timestamp:

Sep 27, 2009, 6:17:56 PM (15 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager] Fix for bug 1174

The unvalidated user's registration date is now displayed in red if validation have expired or in green if not expired.

Location:

extensions/NBC_UserAdvManager/trunk

Files:

• admin/UserAdvManager_admin.php (modified) (2 diffs)
• admin/usermanager.tpl (modified) (2 diffs)
• include/functions_UserAdvManager.inc.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)

extensions/NBC_UserAdvManager/trunk/admin/UserAdvManager_admin.php

@@ -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,
+                                )
+                        );
                 }
 

extensions/NBC_UserAdvManager/trunk/admin/usermanager.tpl

@@ -29 +29 @@
                         <td>{$user.EMAIL}</td>
                         <td>{$user.GROUPS}</td>
-                                        <td style="text-align:center;">{$user.REGISTRATION}</td>
+                                        <td {if $user.EXPIRATION == True}style="color:red;text-align:center;"{else}style="color:lime;text-align:center;"{/if}>{$user.REGISTRATION}</td>
                         {foreach from=$user.plugin_columns item=data}
                         <td>{$data}</td>
@@ -35 +35 @@
                         </tr>
                 {/foreach}
-        </table>
+                </table>
         <br/>
             </li>

extensions/NBC_UserAdvManager/trunk/include/functions_UserAdvManager.inc.php

@@ -695 +695 @@
         return $users;
 }
+
+/* Function called from UserAdvManager.php - to determine who is expired or not and giving a different display color */
+function expiration($id)
+{
+        global $conf, $page;
+          
+        /* Get ConfirmMail configuration */
+        $conf_nbc_UserAdvManager_ConfirmMail = isset($conf['nbc_UserAdvManager_ConfirmMail']) ? explode(";" , $conf['nbc_UserAdvManager_ConfirmMail']) : array();
+          
+        /* Get UserAdvManager configuration */
+        $conf_nbc_UserAdvManager = isset($conf['nbc_UserAdvManager']) ? explode(";" , $conf['nbc_UserAdvManager']) : array(); 
+        
+        $query = "
+        SELECT registration_date
+    FROM ".USER_INFOS_TABLE."
+    WHERE user_id = '".$id."'
+    ;";
+        list($registration_date) = mysql_fetch_row(pwg_query($query));
+
+/*              Time limit process              */
+/* ****************** begin ******************* */  
+        if (!empty($registration_date))
+  {
+                // dates formating and compare
+                $today = date("d-m-Y"); // Get today's date
+                list($day, $month, $year) = explode('-', $today); // explode date of today                                               
+                $daytimestamp = mktime(0, 0, 0, $month, $day, $year);// Generate UNIX timestamp
+                
+          list($regdate, $regtime) = explode(' ', $registration_date); // Explode date and time from registration date
+                list($regyear, $regmonth, $regday) = explode('-', $regdate); // Explode date from registration date
+                $regtimestamp = mktime(0, 0, 0, $regmonth, $regday, $regyear);// Generate UNIX timestamp
+                        
+                $deltasecs = $daytimestamp - $regtimestamp;// Compare the 2 UNIX timestamps     
+                $deltadays = floor($deltasecs / 86400);// Convert result from seconds to days
+
+                // Condition with the value set for time limit
+                if ($deltadays <= $conf_nbc_UserAdvManager_ConfirmMail[1]) // If Nb of days is less than the limit set
+                {
+                        return false;
+                }
+                else
+                {
+                        return True;
+                }
+        }
+}
 ?>

extensions/NBC_UserAdvManager/trunk/main.inc.php

@@ -60 +60 @@
 
 -- 2.11.3 : On Patricia's request (french forum), the unvalidated users management tab shows users according with the settings of unvalidated group and / or unvalidated status.
+                                                Email providers exclusion list can be set with CR/LF between each entry. The comma seperator (,) is still mandatory.
+                                                Bug fixed : Bad translation tag in french language file.
                                                 Improvement of unvalidated users management tab - Expired users are displayed in red color text.
 
@@ -315 +317 @@
                                 {
                                         $ncsemail = strtolower($_POST['mail_address']);
-                                                $conf_nbc_MailExclusion = preg_split("/[\s,]+/",$conf_nbc_UserAdvManager[13]);
+                                $conf_nbc_MailExclusion = preg_split("/[\s,]+/",$conf_nbc_UserAdvManager[13]);
                                                 for ($i = 0 ; $i < count($conf_nbc_MailExclusion) ; $i++)
                                         {