diff --git a/webui/group-add.php b/webui/group-add.php
index 76ccb967efdebfdd391b59e1135651aae7b52775..0f155fa5a8adf75a4d97de17d1612b8d8f9593fb 100644
--- a/webui/group-add.php
+++ b/webui/group-add.php
@@ -82,28 +82,39 @@ if (isset($_POST['frmaction']) && $_POST['frmaction'] == "add") {
<?php
- $stmt = $db->prepare("INSERT INTO ${DB_TABLE_PREFIX}groups (Name,Priority,Disabled,Comment) VALUES (?,?,?,?)");
+ if (!empty($_POST['group_name'])) {
- $res = $stmt->execute(array(
- $_POST['group_name'],
- $_POST['group_priority'],
- $_POST['group_disabled'],
- $_POST['group_comment'],
- ));
- if ($res) {
+ $stmt = $db->prepare("INSERT INTO ${DB_TABLE_PREFIX}groups (Name,Priority,Disabled,Comment) VALUES (?,?,?,?)");
+
+ $res = $stmt->execute(array(
+ $_POST['group_name'],
+ $_POST['group_priority'],
+ $_POST['group_disabled'],
+ $_POST['group_comment'],
+ ));
+ if ($res) {
+
+?>
+
+ <div class="notice">Group created</div>
+
+<?php
+
+ } else {
?>
- <div class="notice">Group created</div>
+ <div class="warning">Failed to create group</div>
+ <div class="warning"><?php print_r($stmt->errorInfo()) ?></div>
<?php
+ }
} else {
?>
- <div class="warning">Failed to create group</div>
- <div class="warning"><?php print_r($stmt->errorInfo()) ?></div>
+ <div class="warning">Group name cannot be empty!</div>
<?php
diff --git a/webui/group-attribute-change.php b/webui/group-attribute-change.php
index 6008271e981cb3138fb5615a78ae93882abffa53..c39750e9611f1e474f8f54300f57d75defb4bdab 100644
--- a/webui/group-attribute-change.php
+++ b/webui/group-attribute-change.php
@@ -158,7 +158,7 @@ if (isset($_POST['frmaction']) && $_POST['frmaction'] == "change") {
$updateStr = implode(', ',$updates);
$res = $db->exec("UPDATE ${DB_TABLE_PREFIX}group_attributes SET $updateStr WHERE ID = ".$db->quote($_POST['attr_id']));
- if ($res) {
+ if ($res !== FALSE) {
?>
diff --git a/webui/group-delete.php b/webui/group-delete.php
index 5f9b3927dfb351940a003b9a803e2da8c99f4e8d..5960f31007a3398e3234b0be139be4ecd8ca726c 100644
--- a/webui/group-delete.php
+++ b/webui/group-delete.php
@@ -79,57 +79,52 @@ if (isset($_POST['frmaction']) && $_POST['frmaction'] == "delete") {
$db->beginTransaction();
- $resultRemoveMembers = $db->exec("DELETE FROM ${DB_TABLE_PREFIX}users_to_groups WHERE GroupID = ".$db->quote($_POST['group_id']));
- $resultRemoveAttributes = $db->exec("DELETE FROM ${DB_TABLE_PREFIX}group_attributes WHERE GroupID = ".$db->quote($_POST['group_id']));
- $resultRemoveGroup = $db->exec("DELETE FROM ${DB_TABLE_PREFIX}groups WHERE ID = ".$db->quote($_POST['group_id']));
-
- if ($resultRemoveMembers && $resultRemoveAttributes && $resultRemoveGroup) {
-
+ $res = $db->exec("DELETE FROM ${DB_TABLE_PREFIX}users_to_groups WHERE GroupID = ".$db->quote($_POST['group_id']));
+ if ($res !== FALSE) {
+ $res = $db->exec("DELETE FROM ${DB_TABLE_PREFIX}group_attributes WHERE GroupID = ".$db->quote($_POST['group_id']));
+ if ($res !== FALSE) {
+ $res = $db->exec("DELETE FROM ${DB_TABLE_PREFIX}groups WHERE ID = ".$db->quote($_POST['group_id']));
+ if ($res !== FALSE) {
?>
-
- <div class="notice">Group deleted</div>
-
+ <div class="notice">Group deleted</div>
<?php
-
- $db->commit();
+ $db->commit();
+ } else {
+?>
+ <div class="warning">Error deleting group</div>
+ <div class="warning"><?php print_r($db->errorInfo()) ?></div>
+<?php
+ $db->rollback();
+ }
+ } else {
+?>
+ <div class="warning">Error deleting group</div>
+ <div class="warning"><?php print_r($db->errorInfo()) ?></div>
+<?php
+ $db->rollback();
+ }
} else {
-
?>
-
<div class="warning">Error deleting group</div>
<div class="warning"><?php print_r($db->errorInfo()) ?></div>
-
<?php
-
$db->rollback();
}
} else {
-
?>
-
<div class="notice">Group not deleted, aborted by user</div>
-
<?php
-
}
# Warn
} else {
-
?>
-
<div class="warning">Invocation error, no group ID</div>
-
<?php
-
}
} else {
-
?>
-
<div class="warning">Invalid invocation</div>
-
<?php
-
}
printFooter();
diff --git a/webui/group-main.php b/webui/group-main.php
index b54db36783e6d485b6120c4f5b1e7a16598eb52d..f5663832b3490011de6737f6959944a80d31dee4 100644
--- a/webui/group-main.php
+++ b/webui/group-main.php
@@ -83,7 +83,6 @@ printHeader(array(
$sql = "SELECT ID, Name, Priority, Disabled, Comment FROM ${DB_TABLE_PREFIX}groups ORDER BY ID";
$res = $db->query($sql);
- $rownums = 0;
while ($row = $res->fetchObject()) {
?>
diff --git a/webui/user-attribute-delete.php b/webui/user-attribute-delete.php
index de48aa9be2fe23330f9ebeac1cb6014f9ee75e53..fc74bbaab7bd6dd23b78a263deafe413fa2e0600 100644
--- a/webui/user-attribute-delete.php
+++ b/webui/user-attribute-delete.php
@@ -80,7 +80,7 @@ if (isset($_POST['frmaction']) && $_POST['frmaction'] == "delete") {
if (isset($_POST['attr_id'])) {
if (isset($_POST['confirm']) && $_POST['confirm'] == "yes") {
$res = $db->exec("DELETE FROM ${DB_TABLE_PREFIX}user_attributes WHERE ID = ".$db->quote($_POST['attr_id']));
- if ($res) {
+ if ($res !== FALSE) {
?>
diff --git a/webui/user-groups-delete.php b/webui/user-groups-delete.php
index e0e99abbd8e6a7d7b42e046843d99157106f9a74..55244ece354849a75977de91ef765a05473d75c6 100644
--- a/webui/user-groups-delete.php
+++ b/webui/user-groups-delete.php
@@ -88,7 +88,7 @@ if (isset($_POST['frmaction']) && $_POST['frmaction'] == "delete") {
GroupID = ".$db->quote($_POST['group_id'])
);
- if ($res) {
+ if ($res !== FALSE) {
?>
diff --git a/webui/wisp-multiuser-add.php b/webui/wisp-multiuser-add.php
index 08526f3a2c0ad104531b91def1baf976a4c34e09..2158bb1acd795e2d9b975221e198c5d372f50997 100644
--- a/webui/wisp-multiuser-add.php
+++ b/webui/wisp-multiuser-add.php
@@ -86,7 +86,7 @@ if (isset($_POST['frmaction']) && $_POST['frmaction'] == "insert") {
<?php
#FIXME
# Perform checks on input
- if (isset($_POST['num_users']) && isset($_POST['session_timeout']) && isset($_POST['data_limit']) && isset($_POST['time_limit'])) {
+ if (!empty($_POST['num_users']) && !empty($_POST['session_timeout']) && !empty($_POST['data_limit']) && !empty($_POST['time_limit'])) {
$db->beginTransaction();
$numberOfUsers = (int)$_POST['num_users'];
diff --git a/webui/wisp-user-delete.php b/webui/wisp-user-delete.php
index 2c23734a2a3a15810d04e096856153e4bcd12a16..2018cad47a27a1b2cabaa51bdcc564c1ce817edd 100644
--- a/webui/wisp-user-delete.php
+++ b/webui/wisp-user-delete.php
@@ -65,72 +65,64 @@ if (isset($_POST['frmaction']) && $_POST['frmaction'] == "delete") {
<div class="warning">No user selected</div>
<?php
-
}
# SQL Updates
} elseif (isset($_POST['frmaction']) && $_POST['frmaction'] == "delete2") {
-
?>
-
<p class="pageheader">User Remove Results</p>
-
<?php
-
if (isset($_POST['user_id'])) {
if (isset($_POST['confirm']) && $_POST['confirm'] == "yes") {
$db->beginTransaction();
# Delete user data
- $userDataDeleteResult = $db->exec("DELETE FROM userdata WHERE UserID = ".$db->quote($_POST['user_id']));
- # Delete user attributes
- $attrDeleteResult = $db->exec("DELETE FROM user_attributes WHERE UserID = ".$db->quote($_POST['user_id']));
- # Delete from users
- $userDeleteResult = $db->exec("DELETE FROM users WHERE ID = ".$db->quote($_POST['user_id']));
-
- if ($userDataDeleteResult && $attrDeleteResult && $userDeleteResult) {
+ $res = $db->exec("DELETE FROM userdata WHERE UserID = ".$db->quote($_POST['user_id']));
+ if ($res !== FALSE) {
+ # Delete user attributes
+ $res = $db->exec("DELETE FROM user_attributes WHERE UserID = ".$db->quote($_POST['user_id']));
+ if ($res !== FALSE) {
+ # Delete from users
+ $res = $db->exec("DELETE FROM users WHERE ID = ".$db->quote($_POST['user_id']));
+ if ($res !== FALSE) {
?>
-
- <div class="notice">User with ID: <?php print_r($_POST['user_id']);?> deleted</div>
-
+ <div class="notice">User with ID: <?php print_r($_POST['user_id']); ?> deleted!</div>
<?php
-
- $db->commit();
+ $db->commit();
+ } else {
+?>
+ <div class="warning">Failed to delete user!</div>
+ <div class="warning"><?php print_r($db->errorInfo()); ?></div>
+<?php
+ $db->rollback();
+ }
+ } else {
+?>
+ <div class="warning">Failed to delete user!</div>
+ <div class="warning"><?php print_r($db->errorInfo()); ?></div>
+<?php
+ $db->rollback();
+ }
} else {
-
?>
-
- <div class="warning">Error deleting user</div>
- <div class="warning"><?php print_r($db->errorInfo()) ?></div>
-
+ <div class="warning">Failed to delete user!</div>
+ <div class="warning"><?php print_r($db->errorInfo()); ?></div>
<?php
-
$db->rollback();
}
} else {
-
?>
-
<div class="warning">Delete user aborted</div>
-
<?php
-
}
} else {
-
?>
-
<div class="warning">No user selected</div>
-
<?php
-
}
} else {
?>
-
<div class="warning">Invocation error</div>
-
<?php
-
}
printFooter();
diff --git a/webui/wisp-user-edit.php b/webui/wisp-user-edit.php
index 1f641acba15cd1b897f6d434b2ed67ec6a090e06..5b36d8a338869393789eaa4b74597fae561f89ad 100644
--- a/webui/wisp-user-edit.php
+++ b/webui/wisp-user-edit.php
@@ -205,6 +205,12 @@ if (isset($_POST['frmaction']) && $_POST['frmaction'] == "edit") {
<?php
+ $userDataResult->closeCursor();
+ $framedIPResult->closeCursor();
+ $dataLimitResult->closeCursor();
+ $timeLimitResult->closeCursor();
+ $callingStationResult->closeCursor();
+
} else {
?>
@@ -215,11 +221,6 @@ if (isset($_POST['frmaction']) && $_POST['frmaction'] == "edit") {
}
- $userDataResult->closeCursor();
- $framedIPResult->closeCursor();
- $dataLimitResult->closeCursor();
- $timeLimitResult->closeCursor();
- $callingStationResult->closeCursor();
# SQL Updates
} elseif (isset($_POST['frmaction']) && $_POST['frmaction'] == "edit2") {