diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php index a215504675..4f93fbbf88 100644 --- a/app/ring_groups/ring_group_edit.php +++ b/app/ring_groups/ring_group_edit.php @@ -43,17 +43,6 @@ else { //delete the user from the v_extension_users if ($_GET["a"] == "delete" && permission_exists("user_delete")) { - /* - //set the variables - $ring_group_extension_uuid = check_str($_REQUEST["id"]); - $ring_group_uuid = check_str($_REQUEST["ring_group_uuid"]); - //delete the extension from the ring_group - $sql = "delete from v_ring_group_extensions "; - $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; - $sql .= "and ring_group_extension_uuid = '$ring_group_extension_uuid' "; - $db->exec(check_sql($sql)); - unset($sql); - */ //set the variables $ring_group_destination_uuid = check_str($_REQUEST["id"]); $ring_group_uuid = check_str($_REQUEST["ring_group_uuid"]); @@ -65,7 +54,7 @@ else { unset($sql); //redirect the browser require_once "resources/header.php"; - echo "\n"; + echo "\n"; echo "
Delete Complete
"; require_once "resources/footer.php"; return; @@ -117,9 +106,6 @@ else { $ring_group_timeout_array = explode(":", $ring_group_timeout_action); $ring_group_timeout_app = array_shift($ring_group_timeout_array); $ring_group_timeout_data = join(':', $ring_group_timeout_array); -// $extension_uuid = check_str($_POST["extension_uuid"]); -// $extension_delay = check_str($_POST["extension_delay"]); -// $extension_timeout = check_str($_POST["extension_timeout"]); $destination_number = check_str($_POST["destination_number"]); $destination_delay = check_str($_POST["destination_delay"]); $destination_timeout = check_str($_POST["destination_timeout"]); @@ -234,35 +220,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } if ($action == "update" || $action == "add") { - //if extension_uuid then add it to ring group extensions - /* if (strlen($extension_uuid) > 0) { - $ring_group_extension_uuid = uuid(); - $sql = "insert into v_ring_group_extensions "; - $sql .= "("; - $sql .= "domain_uuid, "; - $sql .= "ring_group_uuid, "; - $sql .= "ring_group_extension_uuid, "; - $sql .= "extension_delay, "; - if (strlen($extension_timeout) > 0) { - $sql .= "extension_timeout, "; - } - $sql .= "extension_uuid "; - $sql .= ")"; - $sql .= "values "; - $sql .= "("; - $sql .= "'".$_SESSION['domain_uuid']."', "; - $sql .= "'$ring_group_uuid', "; - $sql .= "'$ring_group_extension_uuid', "; - $sql .= "'$extension_delay', "; - if (strlen($extension_timeout) > 0) { - $sql .= "'$extension_timeout', "; - } - $sql .= "'$extension_uuid' "; - $sql .= ")"; - $db->exec(check_sql($sql)); - unset($sql); - } */ - //if destination then add it to ring group destinations if (strlen($destination_number) > 0) { $ring_group_destination_uuid = uuid(); @@ -374,13 +331,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { //redirect the browser require_once "resources/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; if ($action == "add") { - echo $text['message-add-complete']."\n"; + echo $text['message-add']."\n"; } if ($action == "update") { - echo $text['message-update-complete']."\n"; + echo $text['message-update']."\n"; } echo "
\n"; require_once "resources/footer.php"; @@ -520,78 +477,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo $text['description-strategy']."\n"; echo "\n"; echo "\n"; -/* - echo " "; - echo " ".$text['label-extensions'].":"; - echo " "; - if ($action == "update") { - echo " \n"; - $sql = "SELECT g.ring_group_extension_uuid, e.extension_uuid, g.extension_delay, g.extension_timeout, e.extension "; - $sql .= "FROM v_ring_groups as r, v_ring_group_extensions as g, v_extensions as e "; - $sql .= "where g.ring_group_uuid = r.ring_group_uuid "; - $sql .= "and g.domain_uuid = '".$_SESSION['domain_uuid']."' "; - $sql .= "and g.ring_group_uuid = '".$ring_group_uuid."' "; - $sql .= "and e.extension_uuid = g.extension_uuid "; - $sql .= "order by g.extension_delay asc, e.extension asc "; - $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->execute(); - $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); - $result_count = count($result); - echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "\n"; - foreach($result as $field) { - if (strlen($field['extension_delay']) == 0) { $field['extension_delay'] = "0"; } - if (strlen($field['extension_timeout']) == 0) { $field['extension_timeout'] = "30"; } - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - } - echo "
".$text['label-extension']."".$text['label-delay']."".$text['label-duration']."
\n"; - echo " ".$field['extension']; - echo " \n"; - echo " ".$field['extension_delay']." \n"; - echo " \n"; - echo " ".$field['extension_timeout']." \n"; - echo " \n"; - echo " $v_link_label_delete\n"; - echo "
\n"; - } - echo "
\n"; - $sql = "SELECT * FROM v_extensions "; - $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; - $sql .= "order by extension asc "; - $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->execute(); - echo " "; - echo "  \n"; - echo " ".$text['label-delay']." "; - destination_select('extension_delay', $extension_delay, '0'); - echo "  ".$text['label-duration']." \n"; - destination_select('extension_timeout', $extension_timeout, '30'); - if ($action == "update") { - echo " \n"; - } - unset($sql, $result); - echo "
\n"; - echo " ".$text['description-extensions']."\n"; - echo "
\n"; - echo " "; - echo " "; -*/ echo " "; echo " ".$text['label-destinations'].":"; echo " "; diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index db177a31f0..e9c144782d 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -119,7 +119,7 @@ require_once "resources/paging.php"; echo th_order_by('ring_group_enabled', $text['label-enabled'], $order_by, $order); echo th_order_by('ring_group_description', $text['label-description'], $order_by, $order); echo "\n"; - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; echo "\n"; echo "\n"; @@ -136,8 +136,8 @@ require_once "resources/paging.php"; echo " ".$row['ring_group_enabled']." \n"; echo " ".$row['ring_group_description']." \n"; echo " \n"; - echo " $v_link_label_edit\n"; - echo " $v_link_label_delete\n"; + echo " $v_link_label_edit\n"; + echo " $v_link_label_delete\n"; echo " \n"; echo "\n"; if ($c==0) { $c=1; } else { $c=0; } @@ -152,7 +152,7 @@ require_once "resources/paging.php"; echo "  \n"; echo " $paging_controls\n"; echo " \n"; - echo " $v_link_label_add\n"; + echo " $v_link_label_add\n"; echo " \n"; echo " \n"; echo " \n";