From efe4720e534e6a2adfe73a96f6d6acb51ad3c8ff Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Mon, 18 Nov 2019 23:02:01 -0500
Subject: [PATCH] Update {$mac}.xml (#4854)

* Update {$mac}.xml

* Update {$mac}.xml

* Update {$mac}.xml

* Update {$mac}.xml

* Update {$mac}.xml

* Update {$mac}.xml
---
 .../provision/grandstream/gxp2130/{$mac}.xml          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 7e2a4d13d8..3af542ef10 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -5927,15 +5927,18 @@
     <!-- # Enable Manual VLAN Configuration. 0 - Disable, 1 - Enable. Default is 0. -->
     <!-- # Number: 0,1 -->
     <!-- # Mandatory -->
-    <P22174>0</P22174>
+{if isset($grandstream_lan_port_vlan) }
+    <P22174>1</P22174>
 
     <!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
     <!-- # Number: 0 - 4094 -->
     <!-- # Mandatory -->
-{if isset($grandstream_lan_port_vlan) }
+
     <P51>{$grandstream_lan_port_vlan}</P51>
+    
 {else}
     <P51>0</P51>
+    <P22174>0</P22174>
 {/if}
 
     <!-- # Layer 2 QoS. 802.1p priority value (0 - 7). Default is 0 -->
@@ -6647,7 +6650,7 @@
     <!-- # This is a string of up to 256 characters that should contain a path to the XML file. It MUST be in the host/path format. -->
     <!-- # For example: directory.grandstream.com/engineering -->
     <!-- # String -->
-{if isset($grandstream_phonebook_download)}
+{if isset($grandstream_phonebook_xml_server_path)}
     <P331>{$grandstream_phonebook_xml_server_path}{$mac}/</P331>
 {elseif isset($grandstream_phonebook_xml_server_path)}
     <P331>{$grandstream_phonebook_xml_server_path}</P331>
@@ -6682,7 +6685,7 @@
     <!-- # Phonebook Key Function. 0 - Default, 1 - LDAP Search, 2 - Local Phonebook, 3 - Local Group, 4 - Broadsoft Phonebook -->
     <!-- # Number: 0, 1, 2, 3, 4. -->
     <!-- # Mandatory -->
-{if isset($contact_grandstream)}
+{if isset($contact_groups) ||  isset($contact_users) ||  isset($contact_extensions)}
     <P1526>2</P1526>
 {else}
     <P1526>0</P1526>