Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

2026-03-20 07:22:15 +00:00 · 2017-04-06 21:23:03 -07:00
parent a95f380c60 df926e856a
commit 5ad5b7e8fb
33 changed files with 103 additions and 66 deletions
--- 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

--- 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 ");
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =