From 9cd30165d4e689d11e4dbe17785109e7c4e68cb1 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Tue, 15 Mar 2016 16:15:32 -0600 Subject: [PATCH] Change daylight_savings_start_date to daylight_savings_start_day as it is more accurate for representing the data. Add daylight_savings_start_time and daylight_savings_stop_time --- app/provision/app_defaults.php | 18 ++++++++++++++++-- .../templates/provision/polycom/4.x/{$mac}.cfg | 8 ++++---- .../templates/provision/polycom/5.x/{$mac}.cfg | 8 ++++---- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/app/provision/app_defaults.php b/app/provision/app_defaults.php index ad0f110d12..959d6e4cb3 100644 --- a/app/provision/app_defaults.php +++ b/app/provision/app_defaults.php @@ -166,13 +166,20 @@ $array[$x]['default_setting_description'] = ''; $x++; $array[$x]['default_setting_category'] = 'provision'; - $array[$x]['default_setting_subcategory'] = 'daylight_savings_start_date'; + $array[$x]['default_setting_subcategory'] = 'daylight_savings_start_day'; $array[$x]['default_setting_name'] = 'text'; $array[$x]['default_setting_value'] = '13'; $array[$x]['default_setting_enabled'] = 'true'; $array[$x]['default_setting_description'] = ''; $x++; $array[$x]['default_setting_category'] = 'provision'; + $array[$x]['default_setting_subcategory'] = 'daylight_savings_start_time'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '2'; + $array[$x]['default_setting_enabled'] = 'true'; + $array[$x]['default_setting_description'] = ''; + $x++; + $array[$x]['default_setting_category'] = 'provision'; $array[$x]['default_setting_subcategory'] = 'daylight_savings_stop_month'; $array[$x]['default_setting_name'] = 'text'; $array[$x]['default_setting_value'] = '11'; @@ -180,13 +187,20 @@ $array[$x]['default_setting_description'] = ''; $x++; $array[$x]['default_setting_category'] = 'provision'; - $array[$x]['default_setting_subcategory'] = 'daylight_savings_stop_date'; + $array[$x]['default_setting_subcategory'] = 'daylight_savings_stop_day'; $array[$x]['default_setting_name'] = 'text'; $array[$x]['default_setting_value'] = '6'; $array[$x]['default_setting_enabled'] = 'true'; $array[$x]['default_setting_description'] = ''; $x++; $array[$x]['default_setting_category'] = 'provision'; + $array[$x]['default_setting_subcategory'] = 'daylight_savings_stop_time'; + $array[$x]['default_setting_name'] = 'text'; + $array[$x]['default_setting_value'] = '2'; + $array[$x]['default_setting_enabled'] = 'true'; + $array[$x]['default_setting_description'] = ''; + $x++; + $array[$x]['default_setting_category'] = 'provision'; $array[$x]['default_setting_subcategory'] = 'http_domain_filter'; $array[$x]['default_setting_name'] = 'text'; $array[$x]['default_setting_value'] = 'false'; diff --git a/resources/templates/provision/polycom/4.x/{$mac}.cfg b/resources/templates/provision/polycom/4.x/{$mac}.cfg index 12e76e784e..7fe6adae58 100644 --- a/resources/templates/provision/polycom/4.x/{$mac}.cfg +++ b/resources/templates/provision/polycom/4.x/{$mac}.cfg @@ -44,13 +44,13 @@ tcpIpApp.sntp.daylightSavings.enable="1" tcpIpApp.sntp.daylightSavings.fixedDayEnable="0" tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}" - tcpIpApp.sntp.daylightSavings.start.date="{$daylight_savings_start_date}" - tcpIpApp.sntp.daylightSavings.start.time="2" + tcpIpApp.sntp.daylightSavings.start.date="{$daylight_savings_start_day}" + tcpIpApp.sntp.daylightSavings.start.time="{$daylight_savings_start_time}" tcpIpApp.sntp.daylightSavings.start.dayOfWeek="1" tcpIpApp.sntp.daylightSavings.start.dayOfWeek.lastInMonth="0" tcpIpApp.sntp.daylightSavings.stop.month="{$daylight_savings_stop_month}" - tcpIpApp.sntp.daylightSavings.stop.date="{$daylight_savings_stop_date}" - tcpIpApp.sntp.daylightSavings.stop.time="2" + tcpIpApp.sntp.daylightSavings.stop.date="{$daylight_savings_stop_day}" + tcpIpApp.sntp.daylightSavings.stop.time="{$daylight_savings_stop_time}" tcpIpApp.sntp.daylightSavings.stop.dayOfWeek="0" tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0" /> diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg index 12e76e784e..7fe6adae58 100755 --- a/resources/templates/provision/polycom/5.x/{$mac}.cfg +++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg @@ -44,13 +44,13 @@ tcpIpApp.sntp.daylightSavings.enable="1" tcpIpApp.sntp.daylightSavings.fixedDayEnable="0" tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}" - tcpIpApp.sntp.daylightSavings.start.date="{$daylight_savings_start_date}" - tcpIpApp.sntp.daylightSavings.start.time="2" + tcpIpApp.sntp.daylightSavings.start.date="{$daylight_savings_start_day}" + tcpIpApp.sntp.daylightSavings.start.time="{$daylight_savings_start_time}" tcpIpApp.sntp.daylightSavings.start.dayOfWeek="1" tcpIpApp.sntp.daylightSavings.start.dayOfWeek.lastInMonth="0" tcpIpApp.sntp.daylightSavings.stop.month="{$daylight_savings_stop_month}" - tcpIpApp.sntp.daylightSavings.stop.date="{$daylight_savings_stop_date}" - tcpIpApp.sntp.daylightSavings.stop.time="2" + tcpIpApp.sntp.daylightSavings.stop.date="{$daylight_savings_stop_day}" + tcpIpApp.sntp.daylightSavings.stop.time="{$daylight_savings_stop_time}" tcpIpApp.sntp.daylightSavings.stop.dayOfWeek="0" tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0" />