From 014ca639d7e0a0fcbff591a51d35eca1fe9c808f Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Thu, 27 Sep 2012 16:54:10 +0000
Subject: [PATCH] Call center prevent orphan data when deleting the call center
 queue make sure it deletes the associated tiers.

---
 app/call_center/v_call_center_agent_delete.php |  7 ++-----
 app/call_center/v_call_center_queue_delete.php | 13 +++++++++----
 app/call_center/v_call_center_tier_delete.php  |  6 ++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/call_center/v_call_center_agent_delete.php b/app/call_center/v_call_center_agent_delete.php
index 0c49348af5..329f1f7211 100644
--- a/app/call_center/v_call_center_agent_delete.php
+++ b/app/call_center/v_call_center_agent_delete.php
@@ -39,8 +39,7 @@ if (count($_GET)>0) {
 }
 
 //get the agent details
-	$sql = "";
-	$sql .= "select * from v_call_center_agents ";
+	$sql = "select * from v_call_center_agents ";
 	$sql .= "where domain_uuid = '$domain_uuid' ";
 	$sql .= "and call_center_agent_uuid = '$id' ";
 	$prep_statement = $db->prepare(check_sql($sql));
@@ -63,8 +62,7 @@ if (count($_GET)>0) {
 
 //delete the agent from the db
 	if (strlen($id)>0) {
-		$sql = "";
-		$sql .= "delete from v_call_center_agents ";
+		$sql = "delete from v_call_center_agents ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and call_center_agent_uuid = '$id' ";
 		$prep_statement = $db->prepare(check_sql($sql));
@@ -82,4 +80,3 @@ if (count($_GET)>0) {
 	return;
 
 ?>
-
diff --git a/app/call_center/v_call_center_queue_delete.php b/app/call_center/v_call_center_queue_delete.php
index 8e9b4a704f..5b24229cca 100644
--- a/app/call_center/v_call_center_queue_delete.php
+++ b/app/call_center/v_call_center_queue_delete.php
@@ -47,22 +47,28 @@ if (strlen($id) > 0) {
 		$prep_statement = $db->prepare($sql);
 		$prep_statement->execute();
 		while($row = $prep_statement->fetch(PDO::FETCH_ASSOC)) {
+			$queue_name = $row['queue_name'];
 			$dialplan_uuid = $row['dialplan_uuid'];
 		}
 
+	//delete the tier from the database
+		$sql = "delete from v_call_center_tiers ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "and queue_name = '$queue_name' ";
+		$db->query($sql);
+		unset($sql);
+
 	//delete the call center queue
 		$sql = "delete from v_call_center_queues ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
+		$db->query($sql);
 		unset($sql);
 
 	//delete the dialplan entry
 		$sql = "delete from v_dialplans ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
-		//echo $sql."<br>\n";
 		$db->query($sql);
 		unset($sql);
 
@@ -70,7 +76,6 @@ if (strlen($id) > 0) {
 		$sql = "delete from v_dialplan_details ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
-		//echo $sql."<br>\n";
 		$db->query($sql);
 		unset($sql);
 
diff --git a/app/call_center/v_call_center_tier_delete.php b/app/call_center/v_call_center_tier_delete.php
index 246fee9af2..cfaea2e463 100644
--- a/app/call_center/v_call_center_tier_delete.php
+++ b/app/call_center/v_call_center_tier_delete.php
@@ -40,8 +40,7 @@ else {
 	}
 
 //get the agent details
-	$sql = "";
-	$sql .= "select * from v_call_center_tiers ";
+	$sql = "select * from v_call_center_tiers ";
 	$sql .= "where domain_uuid = '$domain_uuid' ";
 	$sql .= "and call_center_tier_uuid = '$id' ";
 	$prep_statement = $db->prepare(check_sql($sql));
@@ -68,8 +67,7 @@ else {
 
 //delete the tier from the database
 	if (strlen($id)>0) {
-		$sql = "";
-		$sql .= "delete from v_call_center_tiers ";
+		$sql = "delete from v_call_center_tiers ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and call_center_tier_uuid = '$id' ";
 		$prep_statement = $db->prepare(check_sql($sql));