Merge branch 'master' into intercept_load_balance

# Conflicts:
#	resources/install/scripts/resources/functions/database.lua

resources/functions.php

@@ -27,7 +27,7 @@
 
 	if (!function_exists('software_version')) {
 		function software_version() {
-			return '4.0.0';
+			return '4.0.1';
 		}
 	}
 
@@ -1326,4 +1326,4 @@ function number_pad($number,$n) {
 	   }
 }
 
-?>
+?>

resources/install/scripts/app/call_block/index.lua

@@ -112,6 +112,7 @@ This method causes the script to get its manadatory arguments directly from the
 		--set the cache
 			if (found_cid_num) then	-- caller id exists
 				if (found_enabled == "true") then
+					--set the cache
 					cache = "found_cid_num=" .. found_cid_num .. "&found_uuid=" .. found_uuid .. "&found_enabled=" .. found_enabled .. "&found_action=" .. found_action .. "&found_count=" .. found_count;
 					result = trim(api:execute("memcache", "set app:call_block:" .. params["domain_name"] .. ":" .. params["cid_num"] .. " '"..cache.."' "..expire["call_block"]));
 
@@ -172,15 +173,16 @@ This method causes the script to get its manadatory arguments directly from the
 			if (source == "database") then
 				dbh:query("UPDATE v_call_block SET call_block_count = " .. found_count + 1 .. " WHERE call_block_uuid = '" .. found_uuid .. "'")
 			end
-			session:setVariable("call_block", "block")
+			session:execute("set", "call_blocked=true");
 			logger("W", "NOTICE", "number " .. params["cid_num"] .. " blocked with " .. found_count .. " previous hits, domain_name: " .. params["domain_name"])
 			if (found_action == "Reject") then
 				session:hangup("CALL_REJECTED")
-			end
-			if (found_action == "Busy") then
+			elseif (found_action == "Busy") then
 				session:hangup("USER_BUSY")
-			end
-			if (details[0] =="Voicemail") then
+			elseif (found_action =="Hold") then
+				session:setAutoHangup(false)
+				session:execute("transfer", "*9664")
+			elseif (details[0] =="Voicemail") then
 				session:setAutoHangup(false)
 				session:execute("transfer", "*99" .. details[2] .. " XML  " .. details[1])
 			end

resources/install/scripts/app/conference_center/index.lua

@@ -13,7 +13,7 @@
 --	notice, this list of conditions and the following disclaimer in the
 --	documentation and/or other materials provided with the distribution.
 --
---	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+--	THIS SOFTWARE IS PROVIDED AS ''IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 --	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 --	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
 --	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
@@ -385,7 +385,7 @@
 			end
 
 		--check if someone has already joined the conference
-			local_hostname = trim(api:execute("hostname", ""));
+			local_hostname = trim(api:execute("switchname", ""));
 			freeswitch.consoleLog("notice", "[conference center] local_hostname is " .. local_hostname .. "\n");
 			sql = "SELECT hostname FROM channels WHERE application = 'conference' AND dest = '" .. destination_number .. "' AND cid_num <> '".. caller_id_number .."' LIMIT 1";
 			if (debug["sql"]) then

resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua

@@ -22,6 +22,9 @@
 --	Contributor(s):
 --		Mark J. Crane
 
+--set the debug options
+	debug["sql"] = false;
+
 --create the api object
 	api = freeswitch.API();
 

resources/install/scripts/app/ring_groups/index.lua

@@ -12,7 +12,7 @@
 --	   notice, this list of conditions and the following disclaimer in the
 --	   documentation and/or other materials provided with the distribution.
 --
---	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+--	THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 --	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 --	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
 --	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
@@ -38,6 +38,7 @@ local log = require "resources.functions.log".ring_group
 	require "resources.functions.explode";
 	require "resources.functions.base64";
 	require "resources.functions.file_exists";
+	require "resources.functions.explode";
 
 --get the variables
 	domain_name = session:getVariable("domain_name");
@@ -101,6 +102,7 @@ local log = require "resources.functions.log".ring_group
 	status = dbh:query(sql, function(row)
 		domain_uuid = row["domain_uuid"];
 		ring_group_name = row["ring_group_name"];
+		ring_group_extension = row["ring_group_extension"];
 		ring_group_forward_enabled = row["ring_group_forward_enabled"];
 		ring_group_forward_destination = row["ring_group_forward_destination"];
 		ring_group_cid_name_prefix = row["ring_group_cid_name_prefix"];
@@ -152,6 +154,9 @@ local log = require "resources.functions.log".ring_group
 					subject = subject:gsub("${caller_id_name}", caller_id_name);
 					subject = subject:gsub("${caller_id_number}", caller_id_number);
 					subject = subject:gsub("${ring_group_name}", ring_group_name);
+					subject = subject:gsub("${ring_group_extension}", ring_group_extension);
+					subject = subject:gsub("${sip_to_user}", ring_group_name);
+					subject = subject:gsub("${dialed_user}", ring_group_extension);
 					subject = trim(subject);
 					subject = '=?utf-8?B?'..base64.encode(subject)..'?=';
 
@@ -162,6 +167,9 @@ local log = require "resources.functions.log".ring_group
 					body = body:gsub("${caller_id_name}", caller_id_name);
 					body = body:gsub("${caller_id_number}", caller_id_number);
 					body = body:gsub("${ring_group_name}", ring_group_name);
+					body = body:gsub("${ring_group_extension}", ring_group_extension);
+					body = body:gsub("${sip_to_user}", ring_group_name);
+					body = body:gsub("${dialed_user}", ring_group_extension);
 					body = body:gsub(" ", " ");
 					body = body:gsub("%s+", "");
 					body = body:gsub(" ", " ");
@@ -436,12 +444,23 @@ local log = require "resources.functions.log".ring_group
 								cmd = "show channels like "..destination_number;
 								reply = trim(api:executeString(cmd));
 								--freeswitch.consoleLog("notice", "[ring group] reply "..cmd.." " .. reply .. "\n");
+								exploded_reply = {};
+								exploded_reply = explode(",",reply);
+
 								if (reply == "0 total.") then
 									dial_string = dial_string_to_user
 								else
-									if (string.find(reply, domain_name)) then
-										--active call
-									else
+									idle_extension=true;
+
+									if (exploded_reply ~= nil) then
+										for i,v in ipairs(exploded_reply) do											
+											if(v==destination_number.."@"..domain_name) then
+												idle_extension=false;
+											end
+										end
+									end
+
+									if(idle_extension) then
 										dial_string = dial_string_to_user;
 									end
 								end
@@ -619,36 +638,27 @@ local log = require "resources.functions.log".ring_group
 								app_data = app_data:gsub("%]", "}");
 							end
 							freeswitch.consoleLog("NOTICE", "[ring group] app_data: "..app_data.."\n");
+							-- log.noticef("bridge begin: originate_disposition:%s answered:%s ready:%s bridged:%s", session:getVariable("originate_disposition"), session:answered() and "true" or "false", session:ready() and "true" or "false", session:bridged() and "true" or "false")
 							session:execute("bridge", app_data);
 							-- log.noticef("bridge done: originate_disposition:%s answered:%s ready:%s bridged:%s", session:getVariable("originate_disposition"), session:answered() and "true" or "false", session:ready() and "true" or "false", session:bridged() and "true" or "false")
 						end
 
 					--timeout destination
 						if (app_data ~= nil) then
-							if ring_group_strategy == "enterprise"
-								and ( true
-									--- I see 2 errors here `failure` and `PICKED_OFF` 
-									--- but they be more. I think check `answered` is enough.
-									-- or session:getVariable("originate_disposition") == "failure"
-									-- or session:getVariable("originate_disposition") == "PICKED_OFF"
-								)
-								and session:answered() then
-									-- for enterprise calls when intercept we get "failure" but session answered
-									return
-							end
-
-							if (session:getVariable("originate_disposition") == "ALLOTTED_TIMEOUT" 
+							if session:ready() and (
+								session:getVariable("originate_disposition")  == "ALLOTTED_TIMEOUT" 
 								or session:getVariable("originate_disposition") == "NO_ANSWER" 
 								or session:getVariable("originate_disposition") == "NO_USER_RESPONSE" 
 								or session:getVariable("originate_disposition") == "USER_NOT_REGISTERED" 
 								or session:getVariable("originate_disposition") == "NORMAL_TEMPORARY_FAILURE" 
 								or session:getVariable("originate_disposition") == "NO_ROUTE_DESTINATION" 
 								or session:getVariable("originate_disposition") == "USER_BUSY"
-								or session:getVariable("originate_disposition") == "failure") then
-									--send missed call notification
-										missed();
-									--execute the time out action
-										session:execute(ring_group_timeout_app, ring_group_timeout_data);
+								or session:getVariable("originate_disposition") == "failure"
+							) then
+								--send missed call notification
+									missed();
+								--execute the time out action
+									session:execute(ring_group_timeout_app, ring_group_timeout_data);
 							end
 						else
 							if (ring_group_timeout_app ~= nil) then

resources/install/scripts/app/voicemail/index.lua

@@ -73,6 +73,7 @@
 			skip_instructions = session:getVariable("skip_instructions");
 			skip_greeting = session:getVariable("skip_greeting");
 			vm_message_ext = session:getVariable("vm_message_ext");
+			vm_say_caller_id_number = session:getVariable("vm_say_caller_id_number");
 			vm_disk_quota = session:getVariable("vm-disk-quota");
 			if (not vm_disk_quota) then
 				vm_disk_quota = session:getVariable("vm_disk_quota");

resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua

@@ -31,20 +31,34 @@
 			max_digits = 1;
 		--flush dtmf digits from the input buffer
 			session:flushDigits();
+		--set the callback function
+			if (session:ready()) then
+				session:setVariable("playback_terminators", "#");
+				session:setInputCallback("on_dtmf", "");
+			end
 		--set the display
 			if (session:ready()) then
 				reply = api:executeString("uuid_display "..session:get_uuid().." "..caller_id_number);
 			end
 		--say the message number
 			if (session:ready()) then
-				if (string.len(dtmf_digits) == 0) then
+				if (string.len(dtmf_digits) == 0) then 
 					dtmf_digits = macro(session, "message_number", 1, 100, '');
 				end
 			end
 		--say the number
 			if (session:ready()) then
 				if (string.len(dtmf_digits) == 0) then
-					session:say(message_number, default_language, "NUMBER", "pronounced");
+					session:say(message_number, default_language, "number", "pronounced");
+				end
+			end
+		--say the caller id number
+			if (session:ready() and caller_id_number ~= nil) then
+				if (vm_say_caller_id_number ~= nil) then
+					if (vm_say_caller_id_number == "true") then
+						session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/voicemail/vm-message_from.wav");
+						session:say(caller_id_number, default_language, "name_spelled", "iterated");
+					end
 				end
 			end
 		--say the message date
@@ -53,10 +67,9 @@
 					if (current_time_zone ~= nil) then
 						session:execute("set", "timezone="..current_time_zone.."");
 					end
-					session:say(created_epoch, default_language, "CURRENT_DATE_TIME", "pronounced");
+					session:say(created_epoch, default_language, "current_date_time", "pronounced");
 				end
 			end
-
 		--get the recordings from the database
 			if (storage_type == "base64") then
 				sql = [[SELECT * FROM v_voicemail_messages 

resources/install/scripts/app/voicemail/resources/functions/send_email.lua

@@ -131,6 +131,8 @@
 					body = body:gsub("${message_duration}", message_length_formatted);
 					body = body:gsub("${account}", id);
 					body = body:gsub("${domain_name}", domain_name);
+					body = body:gsub("${sip_to_user}", id);
+					body = body:gsub("${dialed_user}", id);
 					if (voicemail_file == "attach") then
 						body = body:gsub("${message}", text['label-attached'][default_language.."-"..default_dialect]);
 					elseif (voicemail_file == "link") then

resources/install/scripts/app/xml_handler/index.lua

@@ -23,22 +23,6 @@
 --	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 --	POSSIBILITY OF SUCH DAMAGE.
 
---set defaults
-	expire = {}
-	expire["directory"] = "3600";
-	expire["dialplan"] = "3600";
-	expire["languages"] = "3600";
-	expire["sofia.conf"] = "3600";
-	expire["acl.conf"] = "3600";
-	load_balancing = false;
-
---set the debug options
-	debug["params"] = false;
-	debug["sql"] = false;
-	debug["xml_request"] = false;
-	debug["xml_string"] = false;
-	debug["cache"] = false;
-
 --general functions
 	require "resources.functions.trim";
 	require "resources.functions.file_exists";

resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua

@@ -1,6 +1,6 @@
 --	xml_handler.lua
 --	Part of FusionPBX
---	Copyright (C) 2013 Mark J Crane <markjcrane@fusionpbx.com>
+--	Copyright (C) 2013 - 2015 Mark J Crane <markjcrane@fusionpbx.com>
 --	All rights reserved.
 --
 --	Redistribution and use in source and binary forms, with or without
@@ -116,9 +116,10 @@
 								sql = sql .. "and g.enabled = 'true' ";
 								sql = sql .. "and (g.domain_uuid = d.domain_uuid or g.domain_uuid is null) ";
 							else
-								sql = "select * from v_gateways ";
-								sql = sql .. "where enabled = 'true' and profile = '"..sip_profile_name.."' ";
+								sql = "select * from v_gateways as g ";
+								sql = sql .. "where g.enabled = 'true' and g.profile = '"..sip_profile_name.."' ";
 							end
+							sql = sql .. "and (g.hostname = '" .. hostname.. "' or g.hostname is null or g.hostname = '') ";
 							if (debug["sql"]) then
 								freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "\n");
 							end

resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua

@@ -99,13 +99,13 @@
 			dialed_extension = params:getHeader("dialed_extension");
 			if (dialed_extension == nil) then
 				--freeswitch.consoleLog("notice", "[xml_handler-directory.lua] dialed_extension is null\n");
-				load_balancing = false;
+				xml_handler["fs_path"] = false;
 			else
 				--freeswitch.consoleLog("notice", "[xml_handler-directory.lua] dialed_extension is " .. dialed_extension .. "\n");
 			end
 
 		--build the XML string from the database
-			if (source == "database") or (load_balancing) then
+			if (source == "database") or (xml_handler["fs_path"]) then
 				--database connection
 					if (continue) then
 						--connect to the database
@@ -138,7 +138,7 @@
 
 				--if load balancing is set to true then get the hostname
 					if (continue) then
-						if (load_balancing) then
+						if (xml_handler["fs_path"]) then
 
 							--get the domain_name from domains
 								if (domain_name == nil) then
@@ -181,9 +181,9 @@
 								--freeswitch.consoleLog("notice", "[xml_handler] sql: " .. sql .. "\n");
 								--freeswitch.consoleLog("notice", "[xml_handler-directory.lua] database_hostname is " .. database_hostname .. "\n");
 
-							--hostname was not found set load_balancing to false to prevent a database_hostname concatenation error
+							--hostname was not found set xml_handler["fs_path"] to false to prevent a database_hostname concatenation error
 								if (database_hostname == nil) then
-									load_balancing = false;
+									xml_handler["fs_path"] = false;
 								end
 
 							--close the database connection
@@ -261,7 +261,7 @@
 											dial_string = "{sip_invite_domain=" .. domain_name .. ",presence_id=" .. user .. "@" .. domain_name .. "}${sofia_contact(" .. extension .. "@" .. domain_name .. ")}";
 										end
 									--set the an alternative dial string if the hostnames don't match
-										if (load_balancing) then
+										if (xml_handler["fs_path"]) then
 											if (local_hostname == database_hostname) then
 												freeswitch.consoleLog("notice", "[xml_handler-directory.lua] local_host and database_host are the same\n");
 											else
@@ -271,13 +271,13 @@
 												--freeswitch.consoleLog("notice", "[xml_handler-directory.lua] dial_string " .. dial_string .. "\n");
 											end
 										else
-											--freeswitch.consoleLog("notice", "[xml_handler-directory.lua] seems balancing is false??" .. tostring(load_balancing) .. "\n");
+											--freeswitch.consoleLog("notice", "[xml_handler-directory.lua] seems balancing is false??" .. tostring(xml_handler["fs_path"]) .. "\n");
 										end
 
 									--show debug informationa
-										--if (load_balancing) then
-										--	freeswitch.consoleLog("notice", "[xml_handler] local_hostname: " .. local_hostname.. " database_hostname: " .. database_hostname .. " dial_string: " .. dial_string .. "\n");
-										--end
+										if (xml_handler["fs_path"]) then
+											freeswitch.consoleLog("notice", "[xml_handler] local_hostname: " .. local_hostname.. " database_hostname: " .. database_hostname .. " dial_string: " .. dial_string .. "\n");
+										end
 								end
 						end);
 					end

resources/install/scripts/call_flow_monitor.lua

@@ -25,7 +25,7 @@
 --	POSSIBILITY OF SUCH DAMAGE.
 
 --set the time between loops in seconds
-	sleep = 300;
+	sleep = 60;
 
 --set the debug level
 	debug["log"] = false;

resources/install/scripts/fax_retry.lua

@@ -391,7 +391,7 @@
 		--email_cmd = "/bin/echo '"..email_message_fail.."' | /usr/bin/mail -s 'Fax to: "..number_dialed.." FAILED' -r "..from_address.." -a '"..fax_file.."' "..email_address;
 
 		--to keep the originate command shorter these are things we always send. One place to adjust for all.
-		originate_same = "for_fax=1,absolute_codec_string='PCMU,PCMA',accountcode='"..accountcode.."',domain_uuid="..domain_uuid..",domain_name="..domain_name..",mailto_address='"..email_address.."',mailfrom_address='"..from_address.."',origination_caller_id_name='"..origination_caller_id_name.. "',origination_caller_id_number="..origination_caller_id_number..",fax_uri="..fax_uri..",fax_retry_limit="..fax_retry_limit..",fax_retry_sleep="..fax_retry_sleep..",fax_verbose=true,fax_file='"..fax_file.."'";
+		originate_same = "for_fax=1,accountcode='"..accountcode.."',domain_uuid="..domain_uuid..",domain_name="..domain_name..",mailto_address='"..email_address.."',mailfrom_address='"..from_address.."',origination_caller_id_name='"..origination_caller_id_name.. "',origination_caller_id_number="..origination_caller_id_number..",fax_uri="..fax_uri..",fax_retry_limit="..fax_retry_limit..",fax_retry_sleep="..fax_retry_sleep..",fax_verbose=true,fax_file='"..fax_file.."'";
 
 		if (fax_retry_attempts < fax_retry_limit) then 
 

resources/templates/conf/sip_profiles/internal.xml.noload

@@ -97,7 +97,7 @@
 		<!-- extended info parsing -->
 		<param name="extended-info-parsing" value="true" enabled="false"/>
 
-		<param name="aggressive-nat-detection" value="true" enabled="false"/>
+		<param name="aggressive-nat-detection" value="true" enabled="true"/>
 		<!--
 		There are known issues (asserts and segfaults) when 100rel is enabled.
 		It is not recommended to enable 100rel at this time.
@@ -150,7 +150,7 @@
 		<!-- used to share presence info across sofia profiles -->
 		<!-- Name of the db to use for this profile -->
 		<param name="dbname" value="share_presence" enabled="false"/>
-		<param name="presence-hosts" value="$${domain},$${local_ip_v4}"/>
+		<param name="presence-hosts" value="$${domain},$${local_ip_v4}" enabled="false"/>
 		<param name="presence-privacy" value="$${presence_privacy}"/>
 		<!-- ************************************************* -->
 
@@ -292,7 +292,7 @@
 		<param name="enable-3pcc" value="true" enabled="false"/>
 
 		<!-- use at your own risk or if you know what this does.-->
-		<param name="NDLB-force-rport" value="true" enabled="false"/>
+		<param name="NDLB-force-rport" value="safe" enabled="true"/>
 		<!--
 		Choose the realm challenge key. Default is auto_to if not set. 
 

resources/templates/provision/cisco/7940/DISTINCTIVERINGLIST.XML

@@ -0,0 +1,30 @@
+<tones>
+  <tone c1="31164" i1="-1772" c2="30743" i2="-1985" c3="31164" i3="-1772" c4="30743" i4="-1985" d="34" t="ringing">
+    <part m="on" t="400"/>
+    <part m="off" t="200"/>
+    <part m="on" t="400"/>
+    <part m="off" t="2000"/>
+    <repeat c="65535"/>
+  </tone>
+  <tone c1="31164" i1="-1772" c2="31164" i2="-1772" d="17" t="reorder">
+    <part m="on" t="400"/>
+    <part m="off" t="350"/>
+    <part m="on" t="225"/>
+    <part m="off" t="525"/>
+    <repeat c="65535"/>
+  </tone>
+  <tone c1="31164" i1="-1772" d="1" t="busy">
+    <part m="on" t="375"/>
+    <part m="off" t="375"/>
+    <repeat c="65535"/>
+  </tone>
+  <tone c1="31538" i1="-1556" c2="30831" i2="-1942" d="2" t="odial">
+    <part m="on" t="65535"/>
+    <repeat c="65535"/>
+  </tone>
+  <tone c1="31538" i1="-1556" c2="30831" i2="-1942" d="2" t="idial">
+    <part m="on" t="65535"/>
+    <repeat c="65535"/>
+  </tone>
+</tones>
+

resources/templates/provision/cisco/7940/RINGLIST.XML

@@ -0,0 +1,30 @@
+<CiscoIPPhoneRingList>
+	<Ring>
+		<DisplayName>Chirp 3</DisplayName>
+		<FileName>ringer3.pcm</FileName>
+	</Ring>
+	<Ring>
+		<DisplayName>Old Style</DisplayName>
+		<FileName>ringer1.pcm</FileName>
+	</Ring>
+	<Ring>
+		<DisplayName>Door Chime</DisplayName>
+		<FileName>doorchime.pcm</FileName>
+	</Ring>
+	<Ring>
+		<DisplayName>Red Alert</DisplayName>
+		<FileName>redalert.pcm</FileName>
+	</Ring>
+	<Ring>
+		<DisplayName>Terri</DisplayName>
+		<FileName>terri.pcm</FileName>
+	</Ring>
+	<Ring>
+		<DisplayName>Door Chime 2</DisplayName>
+		<FileName>chime2.pcm</FileName>
+	</Ring>
+	<Ring>
+		<DisplayName>Silence</DisplayName>
+		<FileName>silence.pcm</FileName>
+	</Ring>
+</CiscoIPPhoneRingList>

resources/templates/provision/cisco/7940/SIPDefault.cnf

@@ -31,7 +31,7 @@ nat_received_processing: "0"
 proxy_register: "1"
  
 # Phone Registration Expiration [1-3932100 sec] (Default - 3600)
-timer_register_expires: "3600"
+timer_register_expires: "80"
  
 # Codec for media stream (g711ulaw (default), g711alaw, g729)
 preferred_codec: "none"
@@ -68,7 +68,7 @@ sip_invite_retx: "6"               ; Default 7
 timer_invite_expires: "180"        ; Default 180 sec
  
 # Setting for Message speeddial to UOne box
-messages_uri: "*98"
+messages_uri: "*97"
 
 # TFTP Phone Specific Configuration File Directory
 tftp_cfg_dir: ""
@@ -91,7 +91,7 @@ dst_stop_time: "2"
 dst_auto_adjust: "1"
  
 # Do Not Disturb Control (0-off, 1-on, 2-off with no user control, 3-on with no user control)
-dnd_control: "0"                  ; Default 0 (Do Not Disturb feature is off)
+dnd_control: "2"                  ; Default 0 (Do Not Disturb feature is off)
  
 # Caller ID Blocking (0-disabled, 1-enabled, 2-disabled no user control, 3-enabled no user control)
 callerid_blocking: "0"            ; Default 0 (Disable sending all calls as anonymous)
@@ -118,13 +118,13 @@ autocomplete: "1"
 time_format_24hr: "0"
 
 # URL for external Phone Services
-#services_url: "http://192.168.1.1/xmlservices/index.php"
+#services_url: "http://{$domain_name}/app/provision/?file=services.php"
 
 # URL for external Directory location
-#directory_url: "http://192.168.1.1/xmlservices/PhoneDirectory.php"
+#directory_url: "http://{$domain_name}/app/provision/?file=directory.php"
 
 # URL for branding logo
-#logo_url: "http://192.168.1.1/cisco/bmp/trixbox.bmp"
+#logo_url: "http://{$domain_name}/app/provision/logo.bmp"
 
 # Remote Party ID
 remote_party_id: 1              ; 0-Disabled (default), 1-Enabled

resources/templates/provision/cisco/7940/directory-enterprise.xml

@@ -0,0 +1,22 @@
+<CiscoIPPhoneMenu>
+	<Title>Speed Dials</Title>
+	<Prompt>Please choose...</Prompt>
+	<SoftKeyItem>
+		<Name>Dial</Name>
+		<URL>SoftKey:Select</URL>
+		<Position>1</Position>
+	</SoftKeyItem>
+	<MenuItem>
+		<Name>First Last Name (Ext) Type</Name>
+		<URL>Dial:5551231234#</URL>
+	</MenuItem>
+	<MenuItem>
+		<Name>First Last Name (Ext) Type</Name>
+		<URL>Dial:5551231234#</URL>
+	</MenuItem>
+	<SoftKeyItem>
+		<Name>Exit</Name>
+		<URL>SoftKey:Exit</URL>
+		<Position>4</Position>
+	</SoftKeyItem>
+</CiscoIPPhoneMenu>

resources/templates/provision/cisco/7940/directory-personal.xml

@@ -0,0 +1,22 @@
+<CiscoIPPhoneMenu>
+	<Title>Speed Dials</Title>
+	<Prompt>Please choose...</Prompt>
+	<SoftKeyItem>
+		<Name>Dial</Name>
+		<URL>SoftKey:Select</URL>
+		<Position>1</Position>
+	</SoftKeyItem>
+	<MenuItem>
+		<Name>First Last Name (Ext) Type</Name>
+		<URL>Dial:5551231234#</URL>
+	</MenuItem>
+	<MenuItem>
+		<Name>First Last Name (Ext) Type</Name>
+		<URL>Dial:5551231234#</URL>
+	</MenuItem>
+	<SoftKeyItem>
+		<Name>Exit</Name>
+		<URL>SoftKey:Exit</URL>
+		<Position>4</Position>
+	</SoftKeyItem>
+</CiscoIPPhoneMenu>

resources/templates/provision/cisco/7940/directory-speed_dial.xml

@@ -0,0 +1,22 @@
+<CiscoIPPhoneMenu>
+	<Title>Speed Dials</Title>
+	<Prompt>Please choose...</Prompt>
+	<SoftKeyItem>
+		<Name>Dial</Name>
+		<URL>SoftKey:Select</URL>
+		<Position>1</Position>
+	</SoftKeyItem>
+	<MenuItem>
+		<Name>First Last Name (Ext) Type</Name>
+		<URL>Dial:5551231234#</URL>
+	</MenuItem>
+	<MenuItem>
+		<Name>First Last Name (Ext) Type</Name>
+		<URL>Dial:5551231234#</URL>
+	</MenuItem>
+	<SoftKeyItem>
+		<Name>Exit</Name>
+		<URL>SoftKey:Exit</URL>
+		<Position>4</Position>
+	</SoftKeyItem>
+</CiscoIPPhoneMenu>

resources/templates/provision/cisco/7940/directory.xml

@@ -0,0 +1,26 @@
+<CiscoIPPhoneMenu>
+	<Title>Contacts</Title>
+	<Prompt>Please choose...</Prompt>
+	<MenuItem>
+		<Name>Personal</Name>
+		<URL>http://{$domain_name}/app/provision?file=directory-personal.xml&amp;mac={$mac}</URL>
+	</MenuItem>
+	<MenuItem>
+		<Name>Enterprise</Name>
+		<URL>http://{$domain_name}/app/provision?file=directory-enterprise&amp;mac={$mac}</URL>
+	</MenuItem>
+	<MenuItem>
+		<Name>Speed Dials</Name>
+		<URL>http://{$domain_name}/app/provision/?file=directory-speed_dial&amp;mac={$mac}</URL>
+	</MenuItem>
+	<SoftKeyItem>
+		<Name>Select</Name>
+		<URL>SoftKey:Select</URL>
+		<Position>1</Position>
+	</SoftKeyItem>
+	<SoftKeyItem>
+		<Name>Exit</Name>
+		<URL>SoftKey:Exit</URL>
+		<Position>4</Position>
+	</SoftKeyItem>
+</CiscoIPPhoneMenu>

resources/templates/provision/yealink/cp860/y000000000037.cfg

@@ -571,7 +571,7 @@ features.group_listen_in_talking_enable =
 features.call_completion_enable = 
 
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Configure the power Indicator LED to turn on or turn off; 0-On (default), 1-Off;
 features.power_led_on = 1

resources/templates/provision/yealink/cp860/{$mac}.cfg

@@ -44,7 +44,11 @@ account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
-account.1.sip_server.1.port = 5060
+{if $sip_transport_1 == 'dns srv'}
+account.1.sip_server.1.port = 0
+{else}
+account.1.sip_server.1.port = {$sip_port_1}
+{/if}
 #Configure the register expiry time (in seconds), the default value is 3600.
 account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
@@ -122,7 +126,7 @@ account.1.nat.stun_server =
 account.1.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.1.nat.udp_update_enable = 1
+account.1.nat.udp_update_enable = 3
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -920,8 +924,8 @@ account.2.xsi.port =
 #Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
 #local_time.time_zone = +8
 #local_time.time_zone_name = China(Beijing) 
-local_time.time_zone = 
-local_time.time_zone_name = 
+local_time.time_zone = {$time_zone}
+local_time.time_zone_name = {$time_zone_name}
 
 
 #######################################################################################

resources/templates/provision/yealink/t20p/y000000000007.cfg

@@ -1033,7 +1033,7 @@ features.relog_offtime =
  
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
 #Require reboot;
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Specify the ring device when the phone is in the Headset mode; 0-use Speaker (default), 1-use Headset;
 features.ringer_device.is_use_headset = 

resources/templates/provision/yealink/t20p/{$mac}.cfg

@@ -223,8 +223,8 @@ account.1.nat.stun_server =
 #Configure the STUN server port, the default value is 3478.
 account.1.nat.stun_port = 
 
-#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default);
-account.1.nat.udp_update_enable = 
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.1.nat.udp_update_enable = 3
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 

resources/templates/provision/yealink/t21p/y000000000052.cfg

@@ -571,7 +571,7 @@ features.group_listen_in_talking_enable =
 features.call_completion_enable = 
 
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Configure the power Indicator LED to turn on or turn off; 0-On (default), 1-Off;
 features.power_led_on = 1

resources/templates/provision/yealink/t21p/{$mac}.cfg

@@ -44,7 +44,11 @@ account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
-account.1.sip_server.1.port = 5060
+{if $sip_transport_1 == 'dns srv'}
+account.1.sip_server.1.port = 0
+{else}
+account.1.sip_server.1.port = {$sip_port_1}
+{/if}
 #Configure the register expiry time (in seconds), the default value is 3600.
 account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
@@ -122,7 +126,7 @@ account.1.nat.stun_server =
 account.1.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.1.nat.udp_update_enable = 1
+account.1.nat.udp_update_enable = 3
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -920,8 +924,8 @@ account.2.xsi.port =
 #Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
 #local_time.time_zone = +8
 #local_time.time_zone_name = China(Beijing) 
-local_time.time_zone = 
-local_time.time_zone_name = 
+local_time.time_zone = {$time_zone}
+local_time.time_zone_name = {$time_zone_name}
 
 
 #######################################################################################

resources/templates/provision/yealink/t22p/y000000000005.cfg

@@ -1033,7 +1033,7 @@ features.relog_offtime =
  
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
 #Require reboot;
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Specify the ring device when the phone is in the Headset mode; 0-use Speaker (default), 1-use Headset;
 features.ringer_device.is_use_headset = 

resources/templates/provision/yealink/t23g/y000000000044.cfg

@@ -571,7 +571,7 @@ features.group_listen_in_talking_enable =
 features.call_completion_enable = 
 
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Configure the power Indicator LED to turn on or turn off; 0-On (default), 1-Off;
 features.power_led_on = 1

resources/templates/provision/yealink/t23g/{$mac}.cfg

@@ -44,7 +44,11 @@ account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
-account.1.sip_server.1.port = 5060
+{if $sip_transport_1 == 'dns srv'}
+account.1.sip_server.1.port = 0
+{else}
+account.1.sip_server.1.port = {$sip_port_1}
+{/if}
 #Configure the register expiry time (in seconds), the default value is 3600.
 account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
@@ -920,8 +924,8 @@ account.2.xsi.port =
 #Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
 #local_time.time_zone = +8
 #local_time.time_zone_name = China(Beijing) 
-local_time.time_zone = 
-local_time.time_zone_name = 
+local_time.time_zone = {$time_zone}
+local_time.time_zone_name = {$time_zone_name}
 
 
 #######################################################################################

resources/templates/provision/yealink/t23p/y000000000044.cfg

@@ -571,7 +571,7 @@ features.group_listen_in_talking_enable =
 features.call_completion_enable = 
 
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Configure the power Indicator LED to turn on or turn off; 0-On (default), 1-Off;
 features.power_led_on = 1

resources/templates/provision/yealink/t23p/{$mac}.cfg

@@ -44,7 +44,11 @@ account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
-account.1.sip_server.1.port = 5060
+{if $sip_transport_1 == 'dns srv'}
+account.1.sip_server.1.port = 0
+{else}
+account.1.sip_server.1.port = {$sip_port_1}
+{/if}
 #Configure the register expiry time (in seconds), the default value is 3600.
 account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
@@ -920,8 +924,8 @@ account.2.xsi.port =
 #Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
 #local_time.time_zone = +8
 #local_time.time_zone_name = China(Beijing) 
-local_time.time_zone = 
-local_time.time_zone_name = 
+local_time.time_zone = {$time_zone}
+local_time.time_zone_name = {$time_zone_name}
 
 
 #######################################################################################

resources/templates/provision/yealink/t26p/y000000000004.cfg

@@ -1033,7 +1033,7 @@ features.relog_offtime =
  
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
 #Require reboot;
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Specify the ring device when the phone is in the Headset mode; 0-use Speaker (default), 1-use Headset;
 features.ringer_device.is_use_headset = 

resources/templates/provision/yealink/t27p/{$mac}.cfg

@@ -44,7 +44,11 @@ account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
-account.1.sip_server.1.port = 5060
+{if $sip_transport_1 == 'dns srv'}
+account.1.sip_server.1.port = 0
+{else}
+account.1.sip_server.1.port = {$sip_port_1}
+{/if}
 #Configure the register expiry time (in seconds), the default value is 3600.
 account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
@@ -920,8 +924,8 @@ account.2.xsi.port =
 #Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
 #local_time.time_zone = +8
 #local_time.time_zone_name = China(Beijing) 
-local_time.time_zone = 
-local_time.time_zone_name = 
+local_time.time_zone = {$time_zone}
+local_time.time_zone_name = {$time_zone_name}
 
 
 #######################################################################################

resources/templates/provision/yealink/t28p/y000000000000.cfg

@@ -1033,7 +1033,7 @@ features.relog_offtime =
  
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
 #Require reboot;
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Specify the ring device when the phone is in the Headset mode; 0-use Speaker (default), 1-use Headset;
 features.ringer_device.is_use_headset = 

resources/templates/provision/yealink/t29g/y000000000046.cfg

@@ -571,7 +571,7 @@ features.group_listen_in_talking_enable =
 features.call_completion_enable = 
 
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Configure the power Indicator LED to turn on or turn off; 0-On (default), 1-Off;
 features.power_led_on = 1

resources/templates/provision/yealink/t29g/{$mac}.cfg

@@ -44,7 +44,11 @@ account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
-account.1.sip_server.1.port = 5060
+{if $sip_transport_1 == 'dns srv'}
+account.1.sip_server.1.port = 0
+{else}
+account.1.sip_server.1.port = {$sip_port_1}
+{/if}
 #Configure the register expiry time (in seconds), the default value is 3600.
 account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
@@ -920,8 +924,8 @@ account.2.xsi.port =
 #Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
 #local_time.time_zone = +8
 #local_time.time_zone_name = China(Beijing) 
-local_time.time_zone = 
-local_time.time_zone_name = 
+local_time.time_zone = {$time_zone}
+local_time.time_zone_name = {$time_zone_name}
 
 
 #######################################################################################

resources/templates/provision/yealink/t32g/y000000000032.cfg

@@ -1033,7 +1033,7 @@ features.relog_offtime =
  
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
 #Require reboot;
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Specify the ring device when the phone is in the Headset mode; 0-use Speaker (default), 1-use Headset;
 features.ringer_device.is_use_headset = 

resources/templates/provision/yealink/t38g/y000000000038.cfg

@@ -1033,7 +1033,7 @@ features.relog_offtime =
  
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
 #Require reboot;
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Specify the ring device when the phone is in the Headset mode; 0-use Speaker (default), 1-use Headset;
 features.ringer_device.is_use_headset = 

resources/templates/provision/yealink/t41p/y000000000036.cfg

@@ -571,7 +571,7 @@ features.group_listen_in_talking_enable =
 features.call_completion_enable = 
 
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Configure the power Indicator LED to turn on or turn off; 0-On (default), 1-Off;
 features.power_led_on = 1

resources/templates/provision/yealink/t41p/{$mac}.cfg

@@ -44,7 +44,11 @@ account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
-account.1.sip_server.1.port = 5060
+{if $sip_transport_1 == 'dns srv'}
+account.1.sip_server.1.port = 0
+{else}
+account.1.sip_server.1.port = {$sip_port_1}
+{/if}
 #Configure the register expiry time (in seconds), the default value is 3600.
 account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
@@ -920,8 +924,8 @@ account.2.xsi.port =
 #Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
 #local_time.time_zone = +8
 #local_time.time_zone_name = China(Beijing) 
-local_time.time_zone = 
-local_time.time_zone_name = 
+local_time.time_zone = {$time_zone}
+local_time.time_zone_name = {$time_zone_name}
 
 
 #######################################################################################

resources/templates/provision/yealink/t42g/y000000000029.cfg

@@ -571,7 +571,7 @@ features.group_listen_in_talking_enable =
 features.call_completion_enable = 
 
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Configure the power Indicator LED to turn on or turn off; 0-On (default), 1-Off;
 features.power_led_on = 1

resources/templates/provision/yealink/t42g/{$mac}.cfg

@@ -44,7 +44,11 @@ account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
-account.1.sip_server.1.port = 5060
+{if $sip_transport_1 == 'dns srv'}
+account.1.sip_server.1.port = 0
+{else}
+account.1.sip_server.1.port = {$sip_port_1}
+{/if}
 #Configure the register expiry time (in seconds), the default value is 3600.
 account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
@@ -920,8 +924,8 @@ account.2.xsi.port =
 #Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
 #local_time.time_zone = +8
 #local_time.time_zone_name = China(Beijing) 
-local_time.time_zone = 
-local_time.time_zone_name = 
+local_time.time_zone = {$time_zone}
+local_time.time_zone_name = {$time_zone_name}
 
 
 #######################################################################################

resources/templates/provision/yealink/t46g/y000000000028.cfg

@@ -571,7 +571,7 @@ features.group_listen_in_talking_enable =
 features.call_completion_enable = 
 
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Configure the power Indicator LED to turn on or turn off; 0-On (default), 1-Off;
 features.power_led_on = 1

resources/templates/provision/yealink/t46g/{$mac}.cfg

@@ -44,7 +44,11 @@ account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
-account.1.sip_server.1.port = 5060
+{if $sip_transport_1 == 'dns srv'}
+account.1.sip_server.1.port = 0
+{else}
+account.1.sip_server.1.port = {$sip_port_1}
+{/if}
 #Configure the register expiry time (in seconds), the default value is 3600.
 account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
@@ -122,7 +126,7 @@ account.1.nat.stun_server =
 account.1.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.1.nat.udp_update_enable = 1
+account.1.nat.udp_update_enable = 3
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -920,8 +924,8 @@ account.2.xsi.port =
 #Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
 #local_time.time_zone = +8
 #local_time.time_zone_name = China(Beijing) 
-local_time.time_zone = 
-local_time.time_zone_name = 
+local_time.time_zone = {$time_zone}
+local_time.time_zone_name = {$time_zone_name}
 
 
 #######################################################################################
@@ -2395,8 +2399,8 @@ account.5.xsi.port =
 #Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
 #local_time.time_zone = +8
 #local_time.time_zone_name = China(Beijing) 
-local_time.time_zone = 
-local_time.time_zone_name = 
+local_time.time_zone = {$time_zone}
+local_time.time_zone_name = {$time_zone_name}
 
 
 #######################################################################################
@@ -3013,16 +3017,26 @@ programablekey.1.label =
 #expansion_module.x.key.y.label = 
 #expansion_module.X.key.Y.xml_phonebook =
 
+{$rownum = 1}
+
 {foreach $keys as $row}
 {if $row.device_key_category == "expansion"}
-#Expansion module 1 key {$row.device_key_id}
+{if $rownum <= 40}
 expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
 expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
 expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
 expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
 expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
-expansion_module.1.key.{$row.device_key_id}.xml_phonebook = 
-
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{else}
+expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook =
+{/if}
+{$rownum = $rownum + 1}
 {/if}
 {/foreach}
 
@@ -3038,4 +3052,4 @@ expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
 #expansion_module.2.key.1.label = 
 #expansion_module.2.key.1.xml_phonebook = 
 #expansion_module.2.key.1.type = 
-#expansion_module.2.key.1.label = 
+#expansion_module.2.key.1.label = 

resources/templates/provision/yealink/t48g/y000000000035.cfg

@@ -571,7 +571,7 @@ features.group_listen_in_talking_enable =
 features.call_completion_enable = 
 
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
-features.direct_ip_call_enable = 
+features.direct_ip_call_enable = 0
 
 #Configure the power Indicator LED to turn on or turn off; 0-On (default), 1-Off;
 features.power_led_on = 1

resources/templates/provision/yealink/t48g/{$mac}.cfg

@@ -5,7 +5,7 @@
 #######################################################################################
 ##                           Account 1 Basic Settings                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.enable = 
 {if isset($user_password_1) }
 account.1.enable = 1
@@ -33,7 +33,7 @@ account.1.sip_listen_port = 5060
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.reregister_enable = 0
 
 account.1.reregister_enable = 0
@@ -44,7 +44,11 @@ account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
-account.1.sip_server.1.port = 5060
+{if $sip_transport_1 == 'dns srv'}
+account.1.sip_server.1.port = 0
+{else}
+account.1.sip_server.1.port = {$sip_port_1}
+{/if}
 #Configure the register expiry time (in seconds), the default value is 3600.
 account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
@@ -83,7 +87,7 @@ account.1.static_cache_pri = 0
 #######################################################################################
 ##                           Register Advanced                                       ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.sip_server_type = 
 
 #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
@@ -112,7 +116,7 @@ account.1.reg_fail_retry_interval =
 #########################################################################
 ##                     NAT Settings                                    ##
 #########################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.nat.nat_traversal = 0
 
 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
@@ -121,8 +125,8 @@ account.1.nat.nat_traversal = 0
 account.1.nat.stun_server = 
 account.1.nat.stun_port = 3478
 
-#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default)，2-Option，3-Notify;
-account.1.nat.udp_update_enable = 1
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.1.nat.udp_update_enable = 3
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -134,7 +138,7 @@ account.1.nat.rport = {$yealink_rport_1}
 #######################################################################################
 ##                            AccountX Advance Settings                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.advanced.timer_t1 = 0.5
 ##voice_mail.number.X = 
 
@@ -149,7 +153,7 @@ voice_mail.number.1 = {$voicemail_number}
 #######################################################################################
 ##                            Subscribe                                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.subscribe_mwi = 
 
 account.1.subscribe_mwi = 1
@@ -164,7 +168,7 @@ account.1.subscribe_acd_expires= 3600
 #######################################################################################
 ##                            BLF List                                               ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.blf.blf_list_uri = 
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
@@ -181,7 +185,7 @@ account.1.out_dialog_blf_enable = 0
 #######################################################################################
 ##                            BLA/SCA                                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
@@ -461,7 +465,7 @@ account.1.xsi.port =
 #######################################################################################
 ##                           Account 2 Basic Settings                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.enable = 
 {if isset($user_password_2) }
 account.2.enable = 1
@@ -489,7 +493,7 @@ account.2.sip_listen_port = 5060
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.reregister_enable = 0
 
 account.2.reregister_enable = 0
@@ -539,7 +543,7 @@ account.2.static_cache_pri = 0
 #######################################################################################
 ##                           Register Advanced                                       ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.sip_server_type = 
 
 #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
@@ -568,7 +572,7 @@ account.2.reg_fail_retry_interval =
 #########################################################################
 ##                     NAT Settings                                    ##
 #########################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.nat.nat_traversal = 0
 
 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
@@ -590,7 +594,7 @@ account.2.nat.rport = {$yealink_rport_2}
 #######################################################################################
 ##                            Account2 Advance Settings                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.advanced.timer_t1 = 0.5
 ##voice_mail.number.X = 
 
@@ -605,7 +609,7 @@ voice_mail.number.2 = *97
 #######################################################################################
 ##                            Subscribe                                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.subscribe_mwi = 
 
 account.2.subscribe_mwi = 1
@@ -620,7 +624,7 @@ account.2.subscribe_acd_expires= 3600
 #######################################################################################
 ##                            BLF List                                               ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.blf.blf_list_uri = 
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
@@ -637,7 +641,7 @@ account.2.out_dialog_blf_enable = 0
 #######################################################################################
 ##                            BLA/SCA                                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
@@ -920,8 +924,8 @@ account.2.xsi.port =
 #Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
 #local_time.time_zone = +8
 #local_time.time_zone_name = China(Beijing) 
-local_time.time_zone = 
-local_time.time_zone_name = 
+local_time.time_zone = ${time_zone}
+local_time.time_zone_name = ${time_zone_name}
 
 
 #######################################################################################
@@ -954,7 +958,7 @@ network.static_dns_enable = 0
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.enable = 
 {if isset($user_password_3) }
 account.3.enable = 1
@@ -981,7 +985,7 @@ account.3.sip_listen_port = 5060
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.reregister_enable = 0
 
 account.3.reregister_enable = 0
@@ -1031,7 +1035,7 @@ account.3.static_cache_pri = 0
 #######################################################################################
 ##                           Register Advanced                                       ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.sip_server_type = 
 
 #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
@@ -1060,7 +1064,7 @@ account.3.reg_fail_retry_interval =
 #########################################################################
 ##                     NAT Settings                                    ##
 #########################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.nat.nat_traversal = 0
 
 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
@@ -1082,7 +1086,7 @@ account.3.nat.rport = {$yealink_rport_3}
 #######################################################################################
 ##                            Account3 Advance Settings                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.advanced.timer_t1 = 0.5
 ##voice_mail.number.X = 
 
@@ -1097,7 +1101,7 @@ voice_mail.number.3 = *97
 #######################################################################################
 ##                            Subscribe                                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.subscribe_mwi = 
 
 account.3.subscribe_mwi = 1
@@ -1112,7 +1116,7 @@ account.3.subscribe_acd_expires= 3600
 #######################################################################################
 ##                            BLF List                                               ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.blf.blf_list_uri = 
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
@@ -1129,7 +1133,7 @@ account.3.out_dialog_blf_enable = 0
 #######################################################################################
 ##                            BLA/SCA                                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
@@ -1446,7 +1450,7 @@ network.secondary_dns =
 #######################################################################################
 ##                           Account 4 Basic Settings                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.enable = 
 {if isset($user_password_4) }
 account.4.enable = 1
@@ -1473,7 +1477,7 @@ account.4.sip_listen_port = 5060
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.reregister_enable = 0
 
 account.4.reregister_enable = 0
@@ -1523,7 +1527,7 @@ account.4.static_cache_pri = 0
 #######################################################################################
 ##                           Register Advanced                                       ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.sip_server_type = 
 
 #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
@@ -1552,7 +1556,7 @@ account.4.reg_fail_retry_interval =
 #########################################################################
 ##                     NAT Settings                                    ##
 #########################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.nat.nat_traversal = 0
 
 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
@@ -1574,7 +1578,7 @@ account.4.nat.rport = {$yealink_rport_4}
 #######################################################################################
 ##                            Account4 Advance Settings                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.advanced.timer_t1 = 0.5
 ##voice_mail.number.X = 
 
@@ -1589,7 +1593,7 @@ voice_mail.number.4 = *97
 #######################################################################################
 ##                            Subscribe                                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.subscribe_mwi = 
 
 account.4.subscribe_mwi = 1
@@ -1604,7 +1608,7 @@ account.4.subscribe_acd_expires= 3600
 #######################################################################################
 ##                            BLF List                                               ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.blf.blf_list_uri = 
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
@@ -1621,7 +1625,7 @@ account.4.out_dialog_blf_enable = 0
 #######################################################################################
 ##                            BLA/SCA                                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
@@ -1937,7 +1941,7 @@ network.secondary_dns =
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.enable = 
 {if isset($user_password_5) }
 account.5.enable = 1
@@ -1964,7 +1968,7 @@ account.5.sip_listen_port = 5060
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.reregister_enable = 0
 
 account.5.reregister_enable = 0
@@ -2014,7 +2018,7 @@ account.5.static_cache_pri = 0
 #######################################################################################
 ##                           Register Advanced                                       ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.sip_server_type = 
 
 #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
@@ -2043,7 +2047,7 @@ account.5.reg_fail_retry_interval =
 #########################################################################
 ##                     NAT Settings                                    ##
 #########################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.nat.nat_traversal = 0
 
 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
@@ -2065,7 +2069,7 @@ account.5.nat.rport = {$yealink_rport_5}
 #######################################################################################
 ##                            Account5 Advance Settings                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.advanced.timer_t1 = 0.5
 ##voice_mail.number.X = 
 
@@ -2080,7 +2084,7 @@ voice_mail.number.5 = *97
 #######################################################################################
 ##                            Subscribe                                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.subscribe_mwi = 
 
 account.5.subscribe_mwi = 1
@@ -2095,7 +2099,7 @@ account.5.subscribe_acd_expires= 3600
 #######################################################################################
 ##                            BLF List                                               ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.blf.blf_list_uri = 
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
@@ -2112,7 +2116,7 @@ account.5.out_dialog_blf_enable = 0
 #######################################################################################
 ##                            BLA/SCA                                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
@@ -2428,7 +2432,7 @@ network.secondary_dns =
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.enable = 
 {if isset($user_password_6) }
 account.6.enable = 1
@@ -2455,7 +2459,7 @@ account.6.sip_listen_port = 5060
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.reregister_enable = 0
 
 account.6.reregister_enable = 0
@@ -2505,7 +2509,7 @@ account.6.static_cache_pri = 0
 #######################################################################################
 ##                           Register Advanced                                       ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.sip_server_type = 
 
 #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
@@ -2534,7 +2538,7 @@ account.6.reg_fail_retry_interval =
 #########################################################################
 ##                     NAT Settings                                    ##
 #########################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.nat.nat_traversal = 0
 
 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
@@ -2556,7 +2560,7 @@ account.6.nat.rport = {$yealink_rport_6}
 #######################################################################################
 ##                            Account6 Advance Settings                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.advanced.timer_t1 = 0.5
 ##voice_mail.number.X = 
 
@@ -2571,7 +2575,7 @@ voice_mail.number.6 = *97
 #######################################################################################
 ##                            Subscribe                                              ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.subscribe_mwi = 
 
 account.6.subscribe_mwi = 0
@@ -2586,7 +2590,7 @@ account.6.subscribe_acd_expires= 3600
 #######################################################################################
 ##                            BLF List                                               ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.blf.blf_list_uri = 
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
@@ -2603,7 +2607,7 @@ account.6.out_dialog_blf_enable = 0
 #######################################################################################
 ##                            BLA/SCA                                                ##
 #######################################################################################
-## “X” ranges from 1 to 6;
+## ranges from 1 to 6;
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;

resources/templates/provision/yealink/vp530/y000000000023.cfg

@@ -911,7 +911,7 @@ features.relog_offtime = 5
  
 #Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
 #Require reboot;
-features.direct_ip_call_enable = 1
+features.direct_ip_call_enable = 0
 
 #Specify the ring device when the phone is in the Headset mode; 0-use Speaker (default), 1-use Headset;
 features.ringer_device.is_use_headset = 0

resources/templates/provision/yealink/vp530/{$mac}.cfg

@@ -29,7 +29,11 @@ account.1.sip_trust_ctrl = 1
 account.1.sip_server_host = {$server_address_1}
 
 #Specify the port for the SIP server. The default value is 5060.
+{if $sip_transport_1 == 'dns srv'}
+account.1.sip_server_port = 0
+{else}
 account.1.sip_server_port = {$sip_port_1}
+{/if}
 
 #Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled; 
 account.1.outbound_proxy_enable = 

resources/templates/provision/yealink/w52p/y000000000025.cfg

@@ -299,6 +299,9 @@ call_waiting.enable = 1
 #Enable or disable the playing of call waiting tone; 0-Disabled, 1-Enabled (default);
 call_waiting.tone = 
 
+#Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
+features.direct_ip_call_enable = 0
+
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);  
 features.save_call_history =