From 5a76e296c6e518cd67732b1a1565e6cf030d245c Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Wed, 2 Sep 2020 16:14:40 -0600
Subject: [PATCH] Update {$mac}.cfg (#5433)

side keys, function keys, and soft keys updated
---
 .../templates/provision/fanvil/x4u/{$mac}.cfg | 270 +++++-------------
 1 file changed, 66 insertions(+), 204 deletions(-)

diff --git a/resources/templates/provision/fanvil/x4u/{$mac}.cfg b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
index 2057dc880f..2108ee4a34 100644
--- a/resources/templates/provision/fanvil/x4u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
@@ -2626,223 +2626,85 @@
         <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>
-        <SidekeyConfig1 index="4">
-            <Type>2</Type>
-            <Value>SIP4</Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-        </SidekeyConfig1>
+        <dssSide index="1">
+            {foreach $keys["line"] as $row}
+	            <Fkey 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>
+	            </Fkey>
+            {/foreach}
+        </dssSide>
+        
         {strip}{*-- Each Internal Index contains 6 keys --*}{/strip}        
-
         <internal index="1">
-        {foreach $keys["line"] as $row}
-        {if $row.device_key_id <= 6}
-            <Fkey 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>
-            </Fkey>
-        {/if}
-        {/foreach}
+            {foreach $keys["memory"] as $row}
+                {if $row.device_key_id <= 6}
+                <Fkey 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>
+                </Fkey>
+                {/if}
+            {/foreach}
         </internal>
         <internal index="2">
-        {foreach $keys["line"] as $row}
-        {if $row.device_key_id > 6 && $row.device_key_id <= 12}
-            <Fkey index="{$row.device_key_id-6}">
-                <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>
-        {/if}
-        {/foreach}
+            {foreach $keys["memory"] as $row}
+                {if $row.device_key_id > 6 && $row.device_key_id <= 12}
+                <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>
+                {/if}
+            {/foreach}
         </internal>
         <internal index="3">
-        {foreach $keys["line"] as $row}
-        {if $row.device_key_id > 12 && $row.device_key_id <= 18}
-            <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>
-        {/if}
-        {/foreach}
+            {foreach $keys["memory"] as $row}
+                {if $row.device_key_id > 12 && $row.device_key_id <= 18}
+                <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>
+                {/if}
+            {/foreach}
         </internal>
         <internal index="4">
-        {foreach $keys["line"] as $row}
-        {if $row.device_key_id > 18 && $row.device_key_id <= 24}
-            <Fkey index="{$row.device_key_id-18}">
-                <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>
-        {/if}
-        {/foreach}
+            {foreach $keys["memory"] as $row}
+                {if $row.device_key_id > 18 && $row.device_key_id <= 24}
+                <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>
+                {/if}
+            {/foreach}
         </internal>
         <internal index="5">
-        {foreach $keys["line"] as $row}
-        {if $row.device_key_id > 24 && $row.device_key_id <= 30}
-            <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>
-        {/if}
-        {/foreach}
-        </internal>
-
-        <internal index="1">
-        {foreach $keys["memory"] as $row}
-        {if $row.device_key_id <= 6}
-            <Fkey 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>
-            </Fkey>
-        {/if}
-        {/foreach}
-        </internal>
-        <internal index="2">
-        {foreach $keys["memory"] as $row}
-        {if $row.device_key_id > 6 && $row.device_key_id <= 12}
-            <Fkey index="{$row.device_key_id-6}">
-                <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>
-        {/if}
-        {/foreach}
-        </internal>
-        <internal index="3">
-        {foreach $keys["memory"] as $row}
-        {if $row.device_key_id > 12 && $row.device_key_id <= 18}
-            <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>
-        {/if}
-        {/foreach}
-        </internal>
-        <internal index="4">
-        {foreach $keys["memory"] as $row}
-        {if $row.device_key_id > 18 && $row.device_key_id <= 24}
-            <Fkey index="{$row.device_key_id-18}">
-                <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>
-        {/if}
-        {/foreach}
-        </internal>
-        <internal index="5">
-        {foreach $keys["memory"] as $row}
-        {if $row.device_key_id > 24 && $row.device_key_id <= 30}
-            <Fkey index="{$row.device_key_id-32}">
-                <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>
-        {/if}
-        {/foreach}
-        </internal>
-
+            {foreach $keys["memory"] as $row}
+                {if $row.device_key_id > 24 && $row.device_key_id <= 30}
+                <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>
+                {/if}
+            {/foreach}
+        </internal>  
         {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>
-            <ICON>{$row.device_key_icon}</ICON>
-        </dssSoft>
-        {/foreach}
-        {strip}{*-- Each External Index contains 20 keys --*}{/strip}
-        <external index="1">        
-        {foreach $keys["expansion"] as $row}
-        {if $row.device_key_id < 20}
-            <exKey index="{$row.device_key_id}">
-            <Type>0</Type>
-                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+            <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>
-                <ICON>{$row.device_key_icon}</ICON>
-            </exKey>
-        {/if}
+            </dssSoft>
         {/foreach}
-        </external>
-        <external index="2">        
-        {foreach $keys["expansion"] as $row}
-        {if $row.device_key_id > 19 && $row.device_key_id < 40}
-            <exKey index="{$row.device_key_id}">
-            <Type>0</Type>
-                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
-                <Title>{$row.device_key_label}</Title>
-                <ICON>{$row.device_key_icon}</ICON>
-            </exKey>
-        {/if}
-        {/foreach}
-        </external>
-        <external index="3">
-        {foreach $keys["expansion"] as $row}
-        {if $row.device_key_id > 39 && $row.device_key_id < 60}
-            <exKey index="{$row.device_key_id}">
-            <Type>0</Type>
-                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
-                <Title>{$row.device_key_label}</Title>
-                <ICON>{$row.device_key_icon}</ICON>
-            </exKey>
-        {/if}
-        {/foreach}
-        </external>
-        <external index="4">        
-        {foreach $keys["expansion"] as $row}
-        {if $row.device_key_id > 59 && $row.device_key_id < 80}
-            <exKey index="{$row.device_key_id}">
-            <Type>0</Type>
-                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
-                <Title>{$row.device_key_label}</Title>
-                <ICON>{$row.device_key_icon}</ICON>
-            </exKey>
-        {/if}
-        {/foreach}
-        </external>
-        <external index="5">        
-        {foreach $keys["expansion"] as $row}
-        {if $row.device_key_id > 79 && $row.device_key_id < 100}
-            <exKey index="{$row.device_key_id}">
-            <Type>0</Type>
-                <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
-                <Title>{$row.device_key_label}</Title>
-                <ICON>{$row.device_key_icon}</ICON>
-            </exKey>
-        {/if}
-        {/foreach}
-        </external>
     </dsskey>
     <web>
         <WebServerType>0</WebServerType>