From 053571497da70ce38b5030151cf4d48b46e144ec Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Thu, 20 Aug 2015 09:33:02 -0600
Subject: [PATCH] Delete child data when deleting access controls. Improve the
 indentation.

---
 app/access_controls/access_control_delete.php | 24 ++++++++++++-------
 .../access_control_node_delete.php            |  7 +++---
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/access_controls/access_control_delete.php b/app/access_controls/access_control_delete.php
index 6027acf1e7..0054e1602a 100644
--- a/app/access_controls/access_control_delete.php
+++ b/app/access_controls/access_control_delete.php
@@ -21,14 +21,22 @@ else {
 		$id = check_str($_GET["id"]);
 	}
 
-if (strlen($id)>0) {
-	//delete access_control
-		$sql = "delete from v_access_controls ";
-		$sql .= "where access_control_uuid = '$id' ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		unset($sql);
-}
+//delete the data
+	if (strlen($id)>0) {
+		//delete access_control
+			$sql = "delete from v_access_controls ";
+			$sql .= "where access_control_uuid = '$id' ";
+			$prep_statement = $db->prepare(check_sql($sql));
+			$prep_statement->execute();
+			unset($sql);
+
+		//delete access_control_node
+			$sql = "delete from v_access_control_nodes ";
+			$sql .= "where access_control_uuid = '$id' ";
+			$prep_statement = $db->prepare(check_sql($sql));
+			$prep_statement->execute();
+			unset($sql);
+	}
 
 //redirect the user
 	$_SESSION['message'] = $text['message-delete'];
diff --git a/app/access_controls/access_control_node_delete.php b/app/access_controls/access_control_node_delete.php
index b89def7ad0..57e1696d6c 100644
--- a/app/access_controls/access_control_node_delete.php
+++ b/app/access_controls/access_control_node_delete.php
@@ -22,18 +22,17 @@ else {
 		$access_control_uuid = check_str($_GET["access_control_uuid"]);
 	}
 
-if (strlen($id)>0) {
-	//delete access_control_node
+//delete access_control_node
+	if (strlen($id)>0) {
 		$sql = "delete from v_access_control_nodes ";
 		$sql .= "where access_control_node_uuid = '$id' ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
 		unset($sql);
-}
+	}
 
 //redirect the user
 	$_SESSION['message'] = $text['message-delete'];
 	header('Location: access_control_node_edit.php?id='.$access_control_uuid);
 
-
 ?>
\ No newline at end of file