Changeset 12314 for extensions/UserAdvManager/trunk/main.inc.php

Timestamp:

Oct 2, 2011, 7:14:27 PM (13 years ago)

Author:

Eric

Message:

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/trunk/main.inc.php (modified) (3 diffs)

extensions/UserAdvManager/trunk/main.inc.php

@@ -131 +131 @@
       {
         array_push($page['errors'], l10n('UAM_Guest cannot be pwdreset'));
-        $template->append('errors', l10n('UAM_Guest cannot be pwdreset'));
+        $errors = l10n('UAM_Guest cannot be pwdreset');
       }
       if (($conf['guest_id'] != $conf['default_user_id']) and
@@ -137 +137 @@
       {
         array_push($page['errors'], l10n('UAM_Default user cannot be pwgreset'));
-        $template->append('errors', l10n('UAM_Default user cannot be pwgreset'));
+        $errors = l10n('UAM_Default user cannot be pwgreset');
       }
       if (in_array($conf['webmaster_id'], $collection))
       {
         array_push($page['errors'], l10n('UAM_Webmaster cannot be pwdreset'));
-        $template->append('errors', l10n('UAM_Webmaster cannot be pwdreset'));
+        $errors = l10n('UAM_Webmaster cannot be pwdreset');
       }
       if (in_array($user['id'], $collection))
       {
         array_push($page['errors'], l10n('UAM_You cannot pwdreset your account'));
-        $template->append('errors', l10n('UAM_You cannot pwdreset your account'));
-      }
+        $errors = l10n('UAM_You cannot pwdreset your account');
+      }
+
+      // 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 @@
         }
       }
-    }  
+    }
+
+$page['order_by_items'] = array(
+  'id' => l10n('registration date'),
+  'username' => l10n('Username'),
+  'level' => l10n('Privacy level'),
+  'Language' => l10n('Language'),
+  'UAM_pwdreset' => l10n('UAM_PwdReset'),
+  );
+
+// Filter order options
+$template->assign('order_options', $page['order_by_items']);
+$template->assign('order_selected',
+    isset($_GET['order_by']) ? $_GET['order_by'] : '');
+
     $template->set_prefilter('user_list', 'UAM_PwdReset_Prefilter');
   }