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

Dialplan Edit: Default details group to 0 if not specified (also fixes Copy feature). Fix details group order by.

Browse Source
This commit is contained in:
Nate Jones
2015-03-19 23:42:25 +00:00
parent e43e7d14a2
commit 70ba072c6f
4 changed files with 62 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dialplan/dialplan_copy.php
+5 -10
View File
@@ -121,7 +121,7 @@ else {
$dialplan_detail_data = $row["dialplan_detail_data"]; $dialplan_detail_data = $row["dialplan_detail_data"];
$dialplan_detail_break = $row["dialplan_detail_break"]; $dialplan_detail_break = $row["dialplan_detail_break"];
$dialplan_detail_inline = $row["dialplan_detail_inline"]; $dialplan_detail_inline = $row["dialplan_detail_inline"];
$dialplan_detail_group = $row["dialplan_detail_group"]; $dialplan_detail_group = ($row["dialplan_detail_group"] != '') ? $row["dialplan_detail_group"] : '0';
//copy the dialplan details //copy the dialplan details
$dialplan_detail_uuid = uuid(); $dialplan_detail_uuid = uuid();
@@ -131,12 +131,12 @@ else {
$sql .= "dialplan_uuid, "; $sql .= "dialplan_uuid, ";
$sql .= "dialplan_detail_uuid, "; $sql .= "dialplan_detail_uuid, ";
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_order, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_break, "; $sql .= "dialplan_detail_break, ";
$sql .= "dialplan_detail_inline, "; $sql .= "dialplan_detail_inline, ";
$sql .= "dialplan_detail_group "; $sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order ";
$sql .= ")"; $sql .= ")";
$sql .= "values "; $sql .= "values ";
$sql .= "("; $sql .= "(";
@@ -144,17 +144,12 @@ else {
$sql .= "'".$dialplan_uuid."', "; $sql .= "'".$dialplan_uuid."', ";
$sql .= "'".$dialplan_detail_uuid."', "; $sql .= "'".$dialplan_detail_uuid."', ";
$sql .= "'".check_str($dialplan_detail_tag)."', "; $sql .= "'".check_str($dialplan_detail_tag)."', ";
$sql .= "'".check_str($dialplan_detail_order)."', ";
$sql .= "'".check_str($dialplan_detail_type)."', "; $sql .= "'".check_str($dialplan_detail_type)."', ";
$sql .= "'".check_str($dialplan_detail_data)."', "; $sql .= "'".check_str($dialplan_detail_data)."', ";
$sql .= "'".$dialplan_detail_break."', "; $sql .= "'".$dialplan_detail_break."', ";
$sql .= "'".$dialplan_detail_inline."', "; $sql .= "'".$dialplan_detail_inline."', ";
if (strlen($dialplan_detail_group) == 0) { $sql .= "'".check_str($dialplan_detail_group)."', ";
$sql .= "'".$dialplan_detail_group."' "; $sql .= "'".check_str($dialplan_detail_order)."' ";
}
else {
$sql .= "'".$dialplan_detail_group."' ";
}
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
unset($sql); unset($sql);
app/dialplan/dialplan_edit.php
+4 -2
View File
@@ -134,9 +134,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$array['dialplan_details'][$x]['dialplan_detail_tag'] = $row["dialplan_detail_tag"]; $array['dialplan_details'][$x]['dialplan_detail_tag'] = $row["dialplan_detail_tag"];
$array['dialplan_details'][$x]['dialplan_detail_type'] = $row["dialplan_detail_type"]; $array['dialplan_details'][$x]['dialplan_detail_type'] = $row["dialplan_detail_type"];
$array['dialplan_details'][$x]['dialplan_detail_data'] = $row["dialplan_detail_data"]; $array['dialplan_details'][$x]['dialplan_detail_data'] = $row["dialplan_detail_data"];
$array['dialplan_details'][$x]['dialplan_detail_break'] = $row["dialplan_detail_break"]; $array['dialplan_details'][$x]['dialplan_detail_break'] = $row["dialplan_detail_break"];
$array['dialplan_details'][$x]['dialplan_detail_inline'] = $row["dialplan_detail_inline"]; $array['dialplan_details'][$x]['dialplan_detail_inline'] = $row["dialplan_detail_inline"];
$array['dialplan_details'][$x]['dialplan_detail_group'] = $row["dialplan_detail_group"]; $array['dialplan_details'][$x]['dialplan_detail_group'] = ($row["dialplan_detail_group"] != '') ? $row["dialplan_detail_group"] : '0';
$array['dialplan_details'][$x]['dialplan_detail_order'] = $row["dialplan_detail_order"]; $array['dialplan_details'][$x]['dialplan_detail_order'] = $row["dialplan_detail_order"];
} }
$x++; $x++;
@@ -270,6 +270,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$details[$group][$x]['dialplan_detail_group'] = $group; $details[$group][$x]['dialplan_detail_group'] = $group;
$details[$group][$x]['dialplan_detail_order'] = $dialplan_detail_order; $details[$group][$x]['dialplan_detail_order'] = $dialplan_detail_order;
} }
//sort the details array by group number
ksort($details);
//show the header //show the header
require_once "resources/header.php"; require_once "resources/header.php";
app/dialplan_inbound/dialplan_inbound_add.php
+36
View File
@@ -194,6 +194,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -204,6 +205,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'condition', "; $sql .= "'condition', ";
$sql .= "'context', "; $sql .= "'context', ";
$sql .= "'public', "; $sql .= "'public', ";
$sql .= "'0', ";
$sql .= "'10' "; $sql .= "'10' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -219,6 +221,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -229,6 +232,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'condition', "; $sql .= "'condition', ";
$sql .= "'$condition_field_1', "; $sql .= "'$condition_field_1', ";
$sql .= "'$condition_expression_1', "; $sql .= "'$condition_expression_1', ";
$sql .= "'0', ";
$sql .= "'20' "; $sql .= "'20' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -245,6 +249,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -255,6 +260,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'condition', "; $sql .= "'condition', ";
$sql .= "'$condition_field_2', "; $sql .= "'$condition_field_2', ";
$sql .= "'$condition_expression_2', "; $sql .= "'$condition_expression_2', ";
$sql .= "'0', ";
$sql .= "'30' "; $sql .= "'30' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -272,6 +278,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -282,6 +289,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'export', "; $sql .= "'export', ";
$sql .= "'alert_info=http://www.notused.com;info=alert-external;x-line-id=0', "; $sql .= "'alert_info=http://www.notused.com;info=alert-external;x-line-id=0', ";
$sql .= "'0', ";
$sql .= "'45' "; $sql .= "'45' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -299,6 +307,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -309,6 +318,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'set', "; $sql .= "'set', ";
$sql .= "'call_direction=inbound', "; $sql .= "'call_direction=inbound', ";
$sql .= "'0', ";
$sql .= "'50' "; $sql .= "'50' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -326,6 +336,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -336,6 +347,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'set', "; $sql .= "'set', ";
$sql .= "'accountcode=$destination_accountcode', "; $sql .= "'accountcode=$destination_accountcode', ";
$sql .= "'0', ";
$sql .= "'55' "; $sql .= "'55' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -353,6 +365,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -363,6 +376,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'set', "; $sql .= "'set', ";
$sql .= "'carrier=$destination_carrier', "; $sql .= "'carrier=$destination_carrier', ";
$sql .= "'0', ";
$sql .= "'60' "; $sql .= "'60' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -380,6 +394,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -390,6 +405,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'limit', "; $sql .= "'limit', ";
$sql .= "'hash \${domain_name} inbound ".$limit." !USER_BUSY', "; $sql .= "'hash \${domain_name} inbound ".$limit." !USER_BUSY', ";
$sql .= "'0', ";
$sql .= "'65' "; $sql .= "'65' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -407,6 +423,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -417,6 +434,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'set', "; $sql .= "'set', ";
$sql .= "'effective_caller_id_number=".$redial_outbound_prefix."\${caller_id_number}', "; $sql .= "'effective_caller_id_number=".$redial_outbound_prefix."\${caller_id_number}', ";
$sql .= "'0', ";
$sql .= "'70' "; $sql .= "'70' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -455,6 +473,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -465,6 +484,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'set', "; $sql .= "'set', ";
$sql .= "'codec_string=PCMU,PCMA', "; $sql .= "'codec_string=PCMU,PCMA', ";
$sql .= "'0', ";
$sql .= "'73' "; $sql .= "'73' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -480,6 +500,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -490,6 +511,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'set', "; $sql .= "'set', ";
$sql .= "'tone_detect_hits=1', "; $sql .= "'tone_detect_hits=1', ";
$sql .= "'0', ";
$sql .= "'75' "; $sql .= "'75' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -505,6 +527,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -515,6 +538,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'set', "; $sql .= "'set', ";
$sql .= "'execute_on_tone_detect=transfer ".$fax_extension." XML ".$_SESSION["context"]."', "; $sql .= "'execute_on_tone_detect=transfer ".$fax_extension." XML ".$_SESSION["context"]."', ";
$sql .= "'0', ";
$sql .= "'80' "; $sql .= "'80' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -530,6 +554,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -540,6 +565,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'tone_detect', "; $sql .= "'tone_detect', ";
$sql .= "'fax 1100 r +5000', "; $sql .= "'fax 1100 r +5000', ";
$sql .= "'0', ";
$sql .= "'85' "; $sql .= "'85' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -555,6 +581,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -565,6 +592,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'sleep', "; $sql .= "'sleep', ";
$sql .= "'3000', "; $sql .= "'3000', ";
$sql .= "'0', ";
$sql .= "'90' "; $sql .= "'90' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -580,6 +608,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -590,6 +619,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'export', "; $sql .= "'export', ";
$sql .= "'codec_string=\${ep_codec_string}', "; $sql .= "'codec_string=\${ep_codec_string}', ";
$sql .= "'0', ";
$sql .= "'93' "; $sql .= "'93' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -612,6 +642,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -622,6 +653,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'answer', "; $sql .= "'answer', ";
$sql .= "'', "; $sql .= "'', ";
$sql .= "'0', ";
$sql .= "'95' "; $sql .= "'95' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -639,6 +671,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -649,6 +682,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'$action_application_1', "; $sql .= "'$action_application_1', ";
$sql .= "'$action_data_1', "; $sql .= "'$action_data_1', ";
$sql .= "'0', ";
$sql .= "'100' "; $sql .= "'100' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
@@ -665,6 +699,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_detail_tag, "; $sql .= "dialplan_detail_tag, ";
$sql .= "dialplan_detail_type, "; $sql .= "dialplan_detail_type, ";
$sql .= "dialplan_detail_data, "; $sql .= "dialplan_detail_data, ";
$sql .= "dialplan_detail_group, ";
$sql .= "dialplan_detail_order "; $sql .= "dialplan_detail_order ";
$sql .= ") "; $sql .= ") ";
$sql .= "values "; $sql .= "values ";
@@ -675,6 +710,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'action', "; $sql .= "'action', ";
$sql .= "'$action_application_2', "; $sql .= "'$action_application_2', ";
$sql .= "'$action_data_2', "; $sql .= "'$action_data_2', ";
$sql .= "'0', ";
$sql .= "'105' "; $sql .= "'105' ";
$sql .= ")"; $sql .= ")";
$db->exec(check_sql($sql)); $db->exec(check_sql($sql));
app/dialplan_outbound/dialplan_outbound_add.php
+17 -17
View File
@@ -376,7 +376,7 @@ else {
$dialplan_detail_type = 'destination_number'; $dialplan_detail_type = 'destination_number';
$dialplan_detail_data = $dialplan_expression; $dialplan_detail_data = $dialplan_expression;
$dialplan_detail_order = '005'; $dialplan_detail_order = '005';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
if ($gateway_type != "transfer") { if ($gateway_type != "transfer") {
@@ -385,7 +385,7 @@ else {
$dialplan_detail_type = 'set'; $dialplan_detail_type = 'set';
$dialplan_detail_data = 'sip_h_X-accountcode='.$accountcode; $dialplan_detail_data = 'sip_h_X-accountcode='.$accountcode;
$dialplan_detail_order = '010'; $dialplan_detail_order = '010';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
} }
else { else {
@@ -393,7 +393,7 @@ else {
$dialplan_detail_type = 'set'; $dialplan_detail_type = 'set';
$dialplan_detail_data = 'sip_h_X-accountcode=${accountcode}'; $dialplan_detail_data = 'sip_h_X-accountcode=${accountcode}';
$dialplan_detail_order = '010'; $dialplan_detail_order = '010';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
} }
@@ -401,7 +401,7 @@ else {
$dialplan_detail_type = 'set'; $dialplan_detail_type = 'set';
$dialplan_detail_data = 'sip_h_X-Tag='; $dialplan_detail_data = 'sip_h_X-Tag=';
$dialplan_detail_order = '015'; $dialplan_detail_order = '015';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
} }
@@ -409,7 +409,7 @@ else {
$dialplan_detail_type = 'set'; $dialplan_detail_type = 'set';
$dialplan_detail_data = 'call_direction=outbound'; $dialplan_detail_data = 'call_direction=outbound';
$dialplan_detail_order = '020'; $dialplan_detail_order = '020';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
if ($gateway_type != "transfer") { if ($gateway_type != "transfer") {
@@ -417,14 +417,14 @@ else {
$dialplan_detail_type = 'set'; $dialplan_detail_type = 'set';
$dialplan_detail_data = 'hangup_after_bridge=true'; $dialplan_detail_data = 'hangup_after_bridge=true';
$dialplan_detail_order = '025'; $dialplan_detail_order = '025';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
$dialplan_detail_tag = 'action'; //condition, action, antiaction $dialplan_detail_tag = 'action'; //condition, action, antiaction
$dialplan_detail_type = 'set'; $dialplan_detail_type = 'set';
$dialplan_detail_data = 'effective_caller_id_name=${outbound_caller_id_name}'; $dialplan_detail_data = 'effective_caller_id_name=${outbound_caller_id_name}';
$dialplan_detail_order = '030'; $dialplan_detail_order = '030';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
$dialplan_detail_tag = 'action'; //condition, action, antiaction $dialplan_detail_tag = 'action'; //condition, action, antiaction
@@ -436,21 +436,21 @@ else {
$dialplan_detail_data = 'effective_caller_id_number=${outbound_caller_id_number}'; $dialplan_detail_data = 'effective_caller_id_number=${outbound_caller_id_number}';
} }
$dialplan_detail_order = '035'; $dialplan_detail_order = '035';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
$dialplan_detail_tag = 'action'; //condition, action, antiaction $dialplan_detail_tag = 'action'; //condition, action, antiaction
$dialplan_detail_type = 'set'; $dialplan_detail_type = 'set';
$dialplan_detail_data = 'inherit_codec=true'; $dialplan_detail_data = 'inherit_codec=true';
$dialplan_detail_order = '040'; $dialplan_detail_order = '040';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
$dialplan_detail_tag = 'action'; //condition, action, antiaction $dialplan_detail_tag = 'action'; //condition, action, antiaction
$dialplan_detail_type = 'set'; $dialplan_detail_type = 'set';
$dialplan_detail_data = 'continue_on_fail=true'; $dialplan_detail_data = 'continue_on_fail=true';
$dialplan_detail_order = '045'; $dialplan_detail_order = '045';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
} }
@@ -459,7 +459,7 @@ else {
$dialplan_detail_type = 'enum'; $dialplan_detail_type = 'enum';
$dialplan_detail_data = $prefix_number."$1 e164.org"; $dialplan_detail_data = $prefix_number."$1 e164.org";
$dialplan_detail_order = '050'; $dialplan_detail_order = '050';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
} }
@@ -468,7 +468,7 @@ else {
$dialplan_detail_type = 'limit'; $dialplan_detail_type = 'limit';
$dialplan_detail_data = "hash \${domain_name} outbound ".$limit." !USER_BUSY"; $dialplan_detail_data = "hash \${domain_name} outbound ".$limit." !USER_BUSY";
$dialplan_detail_order = '055'; $dialplan_detail_order = '055';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
} }
@@ -477,7 +477,7 @@ else {
$dialplan_detail_type = 'set'; $dialplan_detail_type = 'set';
$dialplan_detail_data = 'outbound_prefix='.$outbound_prefix; $dialplan_detail_data = 'outbound_prefix='.$outbound_prefix;
$dialplan_detail_order = '060'; $dialplan_detail_order = '060';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
$dialplan_detail_break = ''; $dialplan_detail_break = '';
$dialplan_detail_inline = 'true'; $dialplan_detail_inline = 'true';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data, $dialplan_detail_break, $dialplan_detail_inline); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data, $dialplan_detail_break, $dialplan_detail_inline);
@@ -488,7 +488,7 @@ else {
$dialplan_detail_type = 'lua'; $dialplan_detail_type = 'lua';
$dialplan_detail_data = 'app.lua toll_allow ${uuid}'; $dialplan_detail_data = 'app.lua toll_allow ${uuid}';
$dialplan_detail_order = '065'; $dialplan_detail_order = '065';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
$dialplan_detail_break = ''; $dialplan_detail_break = '';
$dialplan_detail_inline = 'true'; $dialplan_detail_inline = 'true';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data, $dialplan_detail_break, $dialplan_detail_inline); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data, $dialplan_detail_break, $dialplan_detail_inline);
@@ -498,7 +498,7 @@ else {
$dialplan_detail_type = 'bridge'; $dialplan_detail_type = 'bridge';
$dialplan_detail_data = $action_data; $dialplan_detail_data = $action_data;
$dialplan_detail_order = '070'; $dialplan_detail_order = '070';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
if (strlen($bridge_2_data) > 0) { if (strlen($bridge_2_data) > 0) {
@@ -506,7 +506,7 @@ else {
$dialplan_detail_type = 'bridge'; $dialplan_detail_type = 'bridge';
$dialplan_detail_data = $bridge_2_data; $dialplan_detail_data = $bridge_2_data;
$dialplan_detail_order = '075'; $dialplan_detail_order = '075';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
} }
@@ -515,7 +515,7 @@ else {
$dialplan_detail_type = 'bridge'; $dialplan_detail_type = 'bridge';
$dialplan_detail_data = $bridge_3_data; $dialplan_detail_data = $bridge_3_data;
$dialplan_detail_order = '080'; $dialplan_detail_order = '080';
$dialplan_detail_group = ''; $dialplan_detail_group = '0';
dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data); dialplan_detail_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_detail_tag, $dialplan_detail_order, $dialplan_detail_group, $dialplan_detail_type, $dialplan_detail_data);
} }