diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index b7c3a31291..d453160ab6 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -80,24 +80,24 @@
0
1
- {$user_id_1}
- {$display_name_1}
+ {$line.1.user_id}
+ {$line.1.display_name}
- {$server_address_1}
- {$sip_port_1}
- {$auth_id_1}
- {$user_password_1}
- {$register_expires_1}
+ {$line.1.server_address}
+ {$line.1.sip_port}
+ {$line.1.auth_id}
+ {$line.1.user_password}
+ {$line.1.register_expires}
- {if isset($user_password_1)}1{else}0{/if}
+ {if isset($line.1.user_password)}1{else}0{/if}
- {$outbound_proxy_primary_1}
- {$sip_port_1}
- {$auth_id_1}
- {$user_password_1}
- {$outbound_proxy_secondary_1}
- {$sip_port_1}
- {if isset($outbound_proxy_secondary_1)}1{else}0{/if}
+ {$line.1.outbound_proxy_primary}
+ {$line.1.sip_port}
+ {$line.1.auth_id}
+ {$line.1.user_password}
+ {$line.1.outbound_proxy_secondary}
+ {$line.1.sip_port}
+ {if isset($line.1.outbound_proxy_secondary)}1{else}0{/if}
0
0
@@ -132,7 +132,7 @@
0
1
0
- {$register_expires_1}
+ {$line.1.register_expires}
0
0
1
@@ -150,11 +150,11 @@
5060
- {if $sip_transport_1 == 'udp'}0{/if}
- {if $sip_transport_1 == 'tcp'}1{/if}
- {if $sip_transport_1 == 'tls'}2{/if}
- {if $sip_transport_1 == 'dns srv'}1{/if}
- {if $sip_transport_1 == 'dns srv'}1{/if}
+ {if $line.1.sip_transport == 'udp'}0{/if}
+ {if $line.1.sip_transport == 'tcp'}1{/if}
+ {if $line.1.sip_transport == 'tls'}2{/if}
+ {if $line.1.sip_transport == 'dns srv'}1{/if}
+ {if $line.1.sip_transport == 'dns srv'}1{/if}
0
@@ -223,24 +223,24 @@
Record:off
- {$user_id_2}
- {$display_name_2}
+ {$line.2.user_id}
+ {$line.2.display_name}
- {$server_address_2}
- {$sip_port_2}
- {$auth_id_2}
- {$user_password_2}
- {$register_expires_2}
+ {$line.2.server_address}
+ {$line.2.sip_port}
+ {$line.2.auth_id}
+ {$line.2.user_password}
+ {$line.2.register_expires}
- {if isset($user_password_2)}1{else}0{/if}
+ {if isset($line.2.user_password)}1{else}0{/if}
- {$outbound_proxy_primary_2}
- {$sip_port_2}
- {$auth_id_2}
- {$user_password_2}
- {$outbound_proxy_secondary_2}
- {$sip_port_1}
- {if isset($outbound_proxy_secondary_2)}1{else}0{/if}
+ {$line.2.outbound_proxy_primary}
+ {$line.2.sip_port}
+ {$line.2.auth_id}
+ {$line.2.user_password}
+ {$line.2.outbound_proxy_secondary}
+ {$line.1.sip_port}
+ {if isset($line.2.outbound_proxy_secondary)}1{else}0{/if}
0
0
@@ -275,7 +275,7 @@
0
1
0
- {$register_expires_2}
+ {$line.2.register_expires}
0
0
1
@@ -292,11 +292,11 @@
5060
- {if $sip_transport_2 == 'udp'}0{/if}
- {if $sip_transport_2 == 'tcp'}1{/if}
- {if $sip_transport_2 == 'tls'}2{/if}
- {if $sip_transport_2 == 'dns srv'}1{/if}
- {if $sip_transport_2 == 'dns srv'}1{/if}
+ {if $line.2.sip_transport == 'udp'}0{/if}
+ {if $line.2.sip_transport == 'tcp'}1{/if}
+ {if $line.2.sip_transport == 'tls'}2{/if}
+ {if $line.2.sip_transport == 'dns srv'}1{/if}
+ {if $line.2.sip_transport == 'dns srv'}1{/if}
0
@@ -365,24 +365,24 @@
Record:off
- {$user_id_3}
- {$display_name_3}
+ {$line.3.user_id}
+ {$line.3.display_name}
- {$server_address_3}
- {$sip_port_3}
- {$auth_id_3}
- {$user_password_3}
- {$register_expires_3}
+ {$line.3.server_address}
+ {$line.3.sip_port}
+ {$line.3.auth_id}
+ {$line.3.user_password}
+ {$line.3.register_expires}
- {if isset($user_password_3)}1{else}0{/if}
+ {if isset($line.3.user_password)}1{else}0{/if}
- {$outbound_proxy_primary_3}
- {$sip_port_3}
- {$auth_id_3}
- {$user_password_3}
- {$outbound_proxy_secondary_3}
- {$sip_port_3}
- {if isset($outbound_proxy_secondary_3)}1{else}0{/if}
+ {$line.3.outbound_proxy_primary}
+ {$line.3.sip_port}
+ {$line.3.auth_id}
+ {$line.3.user_password}
+ {$line.3.outbound_proxy_secondary}
+ {$line.3.sip_port}
+ {if isset($line.3.outbound_proxy_secondary)}1{else}0{/if}
0
0
@@ -417,7 +417,7 @@
0
1
0
- {$register_expires_3}
+ {$line.3.register_expires}
0
0
1
@@ -434,11 +434,11 @@
5060
- {if $sip_transport_3 == 'udp'}0{/if}
- {if $sip_transport_3 == 'tcp'}1{/if}
- {if $sip_transport_3 == 'tls'}2{/if}
- {if $sip_transport_1 == 'dns srv'}1{/if}
- {if $sip_transport_1 == 'dns srv'}1{/if}
+ {if $line.3.sip_transport == 'udp'}0{/if}
+ {if $line.3.sip_transport == 'tcp'}1{/if}
+ {if $line.3.sip_transport == 'tls'}2{/if}
+ {if $line.1.sip_transport == 'dns srv'}1{/if}
+ {if $line.1.sip_transport == 'dns srv'}1{/if}
0
@@ -509,24 +509,24 @@
Record:off
- {$user_id_4}
- {$display_name_4}
+ {$line.4.user_id}
+ {$line.4.display_name}
- {$server_address_4}
- {$sip_port_4}
- {$auth_id_4}
- {$user_password_4}
- {$register_expires_1}
+ {$line.4.server_address}
+ {$line.4.sip_port}
+ {$line.4.auth_id}
+ {$line.4.user_password}
+ {$line.1.register_expires}
- {if isset($user_password_4)}1{else}0{/if}
+ {if isset($line.4.user_password)}1{else}0{/if}
- {$outbound_proxy_primary_4}
- {$sip_port_4}
- {$auth_id_4}
- {$user_password_4}
- {$outbound_proxy_secondary_4}
- {$sip_port_4}
- {if isset($outbound_proxy_secondary_4)}1{else}0{/if}
+ {$line.4.outbound_proxy_primary}
+ {$line.4.sip_port}
+ {$line.4.auth_id}
+ {$line.4.user_password}
+ {$line.4.outbound_proxy_secondary}
+ {$line.4.sip_port}
+ {if isset($line.4.outbound_proxy_secondary)}1{else}0{/if}
0
0
@@ -561,7 +561,7 @@
0
1
0
- {$register_expires_4}
+ {$line.4.register_expires}
0
0
1
@@ -577,10 +577,10 @@
0
5060
- {if $sip_transport_4 == 'udp'}0{/if}
- {if $sip_transport_4 == 'tcp'}1{/if}
- {if $sip_transport_4 == 'dns srv'}1{/if}
- {if $sip_transport_4 == 'dns srv'}1{/if}
+ {if $line.4.sip_transport == 'udp'}0{/if}
+ {if $line.4.sip_transport == 'tcp'}1{/if}
+ {if $line.4.sip_transport == 'dns srv'}1{/if}
+ {if $line.4.sip_transport == 'dns srv'}1{/if}
0
@@ -649,24 +649,24 @@
Record:off
- {$user_id_5}
- {$display_name_5}
+ {$line.5.user_id}
+ {$line.5.display_name}
- {$server_address_5}
- {$sip_port_5}
- {$auth_id_5}
- {$user_password_5}
- {$register_expires_5}
+ {$line.5.server_address}
+ {$line.5.sip_port}
+ {$line.5.auth_id}
+ {$line.5.user_password}
+ {$line.5.register_expires}
- {if isset($user_password_5)}1{else}0{/if}
+ {if isset($line.5.user_password)}1{else}0{/if}
- {$outbound_proxy_primary_5}
- {$sip_port_5}
- {$auth_id_5}
- {$user_password_5}
- {$outbound_proxy_secondary_5}
- {$sip_port_5}
- {if isset($outbound_proxy_secondary_5)}1{else}0{/if}
+ {$line.5.outbound_proxy_primary}
+ {$line.5.sip_port}
+ {$line.5.auth_id}
+ {$line.5.user_password}
+ {$line.5.outbound_proxy_secondary}
+ {$line.5.sip_port}
+ {if isset($line.5.outbound_proxy_secondary)}1{else}0{/if}
0
0
@@ -701,7 +701,7 @@
0
1
0
- {$register_expires_5}
+ {$line.5.register_expires}
0
0
1
@@ -718,11 +718,11 @@
5060
- {if $sip_transport_5 == 'udp'}0{/if}
- {if $sip_transport_5 == 'tcp'}1{/if}
- {if $sip_transport_5 == 'tls'}2{/if}
- {if $sip_transport_5 == 'dns srv'}1{/if}
- {if $sip_transport_5 == 'dns srv'}1{/if}
+ {if $line.5.sip_transport == 'udp'}0{/if}
+ {if $line.5.sip_transport == 'tcp'}1{/if}
+ {if $line.5.sip_transport == 'tls'}2{/if}
+ {if $line.5.sip_transport == 'dns srv'}1{/if}
+ {if $line.5.sip_transport == 'dns srv'}1{/if}
0
@@ -791,24 +791,24 @@
Record:off
- {$user_id_6}
- {$display_name_6}
+ {$line.6.user_id}
+ {$line.6.display_name}
- {$server_address_6}
- {$sip_port_6}
- {$auth_id_6}
- {$user_password_6}
- {$register_expires_6}
+ {$line.6.server_address}
+ {$line.6.sip_port}
+ {$aline.6.uth_id}
+ {$line.6.user_password}
+ {$line.6.register_expires}
- {if isset($user_password_6)}1{else}0{/if}
+ {if isset($line.6.user_password)}1{else}0{/if}
- {$outbound_proxy_primary_6}
- {$sip_port_6}
- {$auth_id_6}
- {$user_password_6}
- {$outbound_proxy_secondary_6}
- {$sip_port_6}
- {if isset($outbound_proxy_secondary_6)}1{else}0{/if}
+ {$line.6.outbound_proxy_primary}
+ {$line.6.sip_port}
+ {$line.6.auth_id}
+ {$line.6.ser_password}
+ {$line.6.outbound_proxy_secondary}
+ {$line.6.sip_port}
+ {if isset($line.6.outbound_proxy_secondary)}1{else}0{/if}
0
0
@@ -843,7 +843,7 @@
0
1
0
- {$register_expires_6}
+ {$line.6.register_expires}
0
0
1
@@ -860,11 +860,11 @@
5060
- {if $sip_transport_6 == 'udp'}0{/if}
- {if $sip_transport_6 == 'tcp'}1{/if}
- {if $sip_transport_6 == 'tls'}2{/if}
- {if $sip_transport_6 == 'dns srv'}1{/if}
- {if $sip_transport_6 == 'dns srv'}1{/if}
+ {if $line.6.sip_transport == 'udp'}0{/if}
+ {if $line.6.sip_transport == 'tcp'}1{/if}
+ {if $line.6.sip_transport == 'tls'}2{/if}
+ {if $line.6.sip_transport == 'dns srv'}1{/if}
+ {if $line.6.sip_transport == 'dns srv'}1{/if}
0