Call Flows allow feature code and alternate destination to be optional. If feature code is empty and pin number is provided then require the pin number.

app/call_flows/app_config.php

@@ -50,7 +50,7 @@
 		$apps[$x]['destinations'][$y]['label'] = "call_flows";
 		$apps[$x]['destinations'][$y]['name'] = "call_flows";
 		$apps[$x]['destinations'][$y]['sql'] = "select call_flow_name as name, call_flow_uuid, call_flow_uuid as uuid, call_flow_extension as extension, call_flow_feature_code as destination, call_flow_context as context from v_call_flows ";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and call_flow_enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and call_flow_feature_code is not null and call_flow_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "natural_sort(call_flow_feature_code) asc";
 		$apps[$x]['destinations'][$y]['field']['uuid'] = "uuid";
 		$apps[$x]['destinations'][$y]['field']['name'] = "name";

app/call_flows/call_flow_edit.php

@@ -121,7 +121,7 @@
 			//if (empty($dialplan_uuid)) { $msg .= $text['message-required']." ".$text['label-dialplan_uuid']."<br>\n"; }
 			//if (empty($call_flow_name)) { $msg .= $text['message-required']." ".$text['label-call_flow_name']."<br>\n"; }
 			if (empty($call_flow_extension)) { $msg .= $text['message-required']." ".$text['label-call_flow_extension']."<br>\n"; }
-			if (empty($call_flow_feature_code)) { $msg .= $text['message-required']." ".$text['label-call_flow_feature_code']."<br>\n"; }
+			//if (empty($call_flow_feature_code)) { $msg .= $text['message-required']." ".$text['label-call_flow_feature_code']."<br>\n"; }
 			//if (empty($call_flow_context)) { $msg .= $text['message-required']." ".$text['label-call_flow_context']."<br>\n"; }
 			//if (empty($call_flow_status)) { $msg .= $text['message-required']." ".$text['label-call_flow_status']."<br>\n"; }
 			//if (empty($call_flow_pin_number)) { $msg .= $text['message-required']." ".$text['label-call_flow_pin_number']."<br>\n"; }
@@ -181,6 +181,7 @@
 
 		//build the xml dialplan
 			$dialplan_xml = "<extension name=\"".xml::sanitize($call_flow_name)."\" continue=\"\" uuid=\"".xml::sanitize($dialplan_uuid)."\">\n";
+			if (!empty($call_flow_feature_code)) {
 				$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".xml::sanitize($destination_feature)."$\" break=\"on-true\">\n";
 				$dialplan_xml .= "		<action application=\"answer\" data=\"\"/>\n";
 				$dialplan_xml .= "		<action application=\"sleep\" data=\"200\"/>\n";
@@ -188,6 +189,7 @@
 				$dialplan_xml .= "		<action application=\"set\" data=\"call_flow_uuid=".xml::sanitize($call_flow_uuid)."\"/>\n";
 				$dialplan_xml .= "		<action application=\"lua\" data=\"call_flow.lua\"/>\n";
 				$dialplan_xml .= "	</condition>\n";
+			}
 			$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".xml::sanitize($destination_extension)."$\">\n";
 			$dialplan_xml .= "		<action application=\"set\" data=\"call_flow_uuid=".xml::sanitize($call_flow_uuid)."\"/>\n";
 			$dialplan_xml .= "		<action application=\"lua\" data=\"call_flow.lua\"/>\n";
@@ -254,6 +256,7 @@
 			$p->delete("dialplan_edit", "temp");
 
 		// Update subscribed endpoints
+		if (!empty($call_flow_feature_code)) {
 			$fp = event_socket_create();
 			if ($fp) {
 				//send the event
@@ -271,11 +274,9 @@
 				} else {
 					$event .= "answer-state: terminated\n";
 				}
-
 				event_socket_request($fp, $event);
-				//echo $event."<br />";
 				fclose($fp);
-
+			}
 		}
 
 		//debug info
@@ -558,7 +559,7 @@
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-call_flow_feature_code']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
@@ -695,7 +696,7 @@
 	*/
 
 	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-call_flow_alternate_destination']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";

app/switch/resources/scripts/call_flow.lua

@@ -25,48 +25,48 @@
 --	POSSIBILITY OF SUCH DAMAGE.
 
 --set the variables
-	max_tries = "3";
+max_tries = "3";
-	digit_timeout = "5000";
+digit_timeout = "5000";
 
 --include config.lua
-	require "resources.functions.config";
+require "resources.functions.config";
 
 --create logger object
-	log = require "resources.functions.log".call_flow
+log = require "resources.functions.log".call_flow
 
 --additional includes
-	local presence_in = require "resources.functions.presence_in"
+local presence_in = require "resources.functions.presence_in"
-	local Database    = require "resources.functions.database"
+local Database    = require "resources.functions.database"
-	local play_file   = require "resources.functions.play_file"
+local play_file   = require "resources.functions.play_file"
 
 --include json library
-	local json
+local json
-	if (debug["sql"]) then
+if (debug["sql"]) then
 	json = require "resources.functions.lunajson"
-	end
+end
 
 --connect to the database
-	local dbh = Database.new('system');
+local dbh = Database.new('system');
 
 --get the variables
-	if not session:ready() then return end
+if not session:ready() then return end
 
-	local domain_name = session:getVariable("domain_name");
+local domain_name = session:getVariable("domain_name");
-	local domain_uuid = session:getVariable("domain_uuid");
+local domain_uuid = session:getVariable("domain_uuid");
-	local call_flow_uuid = session:getVariable("call_flow_uuid");
+local call_flow_uuid = session:getVariable("call_flow_uuid");
-	local feature_code = session:getVariable("feature_code");
+local feature_code = session:getVariable("feature_code");
 
-	if not call_flow_uuid then
+if not call_flow_uuid then
 	log.warning('Can not get call flow uuid')
 	return
-	end
+end
 
 --get the call flow details
-	local sql = "SELECT * FROM v_call_flows where call_flow_uuid = :call_flow_uuid"
+local sql = "SELECT * FROM v_call_flows where call_flow_uuid = :call_flow_uuid"
 	-- .. "and call_flow_enabled = 'true'"
-	local params = {call_flow_uuid = call_flow_uuid};
+local params = {call_flow_uuid = call_flow_uuid};
-	--log.notice("SQL: %s", sql);
+--log.notice("SQL: %s", sql);
-	dbh:query(sql, params, function(row)
+dbh:query(sql, params, function(row)
 	call_flow_name = row.call_flow_name;
 	call_flow_extension = row.call_flow_extension;
 	call_flow_feature_code = row.call_flow_feature_code;
@@ -83,29 +83,58 @@
 	end
 	if call_flow_status == "true" then
 		app = row.call_flow_app;
-			data = row.call_flow_data
+		data = row.call_flow_data;
 	else
 		app = row.call_flow_alternate_app;
-			data = row.call_flow_alternate_data
+		data = row.call_flow_alternate_data;
 	end
-	end);
+end);
 
---if feature code toggle the status or send to the destination
+--check to see if the pin number should be required
-	if (feature_code == "true") then
+pin_required = false;
-		--if the pin number is provided then require it
+if (feature_code == "true" and #pin_number > 0) then
+	pin_required = true;
+end
+if (#call_flow_feature_code == 0 and #pin_number > 0) then
+	pin_required = true;
+end
+
+--define the check pin number function
+function validate_pin_number(pin_number)
 	if (session:ready()) then
-				if #pin_number > 0 then
+		if (#pin_number > 0) then
+			max_tries = 3;
 			local min_digits = #pin_number;
 			local max_digits = #pin_number+1;
 			session:answer();
 			local digits = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", "phrase:voicemail_enter_pass:#", "", "\\d+");
-					if digits ~= pin_number then
+			if (digits == pin_number) then
+				return true;
+			else
+				return false;
+			end
+		end
+	end
+end
+
+--request the pin number
+if (pin_required) then
+	valid = validate_pin_number(pin_number);
+	if (not valid) then
+		valid = validate_pin_number(pin_number);
+	end
+	if (not valid) then
+		valid = validate_pin_number(pin_number);
+	end
+	if (not valid) then
 		session:streamFile("phrase:voicemail_fail_auth:#");
 		session:hangup("NORMAL_CLEARING");
 		return;
 	end
-				end
+end
-			end
+
+--if feature code toggle the status or send to the destination
+if (feature_code == "true") then
 
 	--feature code - toggle the status
 		local toggle = (call_flow_status == "true") and "false" or "true"
@@ -166,7 +195,7 @@
 		if (session:ready()) then
 			session:hangup();
 		end
-	else
+else
 	--send to the log
 		log.notice("execute " .. app .. " " .. data);
 
@@ -179,4 +208,4 @@
 		--if (not session:answered()) then
 		--	session:execute(ring_group_timeout_app, ring_group_timeout_data);
 		--end
-	end
+end