From 77e59fa9be708a079d33e716b873ff68652bbec7 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Thu, 19 Sep 2013 12:06:29 +0000 Subject: [PATCH] Get rid of duplicate columns in ring groups and change some of the wording for 2 comments. --- app/ring_groups/ring_group_destination_edit.php | 4 ---- app/ring_groups/ring_group_edit.php | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/ring_groups/ring_group_destination_edit.php b/app/ring_groups/ring_group_destination_edit.php index 084cfdebcd..72d5ed14e9 100644 --- a/app/ring_groups/ring_group_destination_edit.php +++ b/app/ring_groups/ring_group_destination_edit.php @@ -116,8 +116,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "domain_uuid, "; $sql .= "ring_group_destination_uuid, "; $sql .= "ring_group_uuid, "; - $sql .= "domain_uuid, "; - $sql .= "ring_group_uuid, "; $sql .= "destination_number, "; $sql .= "destination_delay, "; $sql .= "destination_timeout, "; @@ -128,8 +126,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$domain_uuid', "; $sql .= "'".uuid()."', "; $sql .= "'$ring_group_uuid', "; - $sql .= "'$domain_uuid', "; - $sql .= "'$ring_group_uuid', "; $sql .= "'$destination_number', "; $sql .= "'$destination_delay', "; $sql .= "'$destination_timeout', "; diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php index c7e7d9a1d7..8e0c909311 100644 --- a/app/ring_groups/ring_group_edit.php +++ b/app/ring_groups/ring_group_edit.php @@ -127,12 +127,12 @@ else { } } -//assign the extension to the user +//assign the user if (strlen($_REQUEST["user_uuid"]) > 0 && strlen($_REQUEST["id"]) > 0 && $_GET["a"] != "delete") { //set the variables $user_uuid = check_str($_REQUEST["user_uuid"]); $extension_uuid = check_str($_REQUEST["id"]); - //assign the user to the extension + //assign the user to the ring group $sql_insert = "insert into v_ring_group_users "; $sql_insert .= "("; $sql_insert .= "ring_group_user_uuid, ";