From b29b9cdac94af6d6934d3032067c8456cd4a30ce Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Sat, 5 Sep 2020 13:17:13 -0600
Subject: [PATCH] Add account.6 settings, add opus, and service codes.

Update {$mac}.cfg (#5438)
---
 .../templates/provision/fanvil/x3u/{$mac}.cfg | 181 ++++++------------
 1 file changed, 60 insertions(+), 121 deletions(-)

diff --git a/resources/templates/provision/fanvil/x3u/{$mac}.cfg b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
index e420591dd0..c5c50cd106 100644
--- a/resources/templates/provision/fanvil/x3u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
@@ -512,8 +512,6 @@
             <ANCOffSvcCode></ANCOffSvcCode>
             <SendANOnCode>*67</SendANOnCode>
             <SendANOffCode>*67</SendANOffCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
@@ -877,26 +875,26 @@
             <SessionTimerT4>5000</SessionTimerT4>
         </line>
         <line index="6">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.6.user_id}</PhoneNumber>
+            <DisplayName>{$account.6.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.6.server_address}</RegisterAddr>
+            <RegisterPort>{$account.6.sip_port}</RegisterPort>
+            <RegisterUser>{$account.6.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.6.password}</RegisterPswd>
+            <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.6.sip_port}</ProxyPort>
+            <ProxyUser>{$account.6.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -920,7 +918,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line6)}{$fanvil_ringtone_line6}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -935,7 +933,7 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.6.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
@@ -951,15 +949,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.6.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.6.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.6.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>*97</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -970,23 +970,23 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
-            <DNDOnSvcCode></DNDOnSvcCode>
-            <DNDOffSvcCode></DNDOffSvcCode>
-            <CFUOnSvcCode></CFUOnSvcCode>
-            <CFUOffSvcCode></CFUOffSvcCode>
-            <CFBOnSvcCode></CFBOnSvcCode>
-            <CFBOffSvcCode></CFBOffSvcCode>
-            <CFNOnSvcCode></CFNOnSvcCode>
-            <CFNOffSvcCode></CFNOffSvcCode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode>*78</DNDOnSvcCode>
+            <DNDOffSvcCode>*79</DNDOffSvcCode>
+            <CFUOnSvcCode>*72</CFUOnSvcCode>
+            <CFUOffSvcCode>*73</CFUOffSvcCode>
+            <CFBOnSvcCode>*72</CFBOnSvcCode>
+            <CFBOffSvcCode>*73</CFBOffSvcCode>
+            <CFNOnSvcCode>*72</CFNOnSvcCode>
+            <CFNOffSvcCode>*73</CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode></SendANOnCode>
-            <SendANOffCode></SendANOffCode>
+            <SendANOnCode>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1245,16 +1245,18 @@
             <RingType></RingType>
         </volume>
         <date>
-            <EnableSNTP>1</EnableSNTP>
-            <SNTPServer>0.pool.ntp.org</SNTPServer>
-            <SecondSNTPServer>time.nist.gov</SecondSNTPServer>
-            <TimeZone>32</TimeZone>
-            <TimeZoneName>UTC+8</TimeZoneName>
+            <EnableSNTP>{if isset($fanvil_enable_sntp)}{$fanvil_enable_sntp}{else}1{/if}</EnableSNTP>
+            <SNTPServer>{$ntp_server_primary}</SNTPServer>
+            <SecondSNTPServer>{$ntp_server_secondary}</SecondSNTPServer>
+            <TimeZone>{$fanvil_time_zone}</TimeZone>
+            <TimeZoneName>{$fanvil_time_zone_name}</TimeZoneName>
+            <Enable_DST>{$fanvil_enable_dst}</Enable_DST>
+            <DST_Fixed_Type>{if isset($fanvil_dst_fixed_type)}{$fanvil_dst_fixed_type}{else}0{/if}</DST_Fixed_Type>
             <SNTPTimeout>60</SNTPTimeout>
-            <DSTType>0</DSTType>
-            <DSTLocation>0</DSTLocation>
+            <DSTType>1</DSTType>
+            <DSTLocation>{if isset($fanvil_location)}{$fanvil_location}{else}4{/if}</DSTLocation>
             <DSTRuleMode>0</DSTRuleMode>
-            <DSTMinOffset>60</DSTMinOffset>
+            <DSTMinOffset>{if isset($fanvil_dst_minute_offset)}{$fanvil_dst_minute_offset}{else}60{/if}</DSTMinOffset>
             <DSTStartMon>3</DSTStartMon>
             <DSTStartWeek>5</DSTStartWeek>
             <DSTStartWday>0</DSTStartWday>
@@ -1673,84 +1675,21 @@
         <DSSExtend4IP></DSSExtend4IP>
         <DSSExtend5MAC></DSSExtend5MAC>
         <DSSExtend5IP></DSSExtend5IP>
-        <SidekeyConfig1 index="1">
-            <Type>2</Type>
-            <Value>SIP1 </Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="2">
-            <Type>2</Type>
-            <Value>SIP2 </Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="3">
-            <Type>2</Type>
-            <Value>SIP3</Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <dssSoft index="1">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="2">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="3">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="4">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="5">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="6">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="7">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="8">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="9">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="10">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
+        {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}
+        {foreach $keys["programmable"] as $row}
+            <dssSoft 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>
+            </dssSoft>
+        {/foreach}
     </dsskey>
     <web>
         <WebServerType>0</WebServerType>