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 @@
1
0
0
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -170,13 +172,9 @@
1
0
5060
-
{if $account.1.sip_transport == 'udp'}0{/if}
{if $account.1.sip_transport == 'tcp'}1{/if}
{if $account.1.sip_transport == 'tls'}2{/if}
- {if $account.1.sip_transport == 'dns srv'}1{/if}
- {if $account.1.sip_transport == 'dns srv'}1{/if}
-
0
0
@@ -206,7 +204,7 @@
*67
- opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
@@ -307,7 +305,8 @@
1
0
0
-
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -316,13 +315,9 @@
1
0
5060
-
{if $account.2.sip_transport == 'udp'}0{/if}
{if $account.2.sip_transport == 'tcp'}1{/if}
{if $account.2.sip_transport == 'tls'}2{/if}
- {if $account.2.sip_transport == 'dns srv'}1{/if}
- {if $account.2.sip_transport == 'dns srv'}1{/if}
-
0
0
@@ -352,7 +347,7 @@
*67
- opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
@@ -453,7 +448,8 @@
1
0
0
-
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -462,13 +458,9 @@
1
0
5060
-
{if $account.3.sip_transport == 'udp'}0{/if}
{if $account.3.sip_transport == 'tcp'}1{/if}
{if $account.3.sip_transport == 'tls'}2{/if}
- {if $account.3.sip_transport == 'dns srv'}1{/if}
- {if $account.3.sip_transport == 'dns srv'}1{/if}
-
0
0
@@ -500,7 +492,7 @@
- opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
@@ -601,7 +593,8 @@
1
0
0
-
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -610,13 +603,9 @@
1
0
5060
-
{if $account.4.sip_transport == 'udp'}0{/if}
{if $account.4.sip_transport == 'tcp'}1{/if}
{if $account.4.sip_transport == 'tls'}2{/if}
- {if $account.4.sip_transport == 'dns srv'}1{/if}
- {if $account.4.sip_transport == 'dns srv'}1{/if}
-
0
0
@@ -646,7 +635,7 @@
*67
- opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
@@ -747,7 +736,8 @@
1
0
0
-
+ {if $account.5.sip_transport == 'dns srv'}1{/if}
+ {if $account.5.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -756,13 +746,9 @@
1
0
5060
-
{if $account.5.sip_transport == 'udp'}0{/if}
{if $account.5.sip_transport == 'tcp'}1{/if}
{if $account.5.sip_transport == 'tls'}2{/if}
- {if $account.5.sip_transport == 'dns srv'}1{/if}
- {if $account.5.sip_transport == 'dns srv'}1{/if}
-
0
0
@@ -792,7 +778,7 @@
*67
- opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
@@ -893,7 +879,8 @@
1
0
0
-
+ {if $account.6.sip_transport == 'dns srv'}1{/if}
+ {if $account.6.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -902,13 +889,9 @@
1
0
5060
-
{if $account.6.sip_transport == 'udp'}0{/if}
{if $account.6.sip_transport == 'tcp'}1{/if}
{if $account.6.sip_transport == 'tls'}2{/if}
- {if $account.6.sip_transport == 'dns srv'}1{/if}
- {if $account.6.sip_transport == 'dns srv'}1{/if}
-
0
0
@@ -938,7 +921,7 @@
*67
- opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
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 @@
{if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}
1
1
- 0
+ 1
1
0
Fanvil X7
@@ -29,9 +29,9 @@
1
0
0
-
+ Fanvil X7
- 0
+ {$fanvil_wifi_enable}
@@ -50,8 +50,8 @@
0
117
0
- 10000
- 1000
+ 16384
+ 16384
1
@@ -75,8 +75,8 @@
440/500,0/5000
- PCMU,PCMA,G726-16,G726-24,G726-32,G726-40,G729,G723,iLBC
- H264
+ PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,opus,G722
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}H264{/if}
25
2000000
4
@@ -84,9 +84,9 @@
- 5060
-
- 3478
+ {$sip_port}
+ {$fanvil_stun_server}
+ {$fanvil_stun_port}
50
800
@@ -98,28 +98,28 @@
1
1
0
- 0
+ 1
-
-
+ {$account.1.user_id}
+ {$account.1.display_name}
-
- 5060
-
-
- 3600
+ {$account.1.server_address}
+ {$account.1.sip_port}
+ {$account.1.auth_id}
+ {$account.1.password}
+ {$account.1.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.1.password)}1{else}0{/if}
+ {$account.1.outbound_proxy_primary}
+ {$account.1.sip_port}
+ {$account.1.auth_id}
+ {$account.1.password}
+ {$account.1.outbound_proxy_secondary}
+ {$account.1.sip_port}
+ {if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -143,7 +143,7 @@
- default
+ {if isset($fanvil_ringtone_line1)}{$fanvil_ringtone_line1}{else}default{/if}
2
30
0
@@ -158,14 +158,14 @@
0
1
0
- 3600
+ {$account.1.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
+ {if $account.1.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -174,15 +174,17 @@
1
0
5060
- 0
+ {if $account.1.sip_transport == 'udp'}0{/if}
+ {if $account.1.sip_transport == 'tcp'}1{/if}
+ {if $account.1.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -193,23 +195,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -251,26 +253,26 @@
1
-
-
+ {$account.2.user_id}
+ {$account.2.display_name}
-
- 5060
-
-
- 3600
+ {$account.2.server_address}
+ {$account.2.sip_port}
+ {$account.2.auth_id}
+ {$account.2.password}
+ {$account.2.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.2.password)}1{else}0{/if}
+ {$account.2.outbound_proxy_primary}
+ {$account.2.sip_port}
+ {$account.2.auth_id}
+ {$account.2.password}
+ {$account.2.outbound_proxy_secondary}
+ {$account.2.sip_port}
+ {if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -294,7 +296,7 @@
- default
+ {if isset($fanvil_ringtone_line2)}{$fanvil_ringtone_line2}{else}default{/if}
2
30
0
@@ -309,14 +311,14 @@
0
1
0
- 3600
+ {$account.2.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
+ {if $account.2.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -325,15 +327,17 @@
1
0
5060
- 0
+ {if $account.2.sip_transport == 'udp'}0{/if}
+ {if $account.2.sip_transport == 'tcp'}1{/if}
+ {if $account.2.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -344,23 +348,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -402,26 +406,26 @@
1
-
-
+ {$account.3.user_id}
+ {$account.3.display_name}
-
- 5060
-
-
- 3600
+ {$account.3.server_address}
+ {$account.3.sip_port}
+ {$account.3.auth_id}
+ {$account.3.password}
+ {$account.3.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.3.password)}1{else}0{/if}
+ {$account.3.outbound_proxy_primary}
+ {$account.3.sip_port}
+ {$account.3.auth_id}
+ {$account.3.password}
+ {$account.3.outbound_proxy_secondary}
+ {$account.3.sip_port}
+ {if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -445,7 +449,7 @@
- default
+ {if isset($fanvil_ringtone_line3)}{$fanvil_ringtone_line3}{else}default{/if}
2
30
0
@@ -460,14 +464,14 @@
0
1
0
- 3600
+ {$account.3.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
+ {if $account.3.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -476,15 +480,17 @@
1
0
5060
- 0
+ {if $account.3.sip_transport == 'udp'}0{/if}
+ {if $account.3.sip_transport == 'tcp'}1{/if}
+ {if $account.3.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -495,23 +501,25 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -553,26 +561,26 @@
1
-
-
+ {$account.4.user_id}
+ {$account.4.display_name}
-
- 5060
-
-
- 3600
+ {$account.4.server_address}
+ {$account.4.sip_port}
+ {$account.4.auth_id}
+ {$account.4.password}
+ {$account.1.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.4.password)}1{else}0{/if}
+ {$account.4.outbound_proxy_primary}
+ {$account.4.sip_port}
+ {$account.4.auth_id}
+ {$account.4.password}
+ {$account.4.outbound_proxy_secondary}
+ {$account.4.sip_port}
+ {if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -596,7 +604,7 @@
- default
+ {if isset($fanvil_ringtone_line4)}{$fanvil_ringtone_line4}{else}default{/if}
2
30
0
@@ -611,14 +619,14 @@
0
1
0
- 3600
+ {$account.4.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
+ {if $account.4.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -627,15 +635,17 @@
1
0
5060
- 0
+ {if $account.4.sip_transport == 'udp'}0{/if}
+ {if $account.4.sip_transport == 'tcp'}1{/if}
+ {if $account.4.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -646,23 +656,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -704,26 +714,26 @@
1
-
-
+ {$account.5.user_id}
+ {$account.5.display_name}
-
- 5060
-
-
- 3600
+ {$account.5.server_address}
+ {$account.5.sip_port}
+ {$account.5.auth_id}
+ {$account.5.password}
+ {$account.5.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.5.password)}1{else}0{/if}
+ {$account.5.outbound_proxy_primary}
+ {$account.5.sip_port}
+ {$account.5.auth_id}
+ {$account.5.password}
+ {$account.5.outbound_proxy_secondary}
+ {$account.5.sip_port}
+ {if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -747,7 +757,7 @@
- default
+ {if isset($fanvil_ringtone_line5)}{$fanvil_ringtone_line5}{else}default{/if}
2
30
0
@@ -762,7 +772,7 @@
0
1
0
- 3600
+ {$account.5.register_expires}
0
0
1
@@ -778,15 +788,17 @@
1
0
5060
- 0
+ {if $account.5.sip_transport == 'udp'}0{/if}
+ {if $account.5.sip_transport == 'tcp'}1{/if}
+ {if $account.5.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -797,23 +809,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0
@@ -855,26 +867,26 @@
1
-
-
+ {$account.6.user_id}
+ {$account.6.display_name}
-
- 5060
-
-
- 3600
+ {$account.6.server_address}
+ {$account.6.sip_port}
+ {$aaccount.6.uth_id}
+ {$account.6.password}
+ {$account.6.register_expires}
5060
0
3600
- 0
-
- 5060
-
-
-
- 5060
- 1
+ {if isset($account.6.password)}1{else}0{/if}
+ {$account.6.outbound_proxy_primary}
+ {$account.6.sip_port}
+ {$account.6.auth_id}
+ {$account.6.password}
+ {$account.6.outbound_proxy_secondary}
+ {$account.6.sip_port}
+ {if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}
1800
0
3
@@ -898,7 +910,7 @@
- default
+ {if isset($fanvil_ringtone_line6)}{$fanvil_ringtone_line6}{else}default{/if}
2
30
0
@@ -913,14 +925,14 @@
0
1
0
- 3600
+ {$account.6.register_expires}
0
0
1
0
0
- 0
- 0
+ {if $account.6.sip_transport == 'dns srv'}1{/if}
+ {if $account.6.sip_transport == 'dns srv'}1{/if}
0
0
0
@@ -928,16 +940,18 @@
0
1
0
- 5060
- 0
+ 5060
+ {if $account.6.sip_transport == 'udp'}0{/if}
+ {if $account.6.sip_transport == 'tcp'}1{/if}
+ {if $account.6.sip_transport == 'tls'}2{/if}
0
0
- 0
+ 1
1
0
-
+ *97
@@ -948,23 +962,23 @@
5
1
- 0
-
-
-
-
-
-
-
-
+ 1
+ *78
+ *79
+ *72
+ *73
+ *72
+ *73
+ *72
+ *73
-
-
+ *67
+ *67
- PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
-
+ OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB
+ {if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}
0