diff --git a/app/call_flows/app_config.php b/app/call_flows/app_config.php index c3947f30e9..518ea909ea 100644 --- a/app/call_flows/app_config.php +++ b/app/call_flows/app_config.php @@ -82,21 +82,29 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Select the status.'; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_flow_app'; - $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the application.'; - $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_flow_pin_number'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the PIN number.'; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_flow_label'; + $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the label.'; + $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_flow_app'; + $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the application.'; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_flow_data'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the application data.'; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_flow_anti_label'; + $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the alternate label.'; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_flow_anti_app'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the alternate application'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the alternate application.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'call_flow_anti_data'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php index 72e486a408..aed55961e8 100644 --- a/app/call_flows/call_flow_edit.php +++ b/app/call_flows/call_flow_edit.php @@ -52,7 +52,9 @@ else { $call_flow_context = check_str($_POST["call_flow_context"]); $call_flow_status = check_str($_POST["call_flow_status"]); $call_flow_pin_number = check_str($_POST["call_flow_pin_number"]); + $call_flow_label = check_str($_POST["call_flow_label"]); $call_flow_destination = check_str($_POST["call_flow_destination"]); + $call_flow_anti_label = check_str($_POST["call_flow_anti_label"]); $call_flow_alternate_destination = check_str($_POST["call_flow_alternate_destination"]); $call_flow_description = check_str($_POST["call_flow_description"]); $dialplan_uuid = check_str($_POST["dialplan_uuid"]); @@ -92,9 +94,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //if (strlen($call_flow_feature_code) == 0) { $msg .= "Please provide: Feature Code
\n"; } if (strlen($call_flow_context) == 0) { $msg .= "Please provide: Context
\n"; } //if (strlen($call_flow_status) == 0) { $msg .= "Please provide: Status
\n"; } - //if (strlen($call_flow_app) == 0) { $msg .= "Please provide: Application
\n"; } //if (strlen($call_flow_pin_number) == 0) { $msg .= "Please provide: PIN Number
\n"; } + //if (strlen($call_flow_status) == 0) { $msg .= "Please provide: Status
\n"; } + //if (strlen($call_flow_label) == 0) { $msg .= "Please provide: Destination Label
\n"; } + //if (strlen($call_flow_app) == 0) { $msg .= "Please provide: Application
\n"; } //if (strlen($call_flow_data) == 0) { $msg .= "Please provide: Application Data
\n"; } + //if (strlen($call_flow_anti_label) == 0) { $msg .= "Please provide: Alternate Destination Label
\n"; } //if (strlen($call_flow_anti_app) == 0) { $msg .= "Please provide: Alternate Application
\n"; } //if (strlen($call_flow_anti_data) == 0) { $msg .= "Please provide: Application Data
\n"; } //if (strlen($call_flow_description) == 0) { $msg .= "Please provide: Description
\n"; } @@ -128,9 +133,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "call_flow_feature_code, "; $sql .= "call_flow_context, "; $sql .= "call_flow_status, "; - $sql .= "call_flow_app, "; $sql .= "call_flow_pin_number, "; + $sql .= "call_flow_label, "; + $sql .= "call_flow_app, "; $sql .= "call_flow_data, "; + $sql .= "call_flow_anti_label, "; $sql .= "call_flow_anti_app, "; $sql .= "call_flow_anti_data, "; $sql .= "call_flow_description "; @@ -145,9 +152,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$call_flow_feature_code', "; $sql .= "'$call_flow_context', "; $sql .= "'$call_flow_status', "; - $sql .= "'$call_flow_app', "; $sql .= "'$call_flow_pin_number', "; + $sql .= "'$call_flow_label', "; + $sql .= "'$call_flow_app', "; $sql .= "'$call_flow_data', "; + $sql .= "'$call_flow_anti_label', "; $sql .= "'$call_flow_anti_app', "; $sql .= "'$call_flow_anti_data', "; $sql .= "'$call_flow_description' "; @@ -170,8 +179,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "call_flow_context = '$call_flow_context', "; $sql .= "call_flow_status = '$call_flow_status', "; $sql .= "call_flow_pin_number = '$call_flow_pin_number', "; + $sql .= "call_flow_label = '$call_flow_label', "; $sql .= "call_flow_app = '$call_flow_app', "; $sql .= "call_flow_data = '$call_flow_data', "; + $sql .= "call_flow_anti_label = '$call_flow_anti_label', "; $sql .= "call_flow_anti_app = '$call_flow_anti_app', "; $sql .= "call_flow_anti_data = '$call_flow_anti_data', "; $sql .= "call_flow_description = '$call_flow_description' "; @@ -210,7 +221,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $dialplan->dialplan_uuid = $dialplan_uuid; $dialplan->dialplan_detail_tag = 'condition'; //condition, action, antiaction $dialplan->dialplan_detail_type = 'destination_number'; - $dialplan->dialplan_detail_data = '^'.$call_flow_feature_code.'$'; + $dialplan->dialplan_detail_data = '^'.str_replace('*', '\*', $call_flow_feature_code).'$'; $dialplan->dialplan_detail_break = 'on-true'; //$dialplan->dialplan_detail_inline = ''; $dialplan->dialplan_detail_group = '1'; @@ -359,9 +370,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $call_flow_feature_code = $row["call_flow_feature_code"]; $call_flow_context = $row["call_flow_context"]; $call_flow_status = $row["call_flow_status"]; + $call_flow_label = $row["call_flow_label"]; $call_flow_app = $row["call_flow_app"]; $call_flow_pin_number = $row["call_flow_pin_number"]; $call_flow_data = $row["call_flow_data"]; + $call_flow_anti_label = $row["call_flow_anti_label"]; $call_flow_anti_app = $row["call_flow_anti_app"]; $call_flow_anti_data = $row["call_flow_anti_data"]; $call_flow_description = $row["call_flow_description"]; @@ -494,6 +507,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " Destination Label:\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo "Enter the destination label\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " Destination:\n"; @@ -513,6 +537,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " Alternate Label:\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo "Enter the alternate destination label\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " Alternate Destination:\n";