From 10cf5cdba9ef33e3bc0a689780e567c6e7ad8756 Mon Sep 17 00:00:00 2001
From: Robert Anderson <randerson@lbsd.net>
Date: Wed, 1 Apr 2009 11:42:56 +0000
Subject: [PATCH] improved readability of code
---
webui/user-delete.php | 65 ++++++++++++++++++++++++++++++++-----------
1 file changed, 48 insertions(+), 17 deletions(-)
diff --git a/webui/user-delete.php b/webui/user-delete.php
index e5c4a3f4..97ae9ffb 100644
--- a/webui/user-delete.php
+++ b/webui/user-delete.php
@@ -40,7 +40,9 @@ printHeader(array(
if ($_POST['frmaction'] == "delete") {
# Check a user was selected
if (isset($_POST['user_id'])) {
+
?>
+
<p class="pageheader">Delete User</p>
<form action="user-delete.php" method="post">
@@ -54,50 +56,79 @@ if ($_POST['frmaction'] == "delete") {
<input type="submit" name="confirm" value="no" />
</div>
</form>
+
<?php
+
} else {
+
?>
+
<div class="warning">No user selected</div>
+
<?php
+
}
# SQL Updates
} elseif ($_POST['frmaction'] == "delete2") {
+
?>
+
<p class="pageheader">User Delete Results</p>
+
<?php
+
if (isset($_POST['user_id'])) {
# Check to see if user's attributes are empty
- $temp = $_POST['user_id'];
- $sql = "SELECT * FROM ${DB_TABLE_PREFIX}user_attributes WHERE UserID = $temp";
- $check = $db->query($sql);
-
- if ($check->num_rows == 0) {
- if ($_POST['confirm'] == "yes") {
- $res = $db->exec("DELETE FROM ${DB_TABLE_PREFIX}users WHERE ID = ".$_POST['user_id']);
- if ($res !== FALSE) {
-?>
- <div class="notice">User with ID: <?php print_r($_POST['user_id']);?> deleted</div>
-<?php
- } else {
+ $userID = $_POST['user_id'];
+ $sql = "SELECT * FROM ${DB_TABLE_PREFIX}user_attributes WHERE UserID = $userID";
+ $res = $db->query($sql);
+
+ if ($_POST['confirm'] == "yes") {
+ $res = $db->exec("DELETE FROM ${DB_TABLE_PREFIX}users WHERE ID = ".$_POST['user_id']);
+ if ($res !== FALSE) {
+
?>
- <div class="warning">Error deleting user</div>
- <div class="warning"><?php print_r($db->errorInfo()) ?></div>
+
+ <div class="notice">User with ID: <?php print_r($_POST['user_id']);?> deleted</div>
+
<?php
- }
+
} else {
+
?>
- <div class="warning">Delete user aborted</div>
+
+ <div class="warning">Error deleting user</div>
+ <div class="warning"><?php print_r($db->errorInfo()) ?></div>
+
<?php
+
}
} else {
+
?>
- <div class="warning">Attribute list is not empty!</div>
+
+ <div class="warning">Delete user aborted</div>
+
<?php
+
}
} else {
+
?>
+
+ <div class="warning">Attribute list is not empty!</div>
+
+<?php
+
+ }
+} else {
+
+?>
+
<div class="warning">Invocation error, no user ID selected</div>
+
<?php
+
}
}
printFooter();
--
GitLab