From 0512d9040b74552400fad2b4e9e5131526bf911b Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Wed, 19 Aug 2020 18:58:50 -0600
Subject: [PATCH] Update {$mac}.cfg (#5414)

small discrepancies fixed
---
 .../templates/provision/fanvil/x5u/{$mac}.cfg | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/resources/templates/provision/fanvil/x5u/{$mac}.cfg b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
index c7f918906c..9e423a47c1 100644
--- a/resources/templates/provision/fanvil/x5u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
@@ -926,7 +926,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>{if isset($fanvil_ringtone_line)}{$fanvil_ringtone_line6}{else}default{/if}</RingType>
+            <RingType>{if isset($fanvil_ringtone_line6)}{$fanvil_ringtone_line6}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -994,7 +994,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1151,7 +1151,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1308,7 +1308,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1465,7 +1465,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1588,7 +1588,6 @@
             {if $account.10.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.10.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
             {if $account.10.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            <Transport>0</Transport>
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1623,7 +1622,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1780,7 +1779,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1937,7 +1936,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2094,7 +2093,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2251,7 +2250,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2408,7 +2407,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2565,7 +2564,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2665,8 +2664,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>
@@ -2704,12 +2703,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>
@@ -2866,7 +2865,7 @@
             <DialerCallSoftkey>send;2aB;delete;exit;</DialerCallSoftkey>
             <DialerXferSoftkey>delete;xfer;send;exit;</DialerXferSoftkey>
             <DialerCfwdSoftkey>send;2aB;delete;exit;</DialerCfwdSoftkey>
-            <DesktopClick>history;status;none;none;none;</DesktopClick>
+            <DesktopClick>{if isset($fanvil_softkey_desktopclick)}{$fanvil_softkey_desktopclick}{else}history;status;none;none;none;{/if}</DesktopClick>
             <DailerClick>pline;nline;none;none;none;</DailerClick>
             <CallClick>none;none;voldown;volup;none;</CallClick>
             <DesktopLongPress>status;none;none;none;reset;</DesktopLongPress>
@@ -3498,12 +3497,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>
@@ -3522,8 +3521,8 @@
         <TLSVersion>0</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>
@@ -3628,7 +3627,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>