From 8f673a31441af1e7ae56dd86258a644af51e2280 Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Thu, 10 Sep 2020 15:50:40 -0600
Subject: [PATCH] Add Fanvil variables (#5451)

Added the following variables fanvil_default_answer_mode, fanvil_default_ringtone_ext, fanvil_default_ringtone_ext2, fanvil_syslog_enable, fanvil_syslog_server, fanvil_stun_server, and fanvil_firmware_config.
---
 .../templates/provision/fanvil/x4u/{$mac}.cfg | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/resources/templates/provision/fanvil/x4u/{$mac}.cfg b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
index 7ddae979f8..038ef38a77 100644
--- a/resources/templates/provision/fanvil/x4u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
@@ -2037,8 +2037,8 @@
             <CallerNameType>0</CallerNameType>
             <MuteForRing>0</MuteForRing>
             <AutoHandleVideo>0</AutoHandleVideo>
-            <DefaultAnsMode>1</DefaultAnsMode>
-            <DefaultDialMode>1</DefaultDialMode>
+            <DefaultAnsMode>{$fanvil_default_answer_mode}</DefaultAnsMode>
+            <DefaultDialMode>{$fanvil_default_dial_mode}</DefaultDialMode>
             <HoldToTransfer>0</HoldToTransfer>
             <EnablePreDial>1</EnablePreDial>
             <DefaultExtLine>1</DefaultExtLine>
@@ -2076,12 +2076,12 @@
         <alertInfo index="1">
             <Text></Text>
             <Line>-1</Line>
-            <RingType>Type 1</RingType>
+            <RingType>{if isset($fanvil_default_ringtone_ext)}{$fanvil_default_ringtone_ext}{else}Type 1{/if}</RingType>
         </alertInfo>
         <alertInfo index="2">
             <Text></Text>
             <Line>-1</Line>
-            <RingType>Type 1</RingType>
+            <RingType>{if isset($fanvil_default_ringtone_ext2)}{$fanvil_default_ringtone_ext2}{else}Type 1{/if}</RingType>
         </alertInfo>
         <alertInfo index="3">
             <Text></Text>
@@ -2626,14 +2626,16 @@
         <DSSExtend4IP></DSSExtend4IP>
         <DSSExtend5MAC></DSSExtend5MAC>
         <DSSExtend5IP></DSSExtend5IP>
-        {foreach $keys["line"] as $row}
-            <SidekeyConfig1 index="{$row.device_key_id}">
-                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
-                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
-                <Title>{$row.device_key_label}</Title>
-                <ICON>{$row.device_key_icon}</ICON>
-            </SidekeyConfig1>
-        {/foreach}
+        <dssSide index="1">
+            {foreach $keys["line"] as $row}
+	            <Fkey index="{$row.device_key_id}">
+	                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+	                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+	                <Title>{$row.device_key_label}</Title>
+	                <ICON>{$row.device_key_icon}</ICON>
+	            </Fkey>
+            {/foreach}
+        </dssSide>
         
         {strip}{*-- Each Internal Index contains 6 keys --*}{/strip}        
         <internal index="1">
@@ -2729,12 +2731,12 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>stdout</OutputDevice>
+        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
-        <SyslogServer>0.0.0.0</SyslogServer>
-        <SyslogServerPort>514</SyslogServerPort>
+        <SyslogServer>{if isset($fanvil_syslog_server)}{$fanvil_syslog_server}{else}0.0.0.0{/if}</SyslogServer>
+        <SyslogServerPort>{if isset($fanvil_syslog_server_port)}{$fanvil_syslog_server_port}{else}514{/if}</SyslogServerPort>
     </log>
     <tr069>
         <TR069Tone>1</TR069Tone>
@@ -2750,11 +2752,11 @@
         <CPEUserName>dps</CPEUserName>
         <CPEPassword>dps</CPEPassword>
         <PeriodixInterval>3600</PeriodixInterval>
-        <TLSVersion>0</TLSVersion>
+        <TLSVersion>2</TLSVersion>
         <AreaCode>020</AreaCode>
         <STUNEnable>0</STUNEnable>
-        <STUNServerAddr></STUNServerAddr>
-        <STUNServerPort>3478</STUNServerPort>
+        <STUNServerAddr>{$fanvil_stun_server}</STUNServerAddr>
+        <STUNServerPort>{$fanvil_stun_port}</STUNServerPort>
         <STUNLocalPort>30000</STUNLocalPort>
     </tr069>
     <hotspot>
@@ -2843,7 +2845,7 @@
         <SaveProvisionInfo>1</SaveProvisionInfo>
         <CheckFailTimes>5</CheckFailTimes>
         <FlashServerIP>{if isset($fanvil_provision_url)}{$fanvil_provision_url}{else}https://{$domain_name}/app/provision{/if}</FlashServerIP>
-        <FlashFileName></FlashFileName>
+        <FlashFileName>{$fanvil_firmware_config}</FlashFileName>
         <FlashProtocol>5</FlashProtocol>
         <FlashMode>1</FlashMode>
         <FlashInterval>1</FlashInterval>