From 47b41b8616570b2c86a90eb2ae4f90ceee373eaa Mon Sep 17 00:00:00 2001
From: Jim Kusznir <jim@kusznir.net>
Date: Sat, 1 Apr 2017 14:15:13 -0700
Subject: [PATCH 1/3] Added variables to disable call waiting and t.38 faxing

---
 .../provision/grandstream/ht702/{$mac}.xml    | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index 1971fe7eeb..775e74faa2 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -3,7 +3,10 @@
 <config version="1">
 
 <!--  Configuration template for HT701 and HT702 firmware version 1.0.5.2 -->
-
+<!-- VARIABLES for FusionPBX:
+     disable_cw: set to 1 disables call waiting (used for PBX/FAX interconnects)
+     disable_t38: set to 1 sets pass-through fax mode
+ -->
 <!-- Advanced Settings. -->
 
 
@@ -69,7 +72,7 @@
 
 <!-- Firmware Server Path -->
 <!-- Server address -->
-<P192>fm.grandstream.com/gs</P192>
+<P192>{$domain_name}{$project_path}/app/provision</P192>
 
 <!-- Config Server Path -->
 <!-- Server address;  -->
@@ -533,7 +536,9 @@
 <!-- Disable Call-Waiting. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P91>0</P91>
+{if $disable_cw == '1'}<P91>1</P91>
+    {else}<P91>0</P91>
+    {/if}
 
 <!-- Disable Call-Waiting Caller ID. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
@@ -742,7 +747,10 @@
 <!-- FAX Mode. 0 - T.38 (Auto Detect), 1 - Pass Through -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P228>0</P228>
+{if $disable_t38 == '1'}<P228>1</P228>
+    {else}<P228>0</P228>
+    {/if}
+
 
 <!-- Re-INVITE After Fax Tone Detected. 0 - Disabled, 1 - Enabled. -->
 <!-- Number: 0, 1 -->
@@ -1192,7 +1200,9 @@
 <!-- Disable Call-Waiting. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P791>0</P791>
+{if $disable_cw == '1'}<P791>1</P791>
+    {else}<P791>0</P791>
+    {/if}
 
 <!-- Disable Call-Waiting Caller ID. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
@@ -1399,7 +1409,9 @@
 <!-- FAX Mode. 0 - T.38 (Auto Detect), 1 - Pass Through -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P710>0</P710>
+{if $disable_t38 == '1'}<P710>1</P710>
+    {else}<P710>0</P710>
+    {/if}
 
 <!-- Re-INVITE After Fax Tone Detected. 0 - Disabled, 1 - Enabled. -->
 <!-- Number: 0, 1 -->

From 0e22bb12f8a94e1cf3544c7db456f37fbb15879d Mon Sep 17 00:00:00 2001
From: Jim Kusznir <jim@kusznir.net>
Date: Mon, 3 Apr 2017 14:15:30 -0700
Subject: [PATCH 2/3] HT702 config file variables:
 grandstream_disable_call_waiting, grandstream_disable_fax_t38

---
 .../templates/provision/grandstream/ht702/{$mac}.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index 775e74faa2..06655b6e1c 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -4,8 +4,8 @@
 
 <!--  Configuration template for HT701 and HT702 firmware version 1.0.5.2 -->
 <!-- VARIABLES for FusionPBX:
-     disable_cw: set to 1 disables call waiting (used for PBX/FAX interconnects)
-     disable_t38: set to 1 sets pass-through fax mode
+     grandstream_disable_call_waiting: set to 1 disables call waiting (used for PBX/FAX interconnects)
+     grandstream_disable_fax_t38: set to 1 sets pass-through fax mode
  -->
 <!-- Advanced Settings. -->
 
@@ -536,7 +536,7 @@
 <!-- Disable Call-Waiting. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-{if $disable_cw == '1'}<P91>1</P91>
+{if $grandstream_disable_call_waiting == '1'}<P91>1</P91>
     {else}<P91>0</P91>
     {/if}
 
@@ -747,7 +747,7 @@
 <!-- FAX Mode. 0 - T.38 (Auto Detect), 1 - Pass Through -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-{if $disable_t38 == '1'}<P228>1</P228>
+{if $grandstream_disable_fax_t38 == '1'}<P228>1</P228>
     {else}<P228>0</P228>
     {/if}
 
@@ -1200,7 +1200,7 @@
 <!-- Disable Call-Waiting. 0 - No, 1 - Yes -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-{if $disable_cw == '1'}<P791>1</P791>
+{if $grandstream_disable_call_waiting == '1'}<P791>1</P791>
     {else}<P791>0</P791>
     {/if}
 
@@ -1409,7 +1409,7 @@
 <!-- FAX Mode. 0 - T.38 (Auto Detect), 1 - Pass Through -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-{if $disable_t38 == '1'}<P710>1</P710>
+{if $grandstream_disable_fax_t38 == '1'}<P710>1</P710>
     {else}<P710>0</P710>
     {/if}
 

From a95f380c60d79b435040084502723809e5b8e0fd Mon Sep 17 00:00:00 2001
From: Jim Kusznir <jim@kusznir.net>
Date: Thu, 6 Apr 2017 21:21:16 -0700
Subject: [PATCH 3/3] Corrected bug with expansion board and call park value. 
 Was 19, should be 16.

---
 resources/templates/provision/grandstream/gxp2140/{$mac}.xml | 2 +-
 resources/templates/provision/grandstream/gxp2170/{$mac}.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index aa57ba1d1f..6a8b029e92 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -576,7 +576,7 @@
 {if $row.device_key_type == "voicemail"}    <P{$type_id}>6</P{$type_id}>{/if}
 {if $row.device_key_type == "call return"}    <P{$type_id}>7</P{$type_id}>{/if}
 {if $row.device_key_type == "transfer"}    <P{$type_id}>8</P{$type_id}>{/if}
-{if $row.device_key_type == "call park"}    <P{$type_id}>19</P{$type_id}>{/if}
+{if $row.device_key_type == "call park"}    <P{$type_id}>16</P{$type_id}>{/if}
 {if $row.device_key_type == "intercom"}    <P{$type_id}>10</P{$type_id}>{/if}
 {if $row.device_key_type == "ldap search"}    <P{$type_id}>11</P{$type_id}>{/if}
 
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 1184345c3b..b62359d1d2 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -576,7 +576,7 @@
 {if $row.device_key_type == "voicemail"}    <P{$type_id}>6</P{$type_id}>{/if}
 {if $row.device_key_type == "call return"}    <P{$type_id}>7</P{$type_id}>{/if}
 {if $row.device_key_type == "transfer"}    <P{$type_id}>8</P{$type_id}>{/if}
-{if $row.device_key_type == "call park"}    <P{$type_id}>19</P{$type_id}>{/if}
+{if $row.device_key_type == "call park"}    <P{$type_id}>16</P{$type_id}>{/if}
 {if $row.device_key_type == "intercom"}    <P{$type_id}>10</P{$type_id}>{/if}
 {if $row.device_key_type == "ldap search"}    <P{$type_id}>11</P{$type_id}>{/if}