\n";
diff --git a/app/music_on_hold/resources/classes/switch_music_on_hold.php b/app/music_on_hold/resources/classes/switch_music_on_hold.php
index 408da44e19..75d25c0604 100644
--- a/app/music_on_hold/resources/classes/switch_music_on_hold.php
+++ b/app/music_on_hold/resources/classes/switch_music_on_hold.php
@@ -108,17 +108,35 @@ include "root.php";
$prep_statement = $this->db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
- foreach($result as $row) {
- //set the variables
- $moh_name = $row['music_on_hold_name'];
- $moh_rate = $row['music_on_hold_rate'];
- //set the value
- $moh_value = "local_stream://".$moh_name;
- if($moh_name == 'default') {
- $moh_name = $text['option-default'];
- }
- $array[$moh_value] = str_replace('_', ' ', $moh_name);
+ //build the names array without the rates
+ $names = array();
+ foreach($result as $row) {
+ //convert the strings into arrays
+ $name_array = explode("/", $row['music_on_hold_name']);
+
+ //name with the domain
+ if (count($name_array) == "3") {
+ $stream_name = $name_array[0].'/'.$name_array[1];
+ }
+ //name without the domain
+ if (count($name_array) == "2") {
+ $stream_name = $name_array[0];
+ }
+
+ //prevent duplicate names in the array
+ if (!in_array($stream_name, $names)) {
+ $names[] = $stream_name;
+ }
+ }
+
+ //add the value and name to the array before it is returned
+ foreach($names as $name) {
+ $value = "local_stream://".$name;
+ if($stream == 'default') {
+ $name = $text['option-default'];
+ }
+ $array[$value] = str_replace('_', ' ', $name);
}
//return the array
@@ -216,4 +234,4 @@ include "root.php";
//$moh->xml();
//$moh->save();
-?>
\ No newline at end of file
+?>
diff --git a/app/voicemails/app_defaults.php b/app/voicemails/app_defaults.php
index bd7fc63bfd..a4b47bdf30 100644
--- a/app/voicemails/app_defaults.php
+++ b/app/voicemails/app_defaults.php
@@ -55,6 +55,19 @@ if ($domains_processed == 1) {
$array[$x]['default_setting_enabled'] = 'false';
$array[$x]['default_setting_description'] = 'Define which storage type (base_64 stores in the database).';
$x++;
+ $array[$x]['default_setting_category'] = 'voicemail';
+ $array[$x]['default_setting_subcategory'] = 'message_max_length';
+ $array[$x]['default_setting_name'] = 'numeric';
+ $array[$x]['default_setting_value'] = '300';
+ $array[$x]['default_setting_enabled'] = 'false';
+ $array[$x]['default_setting_description'] = 'Maximum length of a voicemail (in seconds).';
+ $x++;
+ $array[$x]['default_setting_category'] = 'voicemail';
+ $array[$x]['default_setting_subcategory'] = 'greeting_max_length';
+ $array[$x]['default_setting_name'] = 'numeric';
+ $array[$x]['default_setting_value'] = '90';
+ $array[$x]['default_setting_enabled'] = 'false';
+ $array[$x]['default_setting_description'] = 'Maximum length of a voicemail greeting (in seconds).';
//iterate and add each, if necessary
foreach ($array as $index => $default_settings) {
diff --git a/resources/app_languages.php b/resources/app_languages.php
index cb0566eb84..bbd563dfae 100644
--- a/resources/app_languages.php
+++ b/resources/app_languages.php
@@ -175,6 +175,20 @@ $text['button-apply']['ro'] = "";
$text['button-apply']['fa'] = "";
$text['button-apply']['ar-eg'] = "";
+$text['button-applied']['en-us'] = "Applied";
+$text['button-applied']['es-cl'] = "";
+$text['button-applied']['pt-pt'] = "";
+$text['button-applied']['fr-fr'] = "";
+$text['button-applied']['pt-br'] = "";
+$text['button-applied']['pl'] = "";
+$text['button-applied']['he'] = "";
+$text['button-applied']['uk'] = "";
+$text['button-applied']['sv-se'] = "";
+$text['button-applied']['de-at'] = "";
+$text['button-applied']['ro'] = "";
+$text['button-applied']['fa'] = "";
+$text['button-applied']['ar-eg'] = "";
+
$text['button-clear']['en-us'] = "Clear";
$text['button-clear']['es-cl'] = "Limpiar";
$text['button-clear']['pt-pt'] = "Apagar";
@@ -868,4 +882,4 @@ $text['description-description']['sv-se'] = "Fyll i en beskrivning, om nödvänd
$text['description-description']['uk'] = "Введіть опис, якщо це необхідно.";
$text['description-description']['de-at'] = "Falls gewünscht, geben Sie eine Beschreibung an.";
-?>
\ No newline at end of file
+?>
diff --git a/resources/install/scripts/app/voicemail/resources/functions/record_greeting.lua b/resources/install/scripts/app/voicemail/resources/functions/record_greeting.lua
index 41e7d1ee09..e5b7a45588 100644
--- a/resources/install/scripts/app/voicemail/resources/functions/record_greeting.lua
+++ b/resources/install/scripts/app/voicemail/resources/functions/record_greeting.lua
@@ -25,6 +25,10 @@
--define a function to record the greeting
function record_greeting(greeting_id)
+ local db = dbh or Database.new('system')
+ local settings = Settings.new(db, domain_name, domain_uuid)
+
+ local max_len_seconds = settings:get('voicemail', 'greeting_max_length', 'numeric');
--flush dtmf digits from the input buffer
session:flushDigits();
@@ -62,7 +66,6 @@
else
--prepare to record the greeting
if (session:ready()) then
- max_len_seconds = 90;
silence_seconds = 5;
mkdir(voicemail_dir.."/"..voicemail_id);
-- syntax is session:recordFile(file_name, max_len_secs, silence_threshold, silence_secs)
diff --git a/resources/install/scripts/app/voicemail/resources/functions/record_message.lua b/resources/install/scripts/app/voicemail/resources/functions/record_message.lua
index b4d0292cb1..e45e39c429 100644
--- a/resources/install/scripts/app/voicemail/resources/functions/record_message.lua
+++ b/resources/install/scripts/app/voicemail/resources/functions/record_message.lua
@@ -25,6 +25,10 @@
--save the recording
function record_message()
+ local db = dbh or Database.new('system')
+ local settings = Settings.new(db, domain_name, domain_uuid)
+
+ local max_len_seconds = settings:get('voicemail', 'message_max_length', 'numeric');
--record your message at the tone press any key or stop talking to end the recording
if (skip_instructions == "true") then
@@ -142,7 +146,6 @@
--save the recording
-- syntax is session:recordFile(file_name, max_len_secs, silence_threshold, silence_secs)
- max_len_seconds = 300;
silence_seconds = 5;
if (storage_path == "http_cache") then
result = session:recordFile(storage_path.."/"..voicemail_id.."/msg_"..uuid.."."..vm_message_ext, max_len_seconds, record_silence_threshold, silence_seconds);
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua
index ade6991b4c..e2a84ce09d 100644
--- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua
+++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/local_stream.conf.lua
@@ -32,7 +32,7 @@
chime_list = "";
for k,v in pairs(chime_array) do
f = explode("/", v);
- if (file_exists(sounds_dir.."/en/us/callie/"..f[1].."/8000/"..f[2])) then
+ if (f[1] ~= nil and f[2] ~= nil and file_exists(sounds_dir.."/en/us/callie/"..f[1].."/8000/"..f[2])) then
chime_list = chime_list .. sounds_dir.."/en/us/callie/"..v;
else
chime_list = chime_list .. v;
@@ -40,13 +40,20 @@
end
end
+ --set the default timer name to soft
+ if (row.music_on_hold_timer_name == nil) then
+ timer_name = "soft";
+ else
+ timer_name = row.music_on_hold_timer_name;
+ end
+
--build the xml ]]..row.music_on_hold_name..[["
table.insert(xml, [[ ]]);
table.insert(xml, [[ ]]);
table.insert(xml, [[ ]]);
table.insert(xml, [[ ]]);
table.insert(xml, [[ ]]);
- table.insert(xml, [[ ]]);
+ table.insert(xml, [[ ]]);
if (chime_list ~= nil) then
table.insert(xml, [[ ]]);
end
diff --git a/resources/install/scripts/call_flow_subscribe.lua b/resources/install/scripts/call_flow_subscribe.lua
new file mode 100644
index 0000000000..8de2b2a61d
--- /dev/null
+++ b/resources/install/scripts/call_flow_subscribe.lua
@@ -0,0 +1,111 @@
+require "resources.functions.config"
+require "resources.functions.split"
+
+local log = require "resources.functions.log".call_flow_subscribe
+local file = require "resources.functions.file"
+local presence_in = require "resources.functions.presence_in"
+local Database = require "resources.functions.database"
+
+local ievents = function(events, ...)
+ if type(events) == 'string' then
+ events = freeswitch.EventConsumer(events)
+ end
+
+ local block, timeout = ...
+ if timeout and (timeout == 0) then block, timeout = 0, 0 end
+ timeout = timeout or 0
+
+ return function()
+ local event = events:pop(block, timeout)
+ return not event, event
+ end
+end
+
+local find_call_flow_sql = [[select t1.call_flow_uuid, t1.call_flow_status
+from v_call_flows t1 inner join v_domains t2 on t1.domain_uuid = t2.domain_uuid
+where t2.domain_name = '%s' and t1.call_flow_feature_code = '%s'
+]]
+
+local function find_call_flow(user)
+ local ext, domain_name = split_first(user, '@', true)
+ if not domain_name then return end
+ local dbh = Database.new('system')
+ if not dbh then return end
+ local sql = string.format(find_call_flow_sql, dbh:escape(domain_name), dbh:escape(ext))
+ local row = dbh:first_row(sql)
+ dbh:release()
+ if not row then return end
+ return row.call_flow_uuid, row.call_flow_status
+end
+
+local IntervalTimer = {} do
+IntervalTimer.__index = IntervalTimer
+
+function IntervalTimer.new(interval)
+ local o = setmetatable({}, IntervalTimer)
+ o._interval = interval
+ return o
+end
+
+function IntervalTimer:rest()
+ local d = self._interval - os.difftime(os.time(), self._begin)
+ if d < 0 then d = 0 end
+ return d
+end
+
+function IntervalTimer:start()
+ self._begin = os.time()
+ return self
+end
+
+function IntervalTimer:stop()
+ self._begin = nil
+ return self
+end
+
+end
+
+local pid_file = scripts_dir .. "/run/call_flow_subscribe.tmp"
+
+local pid = tostring(os.clock())
+
+file.write(pid_file, pid)
+
+log.notice("start call_flow_subscribe");
+
+local timer = IntervalTimer.new(60):start()
+
+for timeout, event in ievents("PRESENCE_PROBE", 1, timer:rest() * 1000) do
+ if timeout or timer:rest() == 0 then
+ local stored = file.read(pid_file)
+ if stored then
+ if stored ~= pid then break end
+ else
+ if not file.exists(pid_file) then break end
+ end
+ timer:start()
+ end
+
+ if event then
+ -- log.notice("event:" .. event:serialize("xml"));
+ if event:getHeader('proto') == 'flow' and
+ event:getHeader('Event-Calling-Function') == 'sofia_presence_handle_sip_i_subscribe'
+ then
+ local from, to = event:getHeader('from'), event:getHeader('to')
+ local expires = tonumber(event:getHeader('expires'))
+ if expires and expires > 0 then
+ local call_flow_uuid, call_flow_status = find_call_flow(to)
+ if call_flow_uuid then
+ log.debugf("Find call flow: %s", to)
+ presence_in.turn_lamp(call_flow_status == "false", to, call_flow_uuid);
+ else
+ log.warningf("Can not find call flow: %s", to)
+ end
+ else
+ log.noticef("%s UNSUBSCRIBE from %s", from, to)
+ end
+ end
+ end
+end
+
+log.notice("stop call_flow_subscribe")
diff --git a/resources/install/scripts/resources/functions/database.lua b/resources/install/scripts/resources/functions/database.lua
index 34989f62aa..35c4e1c87f 100644
--- a/resources/install/scripts/resources/functions/database.lua
+++ b/resources/install/scripts/resources/functions/database.lua
@@ -77,6 +77,14 @@ local function new_database(backend, backend_name)
return result
end
+ function Database:escape(str)
+ return (string.gsub(str, "'", "''"))
+ end
+
+ function Database:quote(str)
+ return "'" .. self:escape(str) .. "'"
+ end
+
function Database.__self_test__(...)
log.info('self_test Database - ' .. Database._backend_name)
local db = Database.new(...)
@@ -151,6 +159,16 @@ local function new_database(backend, backend_name)
local a = assert(db:first_value("select NULL as a"))
assert(a == "")
+ -- escape
+ local values = {"hello';select 'world", "hello'"}
+ for _, value in ipairs(values) do
+ local a = assert(db:first_value(
+ string.format("select '%s' as a", db:escape(value))
+ ))
+ assert(a == value)
+ end
+
+ -- close
db:release()
assert(not db:connected())
diff --git a/resources/install/scripts/resources/functions/presence_in.lua b/resources/install/scripts/resources/functions/presence_in.lua
index b8369f9b17..988850119b 100644
--- a/resources/install/scripts/resources/functions/presence_in.lua
+++ b/resources/install/scripts/resources/functions/presence_in.lua
@@ -1,6 +1,17 @@
+require "resources.functions.split"
+
local function turn_lamp(on, user, uuid)
+ local userid, domain, proto = split_first(user, "@", true)
+ proto, userid = split_first(userid, "+", true)
+ if userid then
+ user = userid .. "@" .. domain
+ else
+ proto = "sip"
+ end
+
+
local event = freeswitch.Event("PRESENCE_IN");
- event:addHeader("proto", "sip");
+ event:addHeader("proto", proto);
event:addHeader("event_type", "presence");
event:addHeader("alt_event_type", "dialog");
event:addHeader("Presence-Call-Direction", "outbound");
diff --git a/resources/templates/provision/yealink/cp860/y000000000037.cfg b/resources/templates/provision/yealink/cp860/y000000000037.cfg
index 08068488e2..e59805a1e0 100644
--- a/resources/templates/provision/yealink/cp860/y000000000037.cfg
+++ b/resources/templates/provision/yealink/cp860/y000000000037.cfg
@@ -1432,54 +1432,6 @@ gui_lang.url =
#gui_lang.delete = http://localhost/all, delete all the customized languages.
gui_lang.delete =
-#######################################################################################
-## Time Settings ##
-#######################################################################################
-
-#Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
-#The default time zone name is China(Beijing).
-#local_time.time_zone = +8
-#local_time.time_zone_name = China(Beijing)
-local_time.time_zone = {$yealink_time_zone}
-local_time.time_zone_name = {$yealink_time_zone_name}
-
-#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org.
-local_time.ntp_server1 = {$ntp_server_1}
-local_time.ntp_server2 = {$ntp_server_2}
-
-#Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
-local_time.interval =
-
-#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
-local_time.summer_time =
-
-#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
-
-#Configure the start time of DST. The default value is 1/1/0.
-#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
-#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day.
-#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January.
-local_time.start_time = {$yealink_time_zone_start_time}
-
-#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time.
-local_time.end_time = {$yealink_time_zone_end_time}
-
-#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is blank.
-local_time.offset_time = {$yealink_offset_time}
-
-#Configure the time format; 0-12 Hour, 1-24 Hour (default);
-local_time.time_format = {$yealink_time_format}
-
-#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
-local_time.date_format = {$yealink_date_format}
-
-#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled;
-local_time.dhcp_time =
-
-#Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0.
-local_time.manual_time_enable =
-
#######################################################################################
## Trusted Certificates ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg
index e2f1aabe30..a3626a2d72 100644
--- a/resources/templates/provision/yealink/cp860/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg
@@ -924,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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
#######################################################################################
@@ -1410,16 +1410,6 @@ account.3.xsi.server_type =
account.3.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -1903,16 +1893,6 @@ account.4.xsi.server_type =
account.4.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2394,16 +2374,6 @@ account.5.xsi.server_type =
account.5.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2885,16 +2855,6 @@ account.6.xsi.server_type =
account.6.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t21p/y000000000052.cfg b/resources/templates/provision/yealink/t21p/y000000000052.cfg
index 6db7d0e204..f2776843fe 100644
--- a/resources/templates/provision/yealink/t21p/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t21p/y000000000052.cfg
@@ -1393,54 +1393,6 @@ gui_lang.url =
#gui_lang.delete = http://localhost/all, delete all the customized languages.
gui_lang.delete =
-#######################################################################################
-## Time Settings ##
-#######################################################################################
-
-#Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
-#The default time zone name is China(Beijing).
-#local_time.time_zone = +8
-#local_time.time_zone_name = China(Beijing)
-local_time.time_zone = {$yealink_time_zone}
-local_time.time_zone_name = {$yealink_time_zone_name}
-
-#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org.
-local_time.ntp_server1 = {$ntp_server_1}
-local_time.ntp_server2 = {$ntp_server_2}
-
-#Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
-local_time.interval =
-
-#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
-local_time.summer_time =
-
-#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
-
-#Configure the start time of DST. The default value is 1/1/0.
-#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
-#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day.
-#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January.
-local_time.start_time = {$yealink_time_zone_start_time}
-
-#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time.
-local_time.end_time = {$yealink_time_zone_end_time}
-
-#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is blank.
-local_time.offset_time = {$yealink_offset_time}
-
-#Configure the time format; 0-12 Hour, 1-24 Hour (default);
-local_time.time_format = {$yealink_time_format}
-
-#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
-local_time.date_format = {$yealink_date_format}
-
-#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled;
-local_time.dhcp_time =
-
-#Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0.
-local_time.manual_time_enable =
-
#######################################################################################
## Trusted Certificates ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t21p/{$mac}.cfg b/resources/templates/provision/yealink/t21p/{$mac}.cfg
index fe8437faac..f2799dae4c 100644
--- a/resources/templates/provision/yealink/t21p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t21p/{$mac}.cfg
@@ -924,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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
#######################################################################################
@@ -1410,16 +1410,6 @@ account.3.xsi.server_type =
account.3.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -1902,16 +1892,6 @@ account.4.xsi.server_type =
account.4.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2393,16 +2373,6 @@ account.5.xsi.server_type =
account.5.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2884,16 +2854,6 @@ account.6.xsi.server_type =
account.6.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t23g/y000000000044.cfg b/resources/templates/provision/yealink/t23g/y000000000044.cfg
index 6db7d0e204..f2776843fe 100644
--- a/resources/templates/provision/yealink/t23g/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23g/y000000000044.cfg
@@ -1393,54 +1393,6 @@ gui_lang.url =
#gui_lang.delete = http://localhost/all, delete all the customized languages.
gui_lang.delete =
-#######################################################################################
-## Time Settings ##
-#######################################################################################
-
-#Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
-#The default time zone name is China(Beijing).
-#local_time.time_zone = +8
-#local_time.time_zone_name = China(Beijing)
-local_time.time_zone = {$yealink_time_zone}
-local_time.time_zone_name = {$yealink_time_zone_name}
-
-#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org.
-local_time.ntp_server1 = {$ntp_server_1}
-local_time.ntp_server2 = {$ntp_server_2}
-
-#Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
-local_time.interval =
-
-#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
-local_time.summer_time =
-
-#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
-
-#Configure the start time of DST. The default value is 1/1/0.
-#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
-#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day.
-#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January.
-local_time.start_time = {$yealink_time_zone_start_time}
-
-#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time.
-local_time.end_time = {$yealink_time_zone_end_time}
-
-#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is blank.
-local_time.offset_time = {$yealink_offset_time}
-
-#Configure the time format; 0-12 Hour, 1-24 Hour (default);
-local_time.time_format = {$yealink_time_format}
-
-#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
-local_time.date_format = {$yealink_date_format}
-
-#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled;
-local_time.dhcp_time =
-
-#Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0.
-local_time.manual_time_enable =
-
#######################################################################################
## Trusted Certificates ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg
index fe8437faac..f2799dae4c 100644
--- a/resources/templates/provision/yealink/t23g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg
@@ -924,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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
#######################################################################################
@@ -1410,16 +1410,6 @@ account.3.xsi.server_type =
account.3.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -1902,16 +1892,6 @@ account.4.xsi.server_type =
account.4.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2393,16 +2373,6 @@ account.5.xsi.server_type =
account.5.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2884,16 +2854,6 @@ account.6.xsi.server_type =
account.6.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t23p/y000000000044.cfg b/resources/templates/provision/yealink/t23p/y000000000044.cfg
index 6db7d0e204..f2776843fe 100644
--- a/resources/templates/provision/yealink/t23p/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23p/y000000000044.cfg
@@ -1393,54 +1393,6 @@ gui_lang.url =
#gui_lang.delete = http://localhost/all, delete all the customized languages.
gui_lang.delete =
-#######################################################################################
-## Time Settings ##
-#######################################################################################
-
-#Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
-#The default time zone name is China(Beijing).
-#local_time.time_zone = +8
-#local_time.time_zone_name = China(Beijing)
-local_time.time_zone = {$yealink_time_zone}
-local_time.time_zone_name = {$yealink_time_zone_name}
-
-#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org.
-local_time.ntp_server1 = {$ntp_server_1}
-local_time.ntp_server2 = {$ntp_server_2}
-
-#Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
-local_time.interval =
-
-#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
-local_time.summer_time =
-
-#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
-
-#Configure the start time of DST. The default value is 1/1/0.
-#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
-#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day.
-#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January.
-local_time.start_time = {$yealink_time_zone_start_time}
-
-#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time.
-local_time.end_time = {$yealink_time_zone_end_time}
-
-#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is blank.
-local_time.offset_time = {$yealink_offset_time}
-
-#Configure the time format; 0-12 Hour, 1-24 Hour (default);
-local_time.time_format = {$yealink_time_format}
-
-#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
-local_time.date_format = {$yealink_date_format}
-
-#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled;
-local_time.dhcp_time =
-
-#Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0.
-local_time.manual_time_enable =
-
#######################################################################################
## Trusted Certificates ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg
index fe8437faac..f2799dae4c 100644
--- a/resources/templates/provision/yealink/t23p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg
@@ -924,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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
#######################################################################################
@@ -1410,16 +1410,6 @@ account.3.xsi.server_type =
account.3.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -1902,16 +1892,6 @@ account.4.xsi.server_type =
account.4.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2393,16 +2373,6 @@ account.5.xsi.server_type =
account.5.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2884,16 +2854,6 @@ account.6.xsi.server_type =
account.6.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t27p/y000000000045.cfg b/resources/templates/provision/yealink/t27p/y000000000045.cfg
index 23abe90e67..367790dd93 100644
--- a/resources/templates/provision/yealink/t27p/y000000000045.cfg
+++ b/resources/templates/provision/yealink/t27p/y000000000045.cfg
@@ -1393,54 +1393,6 @@ gui_lang.url =
#gui_lang.delete = http://localhost/all, delete all the customized languages.
gui_lang.delete =
-#######################################################################################
-## Time Settings ##
-#######################################################################################
-
-#Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
-#The default time zone name is China(Beijing).
-#local_time.time_zone = +8
-#local_time.time_zone_name = China(Beijing)
-local_time.time_zone = {$yealink_time_zone}
-local_time.time_zone_name = {$yealink_time_zone_name}
-
-#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org.
-local_time.ntp_server1 = {$ntp_server_primary}
-local_time.ntp_server2 = {$ntp_server_secondary}
-
-#Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
-local_time.interval =
-
-#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
-local_time.summer_time =
-
-#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
-
-#Configure the start time of DST. The default value is 1/1/0.
-#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
-#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day.
-#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January.
-local_time.start_time = {$yealink_time_zone_start_time}
-
-#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time.
-local_time.end_time = {$yealink_time_zone_end_time}
-
-#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is blank.
-local_time.offset_time = {$yealink_offset_time}
-
-#Configure the time format; 0-12 Hour, 1-24 Hour (default);
-local_time.time_format = {$yealink_time_format}
-
-#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
-local_time.date_format = {$yealink_date_format}
-
-#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled;
-local_time.dhcp_time =
-
-#Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0.
-local_time.manual_time_enable =
-
#######################################################################################
## Trusted Certificates ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg
index 652f7f84f7..8ab9672b41 100644
--- a/resources/templates/provision/yealink/t27p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg
@@ -924,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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
#######################################################################################
@@ -1410,16 +1410,6 @@ account.3.xsi.server_type =
account.3.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -1902,16 +1892,6 @@ account.4.xsi.server_type =
account.4.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2393,16 +2373,6 @@ account.5.xsi.server_type =
account.5.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2884,16 +2854,6 @@ account.6.xsi.server_type =
account.6.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t29g/y000000000046.cfg b/resources/templates/provision/yealink/t29g/y000000000046.cfg
index ad3b50bacf..cbae0438e6 100644
--- a/resources/templates/provision/yealink/t29g/y000000000046.cfg
+++ b/resources/templates/provision/yealink/t29g/y000000000046.cfg
@@ -1393,54 +1393,6 @@ gui_lang.url =
#gui_lang.delete = http://localhost/all, delete all the customized languages.
gui_lang.delete =
-#######################################################################################
-## Time Settings ##
-#######################################################################################
-
-#Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
-#The default time zone name is China(Beijing).
-#local_time.time_zone = +8
-#local_time.time_zone_name = China(Beijing)
-local_time.time_zone = {$yealink_time_zone}
-local_time.time_zone_name = {$yealink_time_zone_name}
-
-#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org.
-local_time.ntp_server1 = {$ntp_server_1}
-local_time.ntp_server2 = {$ntp_server_2}
-
-#Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
-local_time.interval =
-
-#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
-local_time.summer_time =
-
-#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
-
-#Configure the start time of DST. The default value is 1/1/0.
-#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
-#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day.
-#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January.
-local_time.start_time = {$yealink_time_zone_start_time}
-
-#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time.
-local_time.end_time = {$yealink_time_zone_end_time}
-
-#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is blank.
-local_time.offset_time = {$yealink_offset_time}
-
-#Configure the time format; 0-12 Hour, 1-24 Hour (default);
-local_time.time_format = {$yealink_time_format}
-
-#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
-local_time.date_format = {$yealink_date_format}
-
-#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled;
-local_time.dhcp_time =
-
-#Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0.
-local_time.manual_time_enable =
-
#######################################################################################
## Trusted Certificates ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg
index 76dd7d44fd..13b578d47b 100644
--- a/resources/templates/provision/yealink/t29g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg
@@ -924,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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
#######################################################################################
@@ -1410,16 +1410,6 @@ account.3.xsi.server_type =
account.3.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -1902,16 +1892,6 @@ account.4.xsi.server_type =
account.4.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2393,16 +2373,6 @@ account.5.xsi.server_type =
account.5.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2884,16 +2854,6 @@ account.6.xsi.server_type =
account.6.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t41p/y000000000036.cfg b/resources/templates/provision/yealink/t41p/y000000000036.cfg
index 361bdd39ec..84c81f7ee1 100644
--- a/resources/templates/provision/yealink/t41p/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t41p/y000000000036.cfg
@@ -1433,54 +1433,6 @@ gui_lang.url =
#gui_lang.delete = http://localhost/all, delete all the customized languages.
gui_lang.delete =
-#######################################################################################
-## Time Settings ##
-#######################################################################################
-
-#Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
-#The default time zone name is China(Beijing).
-#local_time.time_zone = +8
-#local_time.time_zone_name = China(Beijing)
-local_time.time_zone = {$yealink_time_zone}
-local_time.time_zone_name = {$yealink_time_zone_name}
-
-#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org.
-local_time.ntp_server1 = {$ntp_server_1}
-local_time.ntp_server2 = {$ntp_server_2}
-
-#Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
-local_time.interval =
-
-#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
-local_time.summer_time =
-
-#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
-
-#Configure the start time of DST. The default value is 1/1/0.
-#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
-#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day.
-#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January.
-local_time.start_time = {$yealink_time_zone_start_time}
-
-#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time.
-local_time.end_time = {$yealink_time_zone_end_time}
-
-#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is blank.
-local_time.offset_time = {$yealink_offset_time}
-
-#Configure the time format; 0-12 Hour, 1-24 Hour (default);
-local_time.time_format = {$yealink_time_format}
-
-#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
-local_time.date_format = {$yealink_date_format}
-
-#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled;
-local_time.dhcp_time =
-
-#Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0.
-local_time.manual_time_enable =
-
#######################################################################################
## Trusted Certificates ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg
index 76dd7d44fd..13b578d47b 100644
--- a/resources/templates/provision/yealink/t41p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg
@@ -924,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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
#######################################################################################
@@ -1410,16 +1410,6 @@ account.3.xsi.server_type =
account.3.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -1902,16 +1892,6 @@ account.4.xsi.server_type =
account.4.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2393,16 +2373,6 @@ account.5.xsi.server_type =
account.5.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2884,16 +2854,6 @@ account.6.xsi.server_type =
account.6.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg
index f1209399da..f76e48b7e8 100644
--- a/resources/templates/provision/yealink/t42g/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg
@@ -1445,54 +1445,6 @@ gui_lang.url =
#gui_lang.delete = http://localhost/all, delete all the customized languages.
gui_lang.delete =
-#######################################################################################
-## Time Settings ##
-#######################################################################################
-
-#Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
-#The default time zone name is China(Beijing).
-#local_time.time_zone = +8
-#local_time.time_zone_name = China(Beijing)
-local_time.time_zone = {$yealink_time_zone}
-local_time.time_zone_name = {$yealink_time_zone_name}
-
-#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org.
-local_time.ntp_server1 = {$ntp_server_primary}
-local_time.ntp_server2 = {$ntp_server_secondary}
-
-#Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
-local_time.interval =
-
-#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
-local_time.summer_time =
-
-#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
-
-#Configure the start time of DST. The default value is 1/1/0.
-#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
-#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day.
-#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January.
-local_time.start_time = {$yealink_time_zone_start_time}
-
-#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time.
-local_time.end_time = {$yealink_time_zone_end_time}
-
-#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is blank.
-local_time.offset_time = {$yealink_offset_time}
-
-#Configure the time format; 0-12 Hour, 1-24 Hour (default);
-local_time.time_format = {$yealink_time_format}
-
-#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
-local_time.date_format = {$yealink_date_format}
-
-#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled;
-local_time.dhcp_time =
-
-#Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0.
-local_time.manual_time_enable =
-
#######################################################################################
## Trusted Certificates ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index a4ddf84f99..449154c0d1 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -924,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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
#######################################################################################
@@ -1410,16 +1410,6 @@ account.3.xsi.server_type =
account.3.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -1902,16 +1892,6 @@ account.4.xsi.server_type =
account.4.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2393,16 +2373,6 @@ account.5.xsi.server_type =
account.5.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2884,16 +2854,6 @@ account.6.xsi.server_type =
account.6.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index 2f3718b22f..6697f6391e 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -940,8 +940,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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
#######################################################################################
@@ -1426,16 +1426,6 @@ account.3.xsi.server_type =
account.3.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -1918,16 +1908,6 @@ account.4.xsi.server_type =
account.4.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2409,16 +2389,6 @@ account.5.xsi.server_type =
account.5.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2900,16 +2870,6 @@ account.6.xsi.server_type =
account.6.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg
index 168f3026c9..f989fc8f9d 100644
--- a/resources/templates/provision/yealink/t48g/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg
@@ -429,45 +429,6 @@ lang.wui =
#Specify the LCD language, the valid values are: English (default), Chinese_S, Chinese_T, German, French, Turkish, Italian, Polish, Spanish and Portuguese.
lang.gui = English
-#######################################################################################
-## Time ##
-#######################################################################################
-#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org.
-local_time.ntp_server1 = {$ntp_server_primary}
-local_time.ntp_server2 = {$ntp_server_secondary}
-
-#Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
-local_time.interval =
-
-#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
-local_time.summer_time =
-
-#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
-
-#Configure the start time of DST. The default value is 1/1/0.
-#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
-#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day.
-#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January.
-local_time.start_time =
-
-#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time.
-local_time.end_time =
-
-#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is 60.
-local_time.offset_time =
-
-#Configure the time format; 0-12 Hour, 1-24 Hour (default);
-local_time.time_format =
-
-#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
-local_time.date_format =
-
-#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled;
-local_time.dhcp_time =
-
-local_time.manual_time_enable = 0
-
#######################################################################################
## Auto Redial ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg
index df85cc2752..ba70fd2ed6 100644
--- a/resources/templates/provision/yealink/t48g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg
@@ -924,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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
#######################################################################################
@@ -1410,16 +1410,6 @@ account.3.xsi.server_type =
account.3.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -1901,16 +1891,6 @@ account.4.xsi.server_type =
account.4.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2392,16 +2372,6 @@ account.5.xsi.server_type =
account.5.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2883,16 +2853,6 @@ account.6.xsi.server_type =
account.6.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t49g/y000000000051.cfg b/resources/templates/provision/yealink/t49g/y000000000051.cfg
index fd7b637bcd..9955fcbcea 100644
--- a/resources/templates/provision/yealink/t49g/y000000000051.cfg
+++ b/resources/templates/provision/yealink/t49g/y000000000051.cfg
@@ -1445,54 +1445,6 @@ gui_lang.url =
#gui_lang.delete = http://localhost/all, delete all the customized languages.
gui_lang.delete =
-#######################################################################################
-## Time Settings ##
-#######################################################################################
-
-#Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
-#The default time zone name is China(Beijing).
-#local_time.time_zone = +8
-#local_time.time_zone_name = China(Beijing)
-local_time.time_zone = {$yealink_time_zone}
-local_time.time_zone_name = {$yealink_time_zone_name}
-
-#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org.
-local_time.ntp_server1 = {$ntp_server_1}
-local_time.ntp_server2 = {$ntp_server_2}
-
-#Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
-local_time.interval =
-
-#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
-local_time.summer_time =
-
-#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
-
-#Configure the start time of DST. The default value is 1/1/0.
-#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
-#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day.
-#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January.
-local_time.start_time = {$yealink_time_zone_start_time}
-
-#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time.
-local_time.end_time = {$yealink_time_zone_end_time}
-
-#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is blank.
-local_time.offset_time = {$yealink_offset_time}
-
-#Configure the time format; 0-12 Hour, 1-24 Hour (default);
-local_time.time_format = {$yealink_time_format}
-
-#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
-local_time.date_format = {$yealink_date_format}
-
-#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled;
-local_time.dhcp_time =
-
-#Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0.
-local_time.manual_time_enable =
-
#######################################################################################
## Trusted Certificates ##
#######################################################################################
diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg
index 168444f7ad..89187ba759 100644
--- a/resources/templates/provision/yealink/t49g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg
@@ -924,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 = {$time_zone}
-local_time.time_zone_name = {$time_zone_name}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
#######################################################################################
@@ -1410,16 +1410,6 @@ account.3.xsi.server_type =
account.3.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -1902,16 +1892,6 @@ account.4.xsi.server_type =
account.4.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2393,16 +2373,6 @@ account.5.xsi.server_type =
account.5.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################
@@ -2884,16 +2854,6 @@ account.6.xsi.server_type =
account.6.xsi.port =
-#######################################################################################
-## Time ##
-#######################################################################################
-#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 =
-
-
#######################################################################################
## NETWORK ##
#######################################################################################