From 3234d9959b7a1a87f7936e1bfa0930f6e64ebca9 Mon Sep 17 00:00:00 2001
From: Mark J Crane <markjcrane@gmail.com>
Date: Tue, 19 May 2020 13:35:26 -0600
Subject: [PATCH] Fanvil - Add some changes to x6 and x7 templates

---
 .../templates/provision/fanvil/x6/{$mac}.cfg  |  53 +--
 .../templates/provision/fanvil/x7/{$mac}.cfg  | 450 +++++++++---------
 2 files changed, 250 insertions(+), 253 deletions(-)

diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index 1bd368a520..0e9ad7b868 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -162,6 +162,8 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
+            {if $account.1.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.1.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -170,13 +172,9 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            
             {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
             {if $account.1.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            {if $account.1.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $account.1.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
-            
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -206,7 +204,7 @@
             <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -307,7 +305,8 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            
+            {if $account.2.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.2.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -316,13 +315,9 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-           
             {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
             {if $account.2.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            {if $account.2.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $account.2.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
-            
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -352,7 +347,7 @@
             <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -453,7 +448,8 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            
+            {if $account.3.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.3.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -462,13 +458,9 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            
             {if $account.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
             {if $account.3.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            {if $account.3.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $account.3.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
-            
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -500,7 +492,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -601,7 +593,8 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            
+            {if $account.4.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.4.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -610,13 +603,9 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-           
             {if $account.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
             {if $account.4.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            {if $account.4.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $account.4.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
-            
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -646,7 +635,7 @@
             <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -747,7 +736,8 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            
+            {if $account.5.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.5.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -756,13 +746,9 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-             
             {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
             {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
-            {if $account.5.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $account.5.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
-            
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -792,7 +778,7 @@
             <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -893,7 +879,8 @@
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            
+            {if $account.6.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.6.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -902,13 +889,9 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort> 
-             
             {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}
-            {if $account.6.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
-            {if $account.6.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
-            
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -938,7 +921,7 @@
             <SendANOffCode>*67</SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
diff --git a/resources/templates/provision/fanvil/x7/{$mac}.cfg b/resources/templates/provision/fanvil/x7/{$mac}.cfg
index 09089e6e22..151dab5bb9 100644
--- a/resources/templates/provision/fanvil/x7/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x7/{$mac}.cfg
@@ -11,7 +11,7 @@
         <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}</SecondaryDNS>
         <EnableDHCP>1</EnableDHCP>
         <DHCPAutoDNS>1</DHCPAutoDNS>
-        <DHCPAutoTime>0</DHCPAutoTime>
+        <DHCPAutoTime>1</DHCPAutoTime>
         <DHCPOption100-101>1</DHCPOption100-101>
         <UseVendorClassID>0</UseVendorClassID>
         <VendorClassID>Fanvil X7</VendorClassID>
@@ -29,9 +29,9 @@
         <DHCP6AutoDNS>1</DHCP6AutoDNS>
         <DHCP6AutoTime>0</DHCP6AutoTime>
         <UseVendor6ClassID>0</UseVendor6ClassID>
-        <Vendor6ClassID></Vendor6ClassID>
+        <Vendor6ClassID>Fanvil X7</Vendor6ClassID>
         <wifi>
-            <WIFIEnable>0</WIFIEnable>
+            <WIFIEnable>{$fanvil_wifi_enable}</WIFIEnable>
         </wifi>
     </net>
     <mm>
@@ -50,8 +50,8 @@
         <VAD>0</VAD>
         <H264PayloadType>117</H264PayloadType>
         <ResvAudioBand>0</ResvAudioBand>
-        <RTPInitialPort>10000</RTPInitialPort>
-        <RTPPortQuantity>1000</RTPPortQuantity>
+        <RTPInitialPort>16384</RTPInitialPort>
+        <RTPPortQuantity>16384</RTPPortQuantity>
         <RTPKeepAlive>1</RTPKeepAlive>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
@@ -75,8 +75,8 @@
         <RecordTone>440/500,0/5000</RecordTone>
         <AutoAnswerTone></AutoAnswerTone>
         <capability>
-            <AudioCodecSets>PCMU,PCMA,G726-16,G726-24,G726-32,G726-40,G729,G723,iLBC</AudioCodecSets>
-            <VideoCodecSets>H264</VideoCodecSets>
+            <AudioCodecSets>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,opus,G722</AudioCodecSets>
+            <VideoCodecSets>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}H264{/if}</VideoCodecSets>
             <VideoFrameRate>25</VideoFrameRate>
             <VideoBitRate>2000000</VideoBitRate>
             <VideoResolution>4</VideoResolution>
@@ -84,9 +84,9 @@
         </capability>
     </mm>
     <sip>
-        <SIPPort>5060</SIPPort>
-        <STUNServer></STUNServer>
-        <STUNPort>3478</STUNPort>
+        <SIPPort>{$sip_port}</SIPPort>
+        <STUNServer>{$fanvil_stun_server}</STUNServer>
+        <STUNPort>{$fanvil_stun_port}</STUNPort>
         <STUNRefreshTime>50</STUNRefreshTime>
         <SIPWaitStunTime>800</SIPWaitStunTime>
         <ExternNATAddrs></ExternNATAddrs>
@@ -98,28 +98,28 @@
         <EnableRFC4475>1</EnableRFC4475>
         <StrictUAMatch>1</StrictUAMatch>
         <CSTAEnable>0</CSTAEnable>
-        <NotifyReboot>0</NotifyReboot>
+        <NotifyReboot>1</NotifyReboot>
         <line index="1">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.1.user_id}</PhoneNumber>
+            <DisplayName>{$account.1.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.1.server_address}</RegisterAddr>
+            <RegisterPort>{$account.1.sip_port}</RegisterPort>
+            <RegisterUser>{$account.1.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.1.password}</RegisterPswd>
+            <RegisterTTL>{$account.1.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.1.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.1.sip_port}</ProxyPort>
+            <ProxyUser>{$account.1.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -143,7 +143,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line1)}{$fanvil_ringtone_line1}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -158,14 +158,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.1.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.1.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.1.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -174,15 +174,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.1.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>
@@ -193,23 +195,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,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -251,26 +253,26 @@
             <EnableDeal180>1</EnableDeal180>
         </line>
         <line index="2">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.2.user_id}</PhoneNumber>
+            <DisplayName>{$account.2.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.2.server_address}</RegisterAddr>
+            <RegisterPort>{$account.2.sip_port}</RegisterPort>
+            <RegisterUser>{$account.2.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.2.password}</RegisterPswd>
+            <RegisterTTL>{$account.2.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.2.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.2.sip_port}</ProxyPort>
+            <ProxyUser>{$account.2.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -294,7 +296,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line2)}{$fanvil_ringtone_line2}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -309,14 +311,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.2.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.2.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.2.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -325,15 +327,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.2.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>
@@ -344,23 +348,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,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -402,26 +406,26 @@
             <EnableDeal180>1</EnableDeal180>
         </line>
         <line index="3">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.3.user_id}</PhoneNumber>
+            <DisplayName>{$account.3.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.3.server_address}</RegisterAddr>
+            <RegisterPort>{$account.3.sip_port}</RegisterPort>
+            <RegisterUser>{$account.3.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.3.password}</RegisterPswd>
+            <RegisterTTL>{$account.3.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.3.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.3.sip_port}</ProxyPort>
+            <ProxyUser>{$account.3.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -445,7 +449,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line3)}{$fanvil_ringtone_line3}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -460,14 +464,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.3.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.3.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.3.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -476,15 +480,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.3.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>
@@ -495,23 +501,25 @@
             <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>*67</SendANOnCode>
+            <SendANOffCode>*67</SendANOffCode>
             <SendANOnCode></SendANOnCode>
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -553,26 +561,26 @@
             <EnableDeal180>1</EnableDeal180>
         </line>
         <line index="4">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.4.user_id}</PhoneNumber>
+            <DisplayName>{$account.4.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.4.server_address}</RegisterAddr>
+            <RegisterPort>{$account.4.sip_port}</RegisterPort>
+            <RegisterUser>{$account.4.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.4.password}</RegisterPswd>
+            <RegisterTTL>{$account.1.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.4.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.4.sip_port}</ProxyPort>
+            <ProxyUser>{$account.4.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -596,7 +604,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line4)}{$fanvil_ringtone_line4}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -611,14 +619,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.4.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.4.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.4.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -627,15 +635,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.4.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>
@@ -646,23 +656,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,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -704,26 +714,26 @@
             <EnableDeal180>1</EnableDeal180>
         </line>
         <line index="5">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.5.user_id}</PhoneNumber>
+            <DisplayName>{$account.5.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.5.server_address}</RegisterAddr>
+            <RegisterPort>{$account.5.sip_port}</RegisterPort>
+            <RegisterUser>{$account.5.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.5.password}</RegisterPswd>
+            <RegisterTTL>{$account.5.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.5.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.5.sip_port}</ProxyPort>
+            <ProxyUser>{$account.5.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
@@ -747,7 +757,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line5)}{$fanvil_ringtone_line5}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -762,7 +772,7 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.5.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
@@ -778,15 +788,17 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.5.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>
@@ -797,23 +809,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,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -855,26 +867,26 @@
             <EnableDeal180>1</EnableDeal180>
         </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>{$aaccount.6.uth_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>
@@ -898,7 +910,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>
@@ -913,14 +925,14 @@
             <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>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.6.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.6.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -928,16 +940,18 @@
             <PresenceMode>0</PresenceMode>
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
-            <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            <SignalPort>5060</SignalPort> 
+            {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>
@@ -948,23 +962,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,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>