Changeset 12551 for extensions/UserAdvManager/branches/2.30/main.inc.php

Timestamp:

Nov 5, 2011, 3:48:21 PM (12 years ago)

Author:

Eric

Message:

Merged from trunk to branch 2.30
Bug 2455 fixed - Exclusion of specific users (généric and admins users) for password reset function.
Bug 2451 fixed - Unable to handle Sql errors but control of backup file validity have been enforced.

File:

• extensions/UserAdvManager/branches/2.30/main.inc.php (modified) (3 diffs)

extensions/UserAdvManager/branches/2.30/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: UserAdvManager
-Version: 2.30.0
+Version: 2.30.1
 Description: Renforcer la gestion des utilisateurs - Enforce users management
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=216
@@ -150 +150 @@
       }
 
+      // Generic accounts exclusion (including Adult_Content generic users)
+      // ------------------------------------------------------------------
+      $query ='
+SELECT u.id
+FROM '.USERS_TABLE.' AS u
+INNER JOIN '.USER_INFOS_TABLE.' AS ui
+  ON u.id = ui.user_id
+WHERE ui.status = "generic"
+;';
+
+            $result = pwg_query($query);
+
+      while ($row = pwg_db_fetch_assoc($result))
+      {
+        if (in_array($row['id'], $collection))
+        {
+          array_push($page['errors'], l10n('UAM_Generic cannot be pwdreset'));
+          $errors = l10n('UAM_Generic cannot be pwdreset');
+        }
+      }
+
+      // Admins accounts exclusion
+      // --------------------------
+      $query ='
+SELECT u.id
+FROM '.USERS_TABLE.' AS u
+INNER JOIN '.USER_INFOS_TABLE.' AS ui
+  ON u.id = ui.user_id
+WHERE ui.status = "admin"
+;';
+
+            $result = pwg_query($query);
+
+      while ($row = pwg_db_fetch_assoc($result))
+      {
+        if (in_array($row['id'], $collection))
+        {
+          array_push($page['errors'], l10n('UAM_Admins cannot be pwdreset'));
+          $errors = l10n('UAM_Admins cannot be pwdreset');
+        }
+      }
+
+      $template->append('errors', $errors);
+
       if (count($page['errors']) == 0)
-      {  
+      {
         if (isset($_POST['confirm_pwdreset']) and 1 == $_POST['confirm_pwdreset'])
         {
@@ -182 +226 @@
         }
       }
-    }  
+    }
     $template->set_prefilter('user_list', 'UAM_PwdReset_Prefilter');
   }