From 43f668d99ee0f3ffae95d3359b873dca5a27c926 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Tue, 20 Feb 2018 02:03:39 -0500
Subject: [PATCH] Update {$mac}.cfg

---
 .../templates/provision/fanvil/x6/{$mac}.cfg   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index d5449d5cf4..f839822097 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -1105,15 +1105,21 @@
             <HandFreeRingVol>4</HandFreeRingVol>
             <RingType>Type 2</RingType>
         </volume>
+                  
         <date>
             <EnableSNTP>1</EnableSNTP>
             <SNTPServer>{$ntp_server_primary}</SNTPServer>
             <SecondSNTPServer>{$ntp_server_secondary}</SecondSNTPServer>
-            <TimeZone>32</TimeZone>
-            <TimeZoneName>UTC+8</TimeZoneName>
+            
+            <TimeZone>{$fanvil_time_zone}</TimeZone>
+            <DSTLocation>{$fanvil_location}</DSTLocation>
+            <TimeZoneName>{$fanvil_time_zone_name}</TimeZoneName>
+            <Enable_DST>{$fanvil_enable_dst}</Enable_DST>
+            <DST_Fixed_Type>2</DST_Fixed_Type>
+                        
             <SNTPTimeout>60</SNTPTimeout>
-            <DSTType>0</DSTType>
-            <DSTLocation>0</DSTLocation>
+            <DSTType>1</DSTType>
+            <DSTLocation>4</DSTLocation>
             <DSTRuleMode>0</DSTRuleMode>
             <DSTMinOffset>60</DSTMinOffset>
             <DSTStartMon>3</DSTStartMon>
@@ -1130,8 +1136,8 @@
             
             <TimeDisplayStyle>{if isset($fanvil_time_display)}1{else}0{/if}</TimeDisplayStyle>
             
-            <DateDisplayStyle>0</DateDisplayStyle>
-            <DateSeparator>0</DateSeparator>
+            <DateDisplayStyle>6</DateDisplayStyle>
+            <DateSeparator>1</DateSeparator>
         </timeDisplay>
         <screenSaver>
             <ScreenSaverType>0</ScreenSaverType>