nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ring Groups: Corrected redirect to be relative on Back and Save. Added Call Forward edit link to main Ring Groups list (as displayed on User Dashboard).

Browse Source
This commit is contained in:
Nate Jones
2015-03-25 22:47:11 +00:00
parent 06d3833d55
commit 746943c6e9
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/ring_groups/ring_group_forward.php
View File

@@ -48,17 +48,19 @@ require_once "resources/paging.php";
//show the content
//echo "<table width='100%' border='0'>\n";
//echo " <tr>\n";
//echo " <td width='50%' align='left' nowrap='nowrap'><b>".$text['title']."</b></td>\n";
//echo " <td width='50%' align='right'>&nbsp;</td>\n";
//echo " </tr>\n";
//echo " <tr>\n";
//echo " <td align='left' colspan='2'>\n";
//echo " ".$text['description']."<br /><br />\n";
//echo " </td>\n";
//echo " </tr>\n";
//echo "</table>\n";
if (!$is_included) {
echo "<table width='100%' border='0'>\n";
echo " <tr>\n";
echo " <td width='50%' align='left' nowrap='nowrap'><b>".$text['title']."</b></td>\n";
echo " <td width='50%' align='right'>&nbsp;</td>\n";
echo " </tr>\n";
echo " <tr>\n";
echo " <td align='left' colspan='2'>\n";
echo " ".$text['description']."<br /><br />\n";
echo " </td>\n";
echo " </tr>\n";
echo "</table>\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 " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_timeout_app']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_timeout_data']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_enabled']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'><a href='".PROJECT_PATH."/app/ring_groups/ring_group_forward_edit.php?id=".$row['ring_group_uuid']."' alt='".$text['link-call-forward']."'>".$text['link-call-forward']."</a></td>\n";
echo " <td valign='top' class='".$row_style[$c]."'><a href='".PROJECT_PATH."/app/ring_groups/ring_group_forward_edit.php?id=".$row['ring_group_uuid']."&return_url=".urlencode($_SERVER['PHP_SELF'])."' alt='".$text['link-call-forward']."'>".$text['link-call-forward']."</a></td>\n";
echo " <td valign='top' class='row_stylebg'>".$row['ring_group_description']."&nbsp;</td>\n";
echo "</tr>\n";
if ($c==0) { $c=1; } else { $c=0; }

5
app/ring_groups/ring_group_forward_edit.php
View File

@@ -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 "<form method='post' name='frm' action=''>\n";
echo "<input type='hidden' name='return_url' value='".$_REQUEST['return_url']."'>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo "<td align='left' width='30%' nowrap>\n";
echo " <b>".$text['header-ring-group-forward']."</b>\n";
echo "</td>\n";
echo "<td width='70%' align='right'>\n";
echo " <input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='ring_group_forward.php'\" value='".$text['button-back']."'>\n";
echo " <input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='".$_REQUEST['return_url']."';\" value='".$text['button-back']."'>\n";
echo " <input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
echo "</td>\n";
echo "</tr>\n";

14
app/ring_groups/ring_groups.php
View File

@@ -114,11 +114,10 @@ require_once "resources/paging.php";
echo "<tr>\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 "<th>".$text['label-tools']."</th>";
}
echo th_order_by('ring_group_description', $text['header-description'], $order_by, $order);
echo "<td class='list_control_icons'>";
if (permission_exists('ring_group_add')) {
@@ -142,11 +141,10 @@ require_once "resources/paging.php";
}
echo " </td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_extension']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_context']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_strategy']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_timeout_app']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['ring_group_timeout_data']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".ucwords($row['ring_group_enabled'])."&nbsp;</td>\n";
if (permission_exists('ring_group_forward')) {
echo " <td valign='top' class='".$row_style[$c]." tr_link_void'><a href='".PROJECT_PATH."/app/ring_groups/ring_group_forward_edit.php?id=".$row['ring_group_uuid']."&return_url=".urlencode($_SERVER['PHP_SELF'])."' alt='".$text['link-call-forward']."'>".$text['link-call-forward']."</a></td>\n";
}
echo " <td valign='top' class='row_stylebg'>".$row['ring_group_description']."&nbsp;</td>\n";
echo " <td class='list_control_icons'>";
if (permission_exists('ring_group_edit')) {