Remove ring group call timeout as the per leg timeout makes it redundant

This commit is contained in:
Mark Crane 2014-07-04 04:25:09 +00:00
parent 9fc843babb
commit 6727d0841d
5 changed files with 0 additions and 28 deletions

View File

@ -146,10 +146,6 @@
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the strategy.";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_timeout_sec";
$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the timeout in seconds.";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_timeout_app";
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the timeout destination.";

View File

@ -136,11 +136,6 @@
$text['label-call-forward']['fr-fr'] = "Renvoi d'Appel:";
$text['label-call-forward']['pt-pt'] = "Encaminhar Chamada:";
$text['label-call-timeout']['en-us'] = "Call Timeout";
$text['label-call-timeout']['es-cl'] = "Timout de llamada";
$text['label-call-timeout']['fr-fr'] = "Timeout d'Appel";
$text['label-call-timeout']['pt-pt'] = "Timeout da Chamada";
$text['label-cid-prefix']['en-us'] = "CID Prefix";
$text['label-cid-prefix']['es-cl'] = "Prefijo CID";
$text['label-cid-prefix']['fr-fr'] = "CID Préfixe";

View File

@ -75,7 +75,6 @@ else {
$ring_group_extension = check_str($_POST["ring_group_extension"]);
$ring_group_context = check_str($_POST["ring_group_context"]);
$ring_group_strategy = check_str($_POST["ring_group_strategy"]);
$ring_group_timeout_sec = check_str($_POST["ring_group_timeout_sec"]);
$ring_group_timeout_action = check_str($_POST["ring_group_timeout_action"]);
$ring_group_cid_name_prefix = check_str($_POST["ring_group_cid_name_prefix"]);
$ring_group_ringback = check_str($_POST["ring_group_ringback"]);
@ -143,7 +142,6 @@ else {
if (strlen($ring_group_name) == 0) { $msg .= $text['message-name']."<br>\n"; }
if (strlen($ring_group_extension) == 0) { $msg .= $text['message-extension']."<br>\n"; }
if (strlen($ring_group_strategy) == 0) { $msg .= $text['message-strategy']."<br>\n"; }
if (strlen($ring_group_timeout_sec) == 0) { $msg .= $text['message-strategy']."<br>\n"; }
//if (strlen($ring_group_timeout_app) == 0) { $msg .= $text['message-timeout-action']."<br>\n"; }
//if (strlen($ring_group_cid_name_prefix) == 0) { $msg .= "Please provide: Caller ID Prefix<br>\n"; }
//if (strlen($ring_group_ringback) == 0) { $msg .= "Please provide: Ringback<br>\n"; }
@ -324,7 +322,6 @@ else {
$ring_group_extension = $row["ring_group_extension"];
$ring_group_context = $row["ring_group_context"];
$ring_group_strategy = $row["ring_group_strategy"];
$ring_group_timeout_sec = $row["ring_group_timeout_sec"];
$ring_group_timeout_app = $row["ring_group_timeout_app"];
$ring_group_timeout_data = $row["ring_group_timeout_data"];
$ring_group_cid_name_prefix = $row["ring_group_cid_name_prefix"];
@ -377,7 +374,6 @@ else {
}
//set defaults
if (strlen($ring_group_timeout_sec) == 0) { $ring_group_timeout_sec = '30'; }
if (strlen($ring_group_enabled) == 0) { $ring_group_enabled = 'true'; }
//set the context for users that are not in the superadmin group
@ -568,17 +564,6 @@ else {
echo " </td>";
echo " </tr>";
echo "<tr>\n";
echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-call-timeout'].":\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <input class='formfld' type='text' name='ring_group_timeout_sec' maxlength='255' value='$ring_group_timeout_sec'>\n";
echo " <br />\n";
echo $text['description-timeout']."\n";
echo "</td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-timeout_destination'].":\n";

View File

@ -139,7 +139,6 @@ require_once "resources/paging.php";
echo th_order_by('ring_group_extension', $text['label-ring-group-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_sec', 'Timeout', $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);
@ -154,7 +153,6 @@ require_once "resources/paging.php";
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_sec']."&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]."'>".$row['ring_group_enabled']."&nbsp;</td>\n";

View File

@ -123,7 +123,6 @@ require_once "resources/paging.php";
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_sec', 'Timeout', $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);
@ -150,7 +149,6 @@ require_once "resources/paging.php";
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_sec']."&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";