summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2009-01-20 15:26:24 +0100
committerAndrew Dolgov <[email protected]>2009-01-20 15:26:24 +0100
commitec800fe1f28137d7c21471796aa44a2ca97664b8 (patch)
tree33695a895a626ebddd4dd9c0ec46df7c981bfc42 /modules
parentd404ae81a5894500e6f45462d32dd03cc26f1d4b (diff)
simplify user deletion
Diffstat (limited to 'modules')
-rw-r--r--modules/pref-users.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/pref-users.php b/modules/pref-users.php
index 52d8161ac..6a768cede 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -212,21 +212,21 @@
}
} else if ($subop == "remove") {
- if (!WEB_DEMO_MODE && $_SESSION["access_level"] >= 10) {
+ if ($_SESSION["access_level"] >= 10) {
$ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) {
- db_query($link, "BEGIN");
- db_query($link, "DELETE FROM ttrss_feeds WHERE owner_uid = '$id' AND owner_uid != " . $_SESSION["uid"]);
- db_query($link, "DELETE FROM ttrss_users WHERE id = '$id' AND id != " . $_SESSION["uid"]);
- db_query($link, "COMMIT");
-
+ if ($id != $_SESSION["uid"]) {
+ db_query($link, "DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
+ db_query($link, "DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
+ db_query($link, "DELETE FROM ttrss_users WHERE id = '$id'");
+ }
}
}
} else if ($subop == "add") {
- if (!WEB_DEMO_MODE && $_SESSION["access_level"] >= 10) {
+ if ($_SESSION["access_level"] >= 10) {
$login = db_escape_string(trim($_GET["login"]));
$tmp_user_pwd = make_password(8);