From bfe5268310491511058955171b310ec6bfd22df8 Mon Sep 17 00:00:00 2001
From: Darryl Ross <darryl@afoyi.com>
Date: Wed, 22 May 2019 11:39:42 +1000
Subject: [PATCH 1/3] Allow setting country tone set from default setting.

---
 resources/templates/provision/fanvil/x6/{$mac}.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index b92a37a5e5..31ed4a7cf2 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -55,7 +55,7 @@
         <RTPKeepAlive>0</RTPKeepAlive>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
-        <SelectYourTone>11</SelectYourTone>
+        <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
         <SidetoneGAIN>1</SidetoneGAIN>
         <DialTone>350+440/0</DialTone>
         <RingbackTone>440+480/2000,0/4000</RingbackTone>

From 7658d45ff39c402be413afad38a1d9b9170fcd0e Mon Sep 17 00:00:00 2001
From: Darryl Ross <darryl@afoyi.com>
Date: Wed, 22 May 2019 11:41:20 +1000
Subject: [PATCH 2/3] Update syntax for DSS buttons to use correct structure
 for X6 phone.

---
 .../templates/provision/fanvil/x6/{$mac}.cfg  | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index 31ed4a7cf2..2cb81d0c24 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -1778,8 +1778,8 @@
 {foreach $keys["memory"] as $row}
 {if $row.device_key_id <= 12}
             <Fkey index="{$row.device_key_id}">
-                <Type>1</Type>
-                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+                <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>
             </Fkey>
@@ -1788,10 +1788,10 @@
         </internal>
         <internal index="2">
 {foreach $keys["memory"] as $row}
-{if $row.device_key_id > 12 && $row.device_key_id < 24}
-            <Fkey index="{$row.device_key_id}">
-                <Type>1</Type>
-                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+{if $row.device_key_id > 12 && $row.device_key_id <= 24}
+            <Fkey index="{$row.device_key_id-12}">
+                <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>
             </Fkey>
@@ -1800,10 +1800,10 @@
         </internal>
         <internal index="3">
 {foreach $keys["memory"] as $row}
-{if $row.device_key_id > 24 && $row.device_key_id < 36}
-            <Fkey index="{$row.device_key_id}">
-                <Type>1</Type>
-                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+{if $row.device_key_id > 24 && $row.device_key_id <= 36}
+            <Fkey index="{$row.device_key_id-24}">
+                <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>
             </Fkey>
@@ -1812,10 +1812,10 @@
         </internal>
         <internal index="4">
 {foreach $keys["memory"] as $row}
-{if $row.device_key_id > 35 && $row.device_key_id < 48}
-            <Fkey index="{$row.device_key_id}">
-                <Type>1</Type>
-                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+{if $row.device_key_id > 36 && $row.device_key_id <= 48}
+            <Fkey index="{$row.device_key_id-36}">
+                <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>
             </Fkey>
@@ -1824,10 +1824,10 @@
         </internal>
         <internal index="5">
 {foreach $keys["memory"] as $row}
-{if $row.device_key_id > 47 && $row.device_key_id < 61}
-            <Fkey index="{$row.device_key_id}">
-                <Type>1</Type>
-                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+{if $row.device_key_id > 48 && $row.device_key_id <= 62}
+            <Fkey index="{$row.device_key_id-48}">
+                <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>
             </Fkey>
@@ -1836,8 +1836,8 @@
         </internal>
 {foreach $keys["programmable"] as $row}
         <dssSoft index="{$row.device_key_id}">
-            <Type>1</Type>
-            <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+            <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}

From c726983862706442a8fdc25d22d56d41e5bbf314 Mon Sep 17 00:00:00 2001
From: Darryl Ross <darryl@afoyi.com>
Date: Wed, 22 May 2019 11:41:55 +1000
Subject: [PATCH 3/3] Create default ringtones for alert-into type External and
 External2 and allow to be overriden from default settings.

---
 resources/templates/provision/fanvil/x6/{$mac}.cfg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index 2cb81d0c24..ba71fabb8f 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -1060,12 +1060,12 @@
             <EnableEOneSixFour>0</EnableEOneSixFour>
         </basic>
         <alertInfo index="1">
-            <Text></Text>
-            <RingType>Type 1</RingType>
+            <Text>External</Text>
+            <RingType>{if isset($fanvil_default_ringtone_ext)}{$fanvil_default_ringtone_ext}{else}Type 1{/if}</RingType>
         </alertInfo>
         <alertInfo index="2">
-            <Text></Text>
-            <RingType>Type 1</RingType>
+            <Text>External2</Text>
+            <RingType>{if isset($fanvil_default_ringtone_ext2)}{$fanvil_default_ringtone_ext2}{else}Type 4{/if}</RingType>
         </alertInfo>
         <alertInfo index="3">
             <Text></Text>