From 63c0d183ccbba074970644c49953299d2ff2f02d Mon Sep 17 00:00:00 2001
From: Dean Montgomery <dmonty@sd73.bc.ca>
Date: Tue, 27 Jun 2017 21:58:45 -0700
Subject: [PATCH] Fix Attended Transfer Caller ID Display (#2718)

* Update {$mac}.xml

Fix Attended Transfer Caller ID Display

* Update {$mac}.xml

Fix Attended Transfer - Caller ID Display.

* Update {$mac}.xml

Fix Attended Transfer - Caller ID Display = Auto

* Update {$mac}.xml

Fix Attended Transfer - Caller ID Display  = Auto

* Update {$mac}.xml

Fix Attended Transfer - Caller ID Display = Auto
---
 .../provision/grandstream/gxp2130/{$mac}.xml         |  8 ++++----
 .../provision/grandstream/gxp2135/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxp2140/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxp2160/{$mac}.xml         | 12 ++++++------
 .../provision/grandstream/gxp2170/{$mac}.xml         | 12 ++++++------
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 52cec2e55e..5de6696df9 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -223,7 +223,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2324>2</P2324>
+<P2324>0</P2324>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -992,7 +992,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2424>2</P2424>
+<P2424>0</P2424>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -1746,7 +1746,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2524>2</P2524>
+<P2524>0</P2524>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -4009,7 +4009,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2824>2</P2824>
+<P2824>0</P2824>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index 52cec2e55e..05b457a6f7 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -223,7 +223,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2324>2</P2324>
+<P2324>0</P2324>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -992,7 +992,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2424>2</P2424>
+<P2424>0</P2424>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -1746,7 +1746,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2524>2</P2524>
+<P2524>0</P2524>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -2499,7 +2499,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2624>2</P2624>
+<P2624>0</P2624>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -3254,7 +3254,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2724>2</P2724>
+<P2724>0</P2724>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -4009,7 +4009,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2824>2</P2824>
+<P2824>0</P2824>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index 52cec2e55e..05b457a6f7 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -223,7 +223,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2324>2</P2324>
+<P2324>0</P2324>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -992,7 +992,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2424>2</P2424>
+<P2424>0</P2424>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -1746,7 +1746,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2524>2</P2524>
+<P2524>0</P2524>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -2499,7 +2499,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2624>2</P2624>
+<P2624>0</P2624>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -3254,7 +3254,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2724>2</P2724>
+<P2724>0</P2724>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -4009,7 +4009,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2824>2</P2824>
+<P2824>0</P2824>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 52cec2e55e..05b457a6f7 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -223,7 +223,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2324>2</P2324>
+<P2324>0</P2324>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -992,7 +992,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2424>2</P2424>
+<P2424>0</P2424>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -1746,7 +1746,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2524>2</P2524>
+<P2524>0</P2524>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -2499,7 +2499,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2624>2</P2624>
+<P2624>0</P2624>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -3254,7 +3254,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2724>2</P2724>
+<P2724>0</P2724>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -4009,7 +4009,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2824>2</P2824>
+<P2824>0</P2824>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 52cec2e55e..05b457a6f7 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -223,7 +223,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2324>2</P2324>
+<P2324>0</P2324>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -992,7 +992,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2424>2</P2424>
+<P2424>0</P2424>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -1746,7 +1746,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2524>2</P2524>
+<P2524>0</P2524>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -2499,7 +2499,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2624>2</P2624>
+<P2624>0</P2624>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -3254,7 +3254,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2724>2</P2724>
+<P2724>0</P2724>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
@@ -4009,7 +4009,7 @@
 <!--  Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P2824>2</P2824>
+<P2824>0</P2824>
 
 <!--  Add Auth Header On Initial REGISTER -->
 <!--  0 - No, 1 - Yes. Default is 0 -->