diff --git a/app/ring_groups/ring_group_forward.php b/app/ring_groups/ring_group_forward.php index 2d149d308a..16859b2357 100644 --- a/app/ring_groups/ring_group_forward.php +++ b/app/ring_groups/ring_group_forward.php @@ -48,17 +48,19 @@ require_once "resources/paging.php"; //show the content - //echo "\n"; - //echo " \n"; - //echo " \n"; - //echo " \n"; - //echo " \n"; - //echo " \n"; - //echo " \n"; - //echo " \n"; - //echo "
".$text['title']." 
\n"; - //echo " ".$text['description']."

\n"; - //echo "
\n"; + if (!$is_included) { + echo "\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
".$text['title']." 
\n"; + echo " ".$text['description']."

\n"; + echo "
\n"; + } //prepare to page the results if (permission_exists('ring_group_add') || permission_exists('ring_group_edit')) { @@ -147,7 +149,7 @@ require_once "resources/paging.php"; //echo " ".$row['ring_group_timeout_app']." \n"; //echo " ".$row['ring_group_timeout_data']." \n"; //echo " ".$row['ring_group_enabled']." \n"; - echo " ".$text['link-call-forward']."\n"; + echo " ".$text['link-call-forward']."\n"; echo " ".$row['ring_group_description']." \n"; echo "\n"; if ($c==0) { $c=1; } else { $c=0; } diff --git a/app/ring_groups/ring_group_forward_edit.php b/app/ring_groups/ring_group_forward_edit.php index e458ffd361..d1c6181345 100644 --- a/app/ring_groups/ring_group_forward_edit.php +++ b/app/ring_groups/ring_group_forward_edit.php @@ -85,7 +85,7 @@ require_once "resources/check_auth.php"; //redirect the user $_SESSION["message"] = $text['message-update']; - header("Location: ".PROJECT_PATH."/app/ring_groups/ring_group_forward.php"); + header("Location: ".$_REQUEST['return_url']); return; } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) @@ -110,13 +110,14 @@ require_once "resources/check_auth.php"; //show the content echo "
\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index 8451ccea4d..87cf2538ce 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -114,11 +114,10 @@ require_once "resources/paging.php"; echo "\n"; echo th_order_by('ring_group_name', $text['label-name'], $order_by, $order); echo th_order_by('ring_group_extension', $text['label-extension'], $order_by, $order); - //echo th_order_by('ring_group_context', 'Context', $order_by, $order); - //echo th_order_by('ring_group_strategy', 'Strategy', $order_by, $order); - //echo th_order_by('ring_group_timeout_app', 'Timeout App', $order_by, $order); - //echo th_order_by('ring_group_timeout_data', 'Timeout Data', $order_by, $order); echo th_order_by('ring_group_enabled', $text['label-enabled'], $order_by, $order); + if (permission_exists('ring_group_forward')) { + echo ""; + } echo th_order_by('ring_group_description', $text['header-description'], $order_by, $order); echo "\n"; echo " \n"; - //echo " \n"; - //echo " \n"; - //echo " \n"; - //echo " \n"; echo " \n"; + if (permission_exists('ring_group_forward')) { + echo " \n"; + } echo " \n"; echo "
\n"; echo " ".$text['header-ring-group-forward']."\n"; echo "\n"; - echo " \n"; + echo " \n"; echo " \n"; echo "
".$text['label-tools'].""; if (permission_exists('ring_group_add')) { @@ -142,11 +141,10 @@ require_once "resources/paging.php"; } echo " ".$row['ring_group_extension']." ".$row['ring_group_context']." ".$row['ring_group_strategy']." ".$row['ring_group_timeout_app']." ".$row['ring_group_timeout_data']." ".ucwords($row['ring_group_enabled'])." ".$text['link-call-forward']."".$row['ring_group_description']." "; if (permission_exists('ring_group_edit')) {