Changeset 3896

Timestamp:

Sep 21, 2009, 10:35:09 PM (15 years ago)

Author:

Eric

Message:

On Patricia's request (french forum), the unvalidated users management tab shows users according with the settings of unvalidated group and / or unvalidated status.

Location:

extensions/NBC_UserAdvManager/trunk

Files:

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

extensions/NBC_UserAdvManager/trunk/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')
   {
 // +-----------------------------------------------------------------------+

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

@@ -616 +616 @@
   
   $users = array();
-    
+
         /* search users depending expiration date */
   $query = '
-        SELECT DISTINCT u.'.$conf['user_fields']['id'].' AS id,
+                SELECT DISTINCT u.'.$conf['user_fields']['id'].' AS id,
                                                                                 u.'.$conf['user_fields']['username'].' AS username,
-                    u.'.$conf['user_fields']['email'].' AS email,
-                    ui.status,
-                    ui.adviser,
-                    ui.enabled_high,
-                    ui.level,
-                    ui.registration_date,
-                    ug.group_id
+                                                                                u.'.$conf['user_fields']['email'].' AS email,
+                                                                                ui.status,
+                                                                                ui.adviser,
+                                                                                ui.enabled_high,
+                                                                                ui.level,
+                                                                                ui.registration_date
                 FROM '.USERS_TABLE.' AS u
-                INNER JOIN '.USER_INFOS_TABLE.' AS ui
-                        ON u.'.$conf['user_fields']['id'].' = ui.user_id
-                INNER JOIN '.USER_GROUP_TABLE.' AS ug
-        ON u.'.$conf['user_fields']['id'].' = ug.user_id
-        WHERE u.'.$conf['user_fields']['id'].' >= 0
-        AND ug.group_id = "'.$conf_nbc_UserAdvManager[3].'"
-      AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_nbc_UserAdvManager_ConfirmMail[1].'"
-                                OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_nbc_UserAdvManager_ConfirmMail[1].'")
-                ORDER BY id ASC
-        ;';
+    INNER JOIN '.USER_INFOS_TABLE.' AS ui
+      ON u.'.$conf['user_fields']['id'].' = ui.user_id
+    LEFT JOIN '.USER_GROUP_TABLE.' AS ug
+      ON u.'.$conf['user_fields']['id'].' = ug.user_id
+                WHERE u.'.$conf['user_fields']['id'].' >= 3
+                AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_nbc_UserAdvManager_ConfirmMail[1].'"
+                        OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_nbc_UserAdvManager_ConfirmMail[1].'")';
+
+        if ($conf_nbc_UserAdvManager[3] <> '-1' and $conf_nbc_UserAdvManager[9] == '-1')
+  {
+    $query.= '
+    AND ug.group_id = '.$conf_nbc_UserAdvManager[3];
+  }
+  if ($conf_nbc_UserAdvManager[3] == '-1' and $conf_nbc_UserAdvManager[9] <> '-1')
+  {
+    $query.= '
+    AND ui.status = \''.$conf_nbc_UserAdvManager[9]."'";
+  }
+  if ($conf_nbc_UserAdvManager[3] <> '-1' and $conf_nbc_UserAdvManager[9] <> '-1')
+  {
+    $query.= '
+    AND ug.group_id = \''.$conf_nbc_UserAdvManager[3]."'";
+  }
+  $query.= '
+  ORDER BY id ASC
+;';
 
         $result = pwg_query($query);

extensions/NBC_UserAdvManager/trunk/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: NBC UserAdvManager
-Version: 2.11.2
+Version: 2.11.3
 Description: Permet de renforcer les possibilités de gestion des utilisateurs - Enforce users management
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
@@ -58 +58 @@
 -- 2.11.2 : Bug fixed on bad query for unvalidated users display in unvalidated users list
                                                 Bug fixed : Sql syntax error on plugin activation
+
+-- 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.
+                                                Improvement of unvalidated users management tab - Expired users are displayed in red color text.
 
 */