From 9eb0067ce4d931b5a00d44146cd2f78e9af44a7d Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 20 Sep 2003 16:56:36 +0000
Subject: - Fixed off-by-one error in user admin pages.

---
 modules/user.module      | 11 +++++------
 modules/user/user.module | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'modules')

diff --git a/modules/user.module b/modules/user.module
index 1a7fddbd6..669a244d7 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -496,11 +496,9 @@ function user_link($type) {
     menu("admin/user/search", "search accounts", "user_admin", user_help("admin/user/search"), 8);
     menu("admin/user/help", "help", "user_help", NULL, 9);
     menu("admin/user/edit", "edit user account", "user_admin", NULL, 0, 1); // hidden menu
-    menu("admin/user/account/0", "active users", "user_admin", user_help("admin/user/account/0"), 1);
-    menu("admin/user/account/1", "new users", "user_admin", user_help("admin/user/account/1"), 2);
-    menu("admin/user/account/2", "blocked users", "user_admin", user_help("admin/user/account/2"), 3);
+    menu("admin/user/account/1", "blocked users", "user_admin", user_help("admin/user/account/1"), 3);
 
-    $i = 3;
+    $i = 2;
     foreach (user_roles(1) as $key => $value) {
       menu("admin/user/account/". $i++, "users with role '$value'", "user_admin", NULL, 4);
     }
@@ -1591,7 +1589,8 @@ function user_admin_edit($edit = array()) {
 function user_admin_account() {
   $query = arg(3);
 
-  $queries = array("", "WHERE u.status = 0");
+  $queries[] = "";
+  $queries[] = "WHERE u.status = 0";
   foreach (user_roles(1) as $key => $value) {
     $queries[] = "WHERE r.name = '$value'";
   }
@@ -1601,7 +1600,7 @@ function user_admin_account() {
   $header = array(
     array ("data" => t("uid"), "field" => "u.uid"),
     array ("data" => t("username"), "field" => "u.name"),
-    array ("data" => t("last access"), "field"  => "u.timestamp", "sort" => "asc"),
+    array ("data" => t("last access"), "field"  => "u.timestamp", "sort" => "desc"),
     t("operations")
   );
   $sql .= tablesort_sql($header);
diff --git a/modules/user/user.module b/modules/user/user.module
index 1a7fddbd6..669a244d7 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -496,11 +496,9 @@ function user_link($type) {
     menu("admin/user/search", "search accounts", "user_admin", user_help("admin/user/search"), 8);
     menu("admin/user/help", "help", "user_help", NULL, 9);
     menu("admin/user/edit", "edit user account", "user_admin", NULL, 0, 1); // hidden menu
-    menu("admin/user/account/0", "active users", "user_admin", user_help("admin/user/account/0"), 1);
-    menu("admin/user/account/1", "new users", "user_admin", user_help("admin/user/account/1"), 2);
-    menu("admin/user/account/2", "blocked users", "user_admin", user_help("admin/user/account/2"), 3);
+    menu("admin/user/account/1", "blocked users", "user_admin", user_help("admin/user/account/1"), 3);
 
-    $i = 3;
+    $i = 2;
     foreach (user_roles(1) as $key => $value) {
       menu("admin/user/account/". $i++, "users with role '$value'", "user_admin", NULL, 4);
     }
@@ -1591,7 +1589,8 @@ function user_admin_edit($edit = array()) {
 function user_admin_account() {
   $query = arg(3);
 
-  $queries = array("", "WHERE u.status = 0");
+  $queries[] = "";
+  $queries[] = "WHERE u.status = 0";
   foreach (user_roles(1) as $key => $value) {
     $queries[] = "WHERE r.name = '$value'";
   }
@@ -1601,7 +1600,7 @@ function user_admin_account() {
   $header = array(
     array ("data" => t("uid"), "field" => "u.uid"),
     array ("data" => t("username"), "field" => "u.name"),
-    array ("data" => t("last access"), "field"  => "u.timestamp", "sort" => "asc"),
+    array ("data" => t("last access"), "field"  => "u.timestamp", "sort" => "desc"),
     t("operations")
   );
   $sql .= tablesort_sql($header);
-- 
cgit v1.2.3