dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove switch_select_destination function from the remaining features that used it and replace with the destination php class.

Browse Source
This commit is contained in:
markjcrane
2015-08-07 15:06:07 -05:00
parent 3839f2d337
commit d2147cb133
9 changed files with 18 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/call_centers/call_center_agent_edit.php
+4 -4
View File
@@ -300,6 +300,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
} //if ($_POST["persistformvar"] != "true")
} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
//initialize the destinations object
$destination = new destinations;
//pre-populate the form
if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
$call_center_agent_uuid = $_GET["id"];
@@ -475,10 +478,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo " ".$text['label-contact']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
//switch_select_destination(select_type, select_label, select_name, select_value, select_style, action);
switch_select_destination("call_center_contact", "", "agent_contact", $agent_contact, "width: 350px;", "");
echo $destination->select('call_center_contact', 'agent_contact', $agent_contact);
echo "<br />\n";
echo $text['description-contact']."\n";
echo "</td>\n";
app/call_centers/call_center_queue_edit.php
+4 -2
View File
@@ -402,6 +402,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
} //if ($_POST["persistformvar"] != "true")
} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
//initialize the destinations object
$destination = new destinations;
//pre-populate the form
if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
$call_center_queue_uuid = $_GET["id"];
@@ -815,8 +818,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo " ".$text['label-timeout_action']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
//switch_select_destination(select_type, select_label, select_name, select_value, select_style, action);
switch_select_destination("dialplan", "", "queue_timeout_action", $queue_timeout_action, "", "");
echo $destination->select('dialplan', 'queue_timeout_action', $queue_timeout_action);
echo "<br />\n";
echo $text['description-timeout_action']."\n";
echo "</td>\n";
app/call_flows/call_flow_edit.php
-2
View File
@@ -556,8 +556,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$select_value = $call_flow_app.':'.$call_flow_data;
}
//show the destination list
//switch_select_destination($select_type, $select_label, $select_name, $select_value, $select_style, $action='')
//switch_select_destination("dialplan", $destination_label, "call_flow_destination", $select_value, "", $call_flow_data);
echo $destination->select('dialplan', 'call_flow_destination', $select_value);
unset($select_value);
echo "<br />\n";
app/dialplan/dialplan_add.php
+5 -8
View File
@@ -259,6 +259,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
return;
} //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
//initialize the destinations object
$destination = new destinations;
?><script type="text/javascript">
<!--
function type_onchange(dialplan_detail_type) {
@@ -530,10 +533,7 @@ echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
echo " ".$text['label-action_1']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
//switch_select_destination(select_type, select_label, select_name, select_value, select_style, action);
switch_select_destination("dialplan", "", "action_1", $action_1, "", "");
echo $destination->select('dialplan', 'action_1', $action_1);
echo "</td>\n";
echo "</tr>\n";
@@ -545,10 +545,7 @@ echo "<td class='vncell' valign='top' align='left' nowrap>\n";
echo " ".$text['label-action_2']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
//switch_select_destination(select_type, select_label, select_name, select_value, select_style, action);
switch_select_destination("dialplan", "", "action_2", $action_2, "", "");
echo $destination->select('dialplan', 'action_2', $action_2);
echo "</td>\n";
echo "</tr>\n";
app/dialplan_inbound/dialplan_inbound_add.php
+5 -8
View File
@@ -743,6 +743,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
return;
} //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
//initialize the destinations object
$destination = new destinations;
?>
<script type="text/javascript">
@@ -1018,10 +1021,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
}
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
//switch_select_destination(select_type, select_label, select_name, select_value, select_style, action);
switch_select_destination("dialplan", "", "action_1", $action_1, "", "");
echo $destination->select('dialplan', 'action_1', $action_1);
echo "</td>\n";
echo "</tr>\n";
@@ -1034,10 +1034,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo " ".$text['label-action_2']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
//switch_select_destination(select_type, select_label, select_name, select_value, select_style, action);
switch_select_destination("dialplan", "", "action_2", $action_2, "", "");
echo $destination->select('dialplan', 'action_2', $action_2);
echo "</td>\n";
echo "</tr>\n";
}
app/ring_groups/ring_group_edit.php
-1
View File
@@ -592,7 +592,6 @@ else {
echo " ".$text['label-timeout_destination']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
//switch_select_destination("dialplan", "", "ring_group_timeout_action", $ring_group_timeout_action, "", "");
echo $destination->select('dialplan', 'ring_group_timeout_action', $ring_group_timeout_action);
echo " <br />\n";
echo " ".$text['description-timeout_destination']."\n";
app/voicemails/voicemail_edit.php
-1
View File
@@ -398,7 +398,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <input class='formfld' style='width:70px' type='text' name='voicemail_options[".$c."][voicemail_option_digits]' maxlength='255' value='".$voicemail_option_digits."'>\n";
echo "</td>\n";
echo "<td class='vtable' align='left' nowrap='nowrap'>\n";
//switch_select_destination("ivr", $voicemail_options_label, 'voicemail_options['.$c.'][voicemail_option_param]', $tmp_select_value, "width:175px", $voicemail_option_action);
echo $destination->select('ivr', 'voicemail_options['.$c.'][voicemail_option_param]', '');
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
app/voicemails/voicemail_option_edit.php
-1
View File
@@ -187,7 +187,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
if (strlen($voicemail_option_action.$voicemail_option_param) > 0) {
$tmp_select_value = $voicemail_option_action.':'.$voicemail_option_param;
}
//switch_select_destination("ivr", $voicemail_options_label, "voicemail_option_param", $tmp_select_value, "width: 350px;", $voicemail_option_action);
echo $destination->select('ivr', 'voicemail_option_param', $tmp_select_value);
unset($tmp_select_value);