From 7f0941956488617b26664523cb4487517d0de79c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 20 Oct 2003 07:12:00 +0000
Subject: - Bugfix: fixed two problems with adding and deleting access rules. 
 Patch by   Moshe.  Requires database upgrade.

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

(limited to 'modules')

diff --git a/modules/user.module b/modules/user.module
index f9a297bc7..cdb968e43 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1296,8 +1296,9 @@ function user_admin_access($edit = array()) {
   }
 
   if ($op == t("Add rule")) {
-    db_query("INSERT INTO {access} (mask, type, status) VALUES ('%s', '%s', %d)", $edit["mask"], $type, $edit["status"]);
-    $output .= status(t("Access rule added"));
+    $aid = db_next_id("access_aid");
+    db_query("INSERT INTO {access} (aid, mask, type, status) VALUES ('%s', '%s', '%s', %d)", $aid, $edit["mask"], $type, $edit["status"]);
+    $output .= status(t("access rule added."));
   }
   else if ($op == t("Check")) {
     if (user_deny($type, $edit["test"])) {
@@ -1309,7 +1310,7 @@ function user_admin_access($edit = array()) {
   }
   else if ($id) {
     db_query("DELETE FROM {access} WHERE aid = %d", $id);
-    $output .= status(t("Access rule deleted"));
+    $output .= status(t("access rule deleted."));
   }
 
   $header = array(t("type"), t("mask"), t("operations"));
@@ -1335,7 +1336,7 @@ function user_admin_access($edit = array()) {
   else {
     $title = t("Check username");
   }
-  $output .= form_textfield($title, "mask", $edit["test"], 32, 64). form_submit(t("Check"));
+  $output .= form_textfield($title, "test", $edit["test"], 32, 64). form_submit(t("Check"));
 
   return form($output);
 }
diff --git a/modules/user/user.module b/modules/user/user.module
index f9a297bc7..cdb968e43 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1296,8 +1296,9 @@ function user_admin_access($edit = array()) {
   }
 
   if ($op == t("Add rule")) {
-    db_query("INSERT INTO {access} (mask, type, status) VALUES ('%s', '%s', %d)", $edit["mask"], $type, $edit["status"]);
-    $output .= status(t("Access rule added"));
+    $aid = db_next_id("access_aid");
+    db_query("INSERT INTO {access} (aid, mask, type, status) VALUES ('%s', '%s', '%s', %d)", $aid, $edit["mask"], $type, $edit["status"]);
+    $output .= status(t("access rule added."));
   }
   else if ($op == t("Check")) {
     if (user_deny($type, $edit["test"])) {
@@ -1309,7 +1310,7 @@ function user_admin_access($edit = array()) {
   }
   else if ($id) {
     db_query("DELETE FROM {access} WHERE aid = %d", $id);
-    $output .= status(t("Access rule deleted"));
+    $output .= status(t("access rule deleted."));
   }
 
   $header = array(t("type"), t("mask"), t("operations"));
@@ -1335,7 +1336,7 @@ function user_admin_access($edit = array()) {
   else {
     $title = t("Check username");
   }
-  $output .= form_textfield($title, "mask", $edit["test"], 32, 64). form_submit(t("Check"));
+  $output .= form_textfield($title, "test", $edit["test"], 32, 64). form_submit(t("Check"));
 
   return form($output);
 }
-- 
cgit v1.2.3