From b23c9d93b0cd3f13882fcfc30d5f81d3a68a16ec Mon Sep 17 00:00:00 2001
From: Mafoo <mafoo@users.noreply.github.com>
Date: Mon, 3 Apr 2017 16:49:35 +0100
Subject: [PATCH 01/34] Enhance [master] Show more git information (#2461)

make commit id clickable though to origin
display a status of the branch compared to remote
---
 app/system/app_languages.php | 23 +++++++++++++++++------
 app/system/system.php        | 17 +++++++++++++----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/app/system/app_languages.php b/app/system/app_languages.php
index 34aa9b8926..d91c386113 100644
--- a/app/system/app_languages.php
+++ b/app/system/app_languages.php
@@ -143,7 +143,7 @@ $text['label-switch']['uk'] = "перемикач";
 $text['label-switch']['de-at'] = "Schalter";
 $text['label-switch']['it-it'] = "Switch";
 
-$text['label-git_branch']['en-us'] = "Branch:";
+$text['label-git_branch']['en-us'] = "Branch";
 $text['label-git_branch']['es-cl'] = "Rama";
 $text['label-git_branch']['pt-pt'] = "Ramo";
 $text['label-git_branch']['fr-fr'] = "Une succursale";
@@ -152,9 +152,9 @@ $text['label-git_branch']['pl'] = "Gałąź";
 $text['label-git_branch']['sv-se'] = "Gren";
 $text['label-git_branch']['uk'] = "філія";
 $text['label-git_branch']['de-at'] = "Ast";
-$text['label-git_branch']['it-it'] = "Branch:";
+$text['label-git_branch']['it-it'] = "Branch";
 
-$text['label-git_commit']['en-us'] = "Commit:";
+$text['label-git_commit']['en-us'] = "Commit";
 $text['label-git_commit']['es-cl'] = "Cometer";
 $text['label-git_commit']['pt-pt'] = "cometer";
 $text['label-git_commit']['fr-fr'] = "Commettre";
@@ -163,9 +163,9 @@ $text['label-git_commit']['pl'] = "Popełnić";
 $text['label-git_commit']['sv-se'] = "Begå";
 $text['label-git_commit']['uk'] = "здійснити";
 $text['label-git_commit']['de-at'] = "Verpflichten";
-$text['label-git_commit']['it-it'] = "Commit:";
+$text['label-git_commit']['it-it'] = "Commit";
 
-$text['label-git_origin']['en-us'] = "Origin:";
+$text['label-git_origin']['en-us'] = "Origin";
 $text['label-git_origin']['es-cl'] = "Origen";
 $text['label-git_origin']['pt-pt'] = "Origem";
 $text['label-git_origin']['fr-fr'] = "Origine";
@@ -174,7 +174,18 @@ $text['label-git_origin']['pl'] = "Pochodzenie";
 $text['label-git_origin']['sv-se'] = "Ursprung";
 $text['label-git_origin']['uk'] = "походження";
 $text['label-git_origin']['de-at'] = "Herkunft";
-$text['label-git_origin']['it-it'] = "Origine:";
+$text['label-git_origin']['it-it'] = "Origine";
+
+$text['label-git_status']['en-us'] = "Status";
+$text['label-git_status']['es-cl'] = "Estado de";
+$text['label-git_status']['pt-pt'] = "Status do";
+$text['label-git_status']['fr-fr'] = "Statut";
+$text['label-git_status']['pt-br'] = "Status do";
+$text['label-git_status']['pl'] = "Status";
+$text['label-git_status']['sv-se'] = "Status";
+$text['label-git_status']['uk'] = "Статус";
+$text['label-git_status']['de-at'] = "Status";
+$text['label-git_status']['it-it'] = "Stato";
 
 $text['label-memcache_status']['en-us'] = "Memcache Status";
 $text['label-memcache_status']['es-cl'] = "Estado de Memcache";
diff --git a/app/system/system.php b/app/system/system.php
index 075ae9096c..96738976a8 100644
--- a/app/system/system.php
+++ b/app/system/system.php
@@ -89,20 +89,29 @@ $document['title'] = $text['title-sys-status'];
 		if(file_exists($git_path)){
 			$git_exe = 'git';
 			if (strtoupper(substr(PHP_OS, 0, 3)) === 'SUN') { $git_exe = shell_exec('which git'); }
+			shell_exec($git_exe.' --git-dir='.$git_path.' fetch');
 			$git_branch = shell_exec($git_exe.' --git-dir='.$git_path.' name-rev --name-only HEAD');
 			rtrim($git_branch);
 			$git_commit = shell_exec($git_exe.' --git-dir='.$git_path.' rev-parse HEAD');
 			rtrim($git_commit);
 			$git_origin = shell_exec($git_exe.' --git-dir='.$git_path.' config --get remote.origin.url');
-			rtrim($git_commit);
+			rtrim($git_origin);
+			$git_origin = preg_replace('/\.git$/','',$git_origin);
+			$git_status = shell_exec($git_exe.' --git-dir='.$git_path.' status | grep "Your branch"');
+			rtrim($git_status);
+			$git_age = shell_exec($git_exe.' --git-dir='.$git_path.' log --pretty=format:%at HEAD^!');
+			rtrim($git_age);
+			$git_date = DateTime::createFromFormat('U', $git_age);
+			$git_age = $git_date->diff(new DateTime('now'));
 			echo "<tr>\n";
 			echo "	<td width='20%' class=\"vncell\" style='text-align: left;'>\n";
 			echo "		".$text['label-git_info']."\n";
 			echo "	</td>\n";
 			echo "	<td class=\"row_style1\">\n";
-			echo "		".$text['label-git_branch']." ".$git_branch."<br>\n";
-			echo "		".$text['label-git_commit']." ".$git_commit."<br>\n";
-			echo "		".$text['label-git_origin']." ".$git_origin."<br>\n";
+			echo "		".$text['label-git_branch'].": ".$git_branch."<br>\n";
+			echo "		".$text['label-git_commit'].": <a href='$git_origin/commit/$git_commit'>".$git_commit."</a><br>\n";
+			echo "		".$text['label-git_origin'].": ".$git_origin."<br>\n";
+			echo "		".$text['label-git_status'].": ".$git_status.$git_age->format(' %R%a days ago')."<br>\n";
 			echo "	</td>\n";
 			echo "</tr>\n";
 		}

From 5c2a8433db0904bd4323a64778b00ef72028172c Mon Sep 17 00:00:00 2001
From: Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
Date: Mon, 3 Apr 2017 13:53:41 -0400
Subject: [PATCH 02/34] Fix CID alteration in Ringroups (#2467)

I really don't know if this is an IP phone issue (tested on grandstream) or a new behavior on FreeSWITCH, but in order to add the prefix to the caller id (name or number) correctly, you need to export instead of set.
---
 resources/install/scripts/app/ring_groups/index.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/install/scripts/app/ring_groups/index.lua b/resources/install/scripts/app/ring_groups/index.lua
index 6d2d7cda0d..760c1da47f 100644
--- a/resources/install/scripts/app/ring_groups/index.lua
+++ b/resources/install/scripts/app/ring_groups/index.lua
@@ -132,10 +132,10 @@ local log = require "resources.functions.log".ring_group
 --set the caller id
 	if (session:ready()) then
 		if (string.len(ring_group_cid_name_prefix) > 0) then
-			session:execute("set", "effective_caller_id_name="..ring_group_cid_name_prefix.."#"..caller_id_name);
+			session:execute("export", "effective_caller_id_name="..ring_group_cid_name_prefix.."#"..caller_id_name);
 		end
 		if (string.len(ring_group_cid_number_prefix) > 0) then
-			session:execute("set", "effective_caller_id_number="..ring_group_cid_number_prefix..caller_id_number);
+			session:execute("export", "effective_caller_id_number="..ring_group_cid_number_prefix..caller_id_number);
 		end
 	end
 

From dca174919cb033578943c245191e42abb8bcf6b8 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Mon, 3 Apr 2017 12:04:16 -0600
Subject: [PATCH 03/34] Update ldap.php

---
 core/authentication/resources/classes/plugins/ldap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/authentication/resources/classes/plugins/ldap.php b/core/authentication/resources/classes/plugins/ldap.php
index bcedd23153..aa69901f63 100644
--- a/core/authentication/resources/classes/plugins/ldap.php
+++ b/core/authentication/resources/classes/plugins/ldap.php
@@ -67,7 +67,7 @@ class plugin_ldap {
 					if ($bind) {
 						//connected and authorized
 						$user_authorized = true;
-						break;
+						exit;
 					}
 					else {
 						//connection failed

From 5d463f1cd920bc5ce89a48607f2cae06fcfbaa3f Mon Sep 17 00:00:00 2001
From: Jim Kusznir <jim@kusznir.net>
Date: Mon, 3 Apr 2017 19:04:03 -0700
Subject: [PATCH 04/34] Added variables to grandstream ht702 template to
 disable call waiting and t.38 faxing (#2471)

* Added variables to disable call waiting and t.38 faxing

* HT702 config file variables: grandstream_disable_call_waiting, grandstream_disable_fax_t38
---
 .../provision/grandstream/ht702/{$mac}.xml    | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index 1971fe7eeb..06655b6e1c 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -3,7 +3,10 @@
 <config version="1">
 
 <!--  Configuration template for HT701 and HT702 firmware version 1.0.5.2 -->
-
+<!-- VARIABLES for FusionPBX:
+     grandstream_disable_call_waiting: set to 1 disables call waiting (used for PBX/FAX interconnects)
+     grandstream_disable_fax_t38: set to 1 sets pass-through fax mode
+ -->
 <!-- Advanced Settings. -->
 
 
@@ -69,7 +72,7 @@
 
 <!-- Firmware Server Path -->
 <!-- Server address -->
-<P192>fm.grandstream.com/gs</P192>
+<P192>{$domain_name}{$project_path}/app/provision</P192>
 
 <!-- Config Server Path -->
 <!-- Server address;  -->
@@ -533,7 +536,9 @@
 <!-- Disable Call-Waiting. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P91>0</P91>
+{if $grandstream_disable_call_waiting == '1'}<P91>1</P91>
+    {else}<P91>0</P91>
+    {/if}
 
 <!-- Disable Call-Waiting Caller ID. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
@@ -742,7 +747,10 @@
 <!-- FAX Mode. 0 - T.38 (Auto Detect), 1 - Pass Through -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P228>0</P228>
+{if $grandstream_disable_fax_t38 == '1'}<P228>1</P228>
+    {else}<P228>0</P228>
+    {/if}
+
 
 <!-- Re-INVITE After Fax Tone Detected. 0 - Disabled, 1 - Enabled. -->
 <!-- Number: 0, 1 -->
@@ -1192,7 +1200,9 @@
 <!-- Disable Call-Waiting. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P791>0</P791>
+{if $grandstream_disable_call_waiting == '1'}<P791>1</P791>
+    {else}<P791>0</P791>
+    {/if}
 
 <!-- Disable Call-Waiting Caller ID. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
@@ -1399,7 +1409,9 @@
 <!-- FAX Mode. 0 - T.38 (Auto Detect), 1 - Pass Through -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P710>0</P710>
+{if $grandstream_disable_fax_t38 == '1'}<P710>1</P710>
+    {else}<P710>0</P710>
+    {/if}
 
 <!-- Re-INVITE After Fax Tone Detected. 0 - Disabled, 1 - Enabled. -->
 <!-- Number: 0, 1 -->

From 0852dee5816da41a2e00625d0b0e049a55cd5bef Mon Sep 17 00:00:00 2001
From: konradSC <konradSC@users.noreply.github.com>
Date: Tue, 4 Apr 2017 23:24:13 -0400
Subject: [PATCH 05/34] Update index.lua (#2473)

Bug fix in per user vm transcription. If domain had transcription enabled but the user did not, then the sql insert of the msg would fail.
---
 resources/install/scripts/app/voicemail/index.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/install/scripts/app/voicemail/index.lua b/resources/install/scripts/app/voicemail/index.lua
index 98c1e98d0b..f0f1b61a34 100644
--- a/resources/install/scripts/app/voicemail/index.lua
+++ b/resources/install/scripts/app/voicemail/index.lua
@@ -423,7 +423,7 @@
 								if (storage_type == "base64") then
 									table.insert(sql, "message_base64, ");
 								end
-								if (transcribe_enabled == "true") then
+								if (transcribe_enabled == "true") and (voicemail_transcription_enabled == "true") then
 									table.insert(sql, "message_transcription, ");
 								end
 								table.insert(sql, "message_length ");
@@ -441,7 +441,7 @@
 								if (storage_type == "base64") then
 									table.insert(sql, ":message_base64, ");
 								end
-								if (transcribe_enabled == "true") then
+								if (transcribe_enabled == "true") and (voicemail_transcription_enabled == "true") then
 									table.insert(sql,  ":transcription, ");
 								end
 								table.insert(sql, ":message_length ");

From 5f15324d1f1ff315f88fd2557da5b7bc18f8a2cc Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Tue, 4 Apr 2017 23:32:10 -0600
Subject: [PATCH 06/34] Update destination_delete.php

---
 app/destinations/destination_delete.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/destinations/destination_delete.php b/app/destinations/destination_delete.php
index 1dd17b38f6..d4120b937c 100644
--- a/app/destinations/destination_delete.php
+++ b/app/destinations/destination_delete.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2016
+	Portions created by the Initial Developer are Copyright (C) 2008-2017
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -43,12 +43,12 @@
 	$text = $language->get();
 
 //get the ID
-	if (count($_GET) > 0) {
+	if (is_array($_GET)) {
 		$id = check_str($_GET["id"]);
 	}
 
 //if the ID is not set then exit
-	if (!isset($id)) {
+	if (!is_uuid($id)) {
 		echo "ID is required.";
 		exit;
 	}
@@ -82,22 +82,22 @@
 //delete the dialplan
 	if (isset($dialplan_uuid)) {
 		$sql = "delete from v_dialplan_details ";
-		$sql .= "where domain_uuid = '".$domain_uuid."' ";
-		$sql .= "and dialplan_uuid = '".$dialplan_uuid."' ";
+		$sql .= "where dialplan_uuid = '".$dialplan_uuid."' ";
+		//echo $sql."<br />\n";
 		$db->exec(check_sql($sql));
 		unset($sql);
 
 		$sql = "delete from v_dialplans ";
-		$sql .= "where domain_uuid = '".$domain_uuid."' ";
-		$sql .= "and dialplan_uuid = '".$dialplan_uuid."' ";
+		$sql .= "where dialplan_uuid = '".$dialplan_uuid."' ";
+		//echo $sql."<br />\n";
 		$db->exec(check_sql($sql));
 		unset($sql);
 	 }
 
 //delete the destination
 	$sql = "delete from v_destinations ";
-	$sql .= "where domain_uuid = '".$domain_uuid."' ";
-	$sql .= "and destination_uuid = '".$id."' ";
+	$sql .= "where destination_uuid = '".$id."' ";
+	echo $sql."<br />\n";
 	$db->exec(check_sql($sql));
 	unset($sql);
 

From bccf01cd197ae447ccf540f39ba0f72e3d303bdd Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Tue, 4 Apr 2017 23:39:51 -0600
Subject: [PATCH 07/34] Update destinations.php

---
 app/destinations/destinations.php | 32 +++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index ed537cce92..94ea25d9f1 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -17,22 +17,26 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2015
+	Portions created by the Initial Developer are Copyright (C) 2008-2017
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-require_once "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('destination_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('destination_view')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
 
 //add multi-lingual support
 	$language = new text;
@@ -55,7 +59,7 @@ else {
 			$sql .= "where ";
 		}
 	} else {
-		$sql .= "where domain_uuid = '".$domain_uuid."' ";
+		$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
 		if (strlen($search) > 0) {
 			$sql .= "and ";
 		}
@@ -97,7 +101,7 @@ else {
 			$sql .= " where ";
 		}
 	} else {
-		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
 		if (strlen($search) > 0) {
 			$sql .= " and ";
 		}
@@ -225,4 +229,4 @@ else {
 
 //include the footer
 	require_once "resources/footer.php";
-?>
\ No newline at end of file
+?>

From ce9ab239763176d1b3df06698d902885db7b573c Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Tue, 4 Apr 2017 23:42:36 -0600
Subject: [PATCH 08/34] Update destinations.php

---
 app/destinations/destinations.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index 94ea25d9f1..21597e9a11 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -229,4 +229,5 @@
 
 //include the footer
 	require_once "resources/footer.php";
+
 ?>

From ad722efcfb4a8f1d07b6383f63adcd393b92ef36 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Wed, 5 Apr 2017 00:11:37 -0600
Subject: [PATCH 09/34] Update app_config.php

---
 app/destinations/app_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/destinations/app_config.php b/app/destinations/app_config.php
index a549082ea1..93855d50e8 100644
--- a/app/destinations/app_config.php
+++ b/app/destinations/app_config.php
@@ -26,7 +26,7 @@
 		$apps[$x]['destinations'][$y]['label'] = "destinations";
 		$apps[$x]['destinations'][$y]['name'] = "destinations";
 		$apps[$x]['destinations'][$y]['sql'] = "select destination_number as destination, destination_context as context, destination_description as description from v_destinations ";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and destination_type = 'outbound' and destination_enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where (domain_uuid = '\${domain_uuid}' or domain_uuid is null) and destination_type = 'outbound' and destination_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "destination_number asc";
 		$apps[$x]['destinations'][$y]['field']['uuid'] = "destination_uuid";
 		$apps[$x]['destinations'][$y]['field']['context'] = "destination_context";

From f101c0b5cc44001dea654a699b692e3d17350978 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Wed, 5 Apr 2017 00:55:16 -0600
Subject: [PATCH 10/34] Update destination_edit.php

---
 app/destinations/destination_edit.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 2a2bf30703..6c700c55b3 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2016
+	Portions created by the Initial Developer are Copyright (C) 2008-2017
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -114,6 +114,9 @@
 				$_POST["destination_uuid"] = $destination_uuid;
 			}
 
+		//set the default context
+			if ($destination_type =="outbound" && strlen($destination_context) == 0) { $destination_context = $_SESSION['domain_name']; }
+	
 		//check for all required data
 			$msg = '';
 			if (strlen($destination_type) == 0) { $msg .= $text['message-required']." ".$text['label-destination_type']."<br>\n"; }
@@ -274,7 +277,7 @@
 
 				//delete previous fax detection settings
 					$sql = "delete from v_dialplan_details ";
-					$sql .= "where domain_uuid = '".$domain_uuid."' ";
+					$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
 					$sql .= "and dialplan_uuid = '".$dialplan_uuid."' ";
 					$sql .= "and (";
 					$sql .= "	dialplan_detail_data like '%tone_detect%' ";
@@ -351,7 +354,7 @@
 				$sql = "delete from v_dialplan_details ";
 				$sql .= "where dialplan_uuid = '".$dialplan_uuid."' ";
 				if (!permission_exists('destination_domain')) {
-					$sql .= "and domain_uuid = '".$domain_uuid."' ";
+					$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
 				}
 				//echo $sql."<br><br>";
 				$db->exec(check_sql($sql));
@@ -502,6 +505,8 @@
 //set the defaults
 	if (strlen($destination_type) == 0) { $destination_type = 'inbound'; }
 	if (strlen($destination_context) == 0) { $destination_context = 'public'; }
+	if ($destination_type =="outbound" && $destination_context == "public") { $destination_context = $_SESSION['domain_name']; }
+	if ($destination_type =="outbound" && strlen($destination_context) == 0) { $destination_context = $_SESSION['domain_name']; }
 
 //show the header
 	require_once "resources/header.php";
@@ -525,7 +530,6 @@
 	echo "			if (document.getElementById('tr_buy')) { document.getElementById('tr_buy').style.display = 'none'; }\n";
 	echo "			if (document.getElementById('tr_carrier')) { document.getElementById('tr_carrier').style.display = 'none'; }\n";
 	echo "			document.getElementById('tr_account_code').style.display = 'none';\n";
-	echo "			document.getElementById('destination_context').value = '".$_SESSION['domain_name']."'";
 	echo "		}\n";
 	echo "		else if (dir == 'inbound') {\n";
 	echo "			if (document.getElementById('tr_caller_id_name')) { document.getElementById('tr_caller_id_name').style.display = ''; }\n";

From fe5616031e8e7d71a9f44ec2060d5b3d7eef5ebc Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 00:45:39 -0400
Subject: [PATCH 11/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t23g/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t23g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From d78d3e8daf93f684b7b7822ca1fbe74d4fcd5b49 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 00:46:23 -0400
Subject: [PATCH 12/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t23p/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg
index 0dc960abec..de2cd6d32b 100644
--- a/resources/templates/provision/yealink/t23p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From b46bdfce4d7fd0423bc1f48f65f3c94426a8bdf0 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 00:48:18 -0400
Subject: [PATCH 13/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t22p/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg
index 3e73c4b5ab..b2af609db7 100644
--- a/resources/templates/provision/yealink/t22p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg
@@ -140,7 +140,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From f39ed551683c8c13b517085ddb9af745066d215e Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 00:50:02 -0400
Subject: [PATCH 14/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t21p/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t21p/{$mac}.cfg b/resources/templates/provision/yealink/t21p/{$mac}.cfg
index 964bcedf88..c394793340 100644
--- a/resources/templates/provision/yealink/t21p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t21p/{$mac}.cfg
@@ -293,7 +293,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From ee58bd3de98112355877ce26d47365f1c6ae4079 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 00:51:33 -0400
Subject: [PATCH 15/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t20p/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg
index e80899b591..d35a1d197d 100644
--- a/resources/templates/provision/yealink/t20p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg
@@ -139,7 +139,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 9a1443e3b756163cd0a590d428b0aabc8a3fd10c Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 00:53:14 -0400
Subject: [PATCH 16/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/cp860/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg
index f33b23f105..10a6b53e33 100644
--- a/resources/templates/provision/yealink/cp860/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg
@@ -293,7 +293,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 40b78492b419a0961d642be88b993872e66acb0d Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 00:54:08 -0400
Subject: [PATCH 17/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t26p/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg
index 6e6d0a8104..898937e8b5 100644
--- a/resources/templates/provision/yealink/t26p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg
@@ -139,7 +139,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From fe2c804556f60e8fb20f47dd712caaa64a25231e Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 00:55:52 -0400
Subject: [PATCH 18/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t27g/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t27g/{$mac}.cfg b/resources/templates/provision/yealink/t27g/{$mac}.cfg
index d1765d6c67..a6c7cb4324 100644
--- a/resources/templates/provision/yealink/t27g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 7e863b5ba7d13cb5451406b922f84c54f8ac407c Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 00:57:57 -0400
Subject: [PATCH 19/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t27p/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t27p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 7aa37fee7009d4dc686b9f48fc18d44dce054dec Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:00:38 -0400
Subject: [PATCH 20/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t28p/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg
index 7f9f2d4050..d34d1b04e0 100644
--- a/resources/templates/provision/yealink/t28p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg
@@ -140,7 +140,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From bd24ddd0cbc3b4f36d48cdc0df835010e53407de Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:02:35 -0400
Subject: [PATCH 21/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t29g/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg
index b62071f0b4..f924db84ba 100644
--- a/resources/templates/provision/yealink/t29g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg
@@ -287,7 +287,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From ece058304ccbdd40d70ee64339d977188058301e Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:04:46 -0400
Subject: [PATCH 22/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t32g/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index f0846e8723..a255847172 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -125,7 +125,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 03f69664b8147a502fff81697959a84ab318f778 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:07:41 -0400
Subject: [PATCH 23/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t38g/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index 9c0905082b..16f3ca5b9d 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -125,7 +125,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 024e4536a08a6c242adfb5ec897d806c9f8c6e09 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:09:25 -0400
Subject: [PATCH 24/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t41p/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t41p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 173509bda081011beacec59c4fda554156a25dac Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:11:43 -0400
Subject: [PATCH 25/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t42g/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 064b4842ec476e347e5c0ad657f7676760f1b116 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:13:19 -0400
Subject: [PATCH 26/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t46g/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 7d233bc20794e9f045cc16fe756d90c250a6c64d Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:16:17 -0400
Subject: [PATCH 27/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t46s/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t46s/{$mac}.cfg b/resources/templates/provision/yealink/t46s/{$mac}.cfg
index d1765d6c67..a6c7cb4324 100644
--- a/resources/templates/provision/yealink/t46s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46s/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 7aa8c77aac18362cecff1f4bf79891bbe558007a Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:18:08 -0400
Subject: [PATCH 28/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t48g/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t48g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From fc47e3e224685c35138b823fd5be8cc4244971ca Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:19:56 -0400
Subject: [PATCH 29/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t48s/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t48s/{$mac}.cfg b/resources/templates/provision/yealink/t48s/{$mac}.cfg
index d1765d6c67..a6c7cb4324 100644
--- a/resources/templates/provision/yealink/t48s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48s/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 2454d7d2e3a78141db626b60768391d67599c9e4 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:20:57 -0400
Subject: [PATCH 30/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t49g/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg
index c9ca1e84a5..5ef564ac8e 100644
--- a/resources/templates/provision/yealink/t49g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From b396b52dd6550b97bf807c8e206d81f49701668a Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:22:43 -0400
Subject: [PATCH 31/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/vp530/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg
index b6e2fd1e18..49f0c51b74 100644
--- a/resources/templates/provision/yealink/vp530/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From ad8c92723adb5327643584e6ffa4a72c3aef5120 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:24:35 -0400
Subject: [PATCH 32/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/w52p/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/w52p/{$mac}.cfg b/resources/templates/provision/yealink/w52p/{$mac}.cfg
index 290f16773e..73b2b0e8ec 100644
--- a/resources/templates/provision/yealink/w52p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w52p/{$mac}.cfg
@@ -116,7 +116,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From 9a00d51e433ae0a06d007b2731ce00de0b6cda66 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:26:53 -0400
Subject: [PATCH 33/34] Update {$mac}.cfg

---
 resources/templates/provision/yealink/t40p/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/yealink/t40p/{$mac}.cfg b/resources/templates/provision/yealink/t40p/{$mac}.cfg
index d1765d6c67..a6c7cb4324 100644
--- a/resources/templates/provision/yealink/t40p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t40p/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =

From a8a52e630e8752c1e9f19033fe6e25e1d9cd62a9 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 6 Apr 2017 01:54:39 -0400
Subject: [PATCH 34/34] Update app_config.php

---
 app/provision/app_config.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/provision/app_config.php b/app/provision/app_config.php
index eb2bcc4dc0..18d08e93b3 100644
--- a/app/provision/app_config.php
+++ b/app/provision/app_config.php
@@ -361,5 +361,13 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '(*xxxxxxx|*xxxxxx|*xxxxx|*xxxx|*xxx|*xx*|*x|**xxxxx|**xxxx|**xxx|**xx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)';
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = '';
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = 'bf122bc9-c9bf-497c-9dda-95d125293eaf';
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = 'provision';
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'yealink_srtp_encryption';
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'text';
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '0';
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = '';
 
 ?>