From 4659f5556bd929e1676ff99dedb66c39a83ea9b7 Mon Sep 17 00:00:00 2001
From: Zachary Kitchen <30428121+digitalcrisis@users.noreply.github.com>
Date: Wed, 23 May 2018 17:12:42 -0500
Subject: [PATCH] Revert "Updated for Weather App on Grandstream Phons"

This reverts commit b61a678db563f0ac6651b929cad375f73c2b580a.
---
 app/grandstream/app_config.php                   |  8 --------
 .../provision/grandstream/gxp2130/{$mac}.xml     | 16 ++++++----------
 .../provision/grandstream/gxp2135/{$mac}.xml     | 16 ++++++----------
 .../provision/grandstream/gxp2140/{$mac}.xml     | 16 ++++++----------
 .../provision/grandstream/gxp2160/{$mac}.xml     | 16 ++++++----------
 .../provision/grandstream/gxp2170/{$mac}.xml     |  4 ----
 6 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php
index 6bc3b12081..77de49d02e 100644
--- a/app/grandstream/app_config.php
+++ b/app/grandstream/app_config.php
@@ -396,12 +396,4 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enter City to configure City for the Weather app on the Phone";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "52b6e1e2-5ed5-11e8-9c2d-fa7ae01bbebc";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_temp_unit";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "f";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "c - Celsius f - Farenheit / If disabled will be set to auto";
-		$y++;
 ?>
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 373c321ba1..97a116690a 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -1586,7 +1586,7 @@
 <!--  Name -->
 <!--  String -->
 <P507>{$display_name_3}</P507>
-
+	
 <!--  Voice Mail UserID -->
 <!--  String -->
 <P526>*97</P526>
@@ -4573,7 +4573,7 @@
 <!--  String -->
 <!--  For GXP2130, Default value is Grandstream GXP2130. -->
 <!-- P148>Grandstream GXP2130</P148> -->
-
+ 
 <!--  For GXP2140, Default value is Grandstream GXP2140. -->
 <!-- P148>Grandstream GXP2140</P148> -->
 
@@ -5493,7 +5493,7 @@
 <!--  User-Agent Prefix -->
 <!--  String -->
 <P8358></P8358>
-
+ 
 <!--  Auto Provision List Starting Point. 0 - Extension Boards, 1 - VPKs, 2 - MPK . Default is 0.  - VPK/MPK is for GXP2130 only. Extension Boards/VPK is for GXP2140/2160/2170. -->
 <!--  Number: 0, 1, 2  -->
 <!--  Mandatory -->
@@ -5503,12 +5503,12 @@
 <!--  Number: 10 - 900 -->
 <!--  Mandatory -->
 <P26055>10</P26055>
-
+ 
 <!--  Play Tone On Receiving IM. 0 - Disable, 1 - Enable. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
 <P26056>0</P26056>
-
+ 
 <!--  Allow Incoming Call Before Ringing. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
@@ -5989,11 +5989,7 @@
 <!--  Degree Unit. auto - Automatic, f - Fahrenheit, c - Celsius. Default is auto -->
 <!--  String: auto, f, c -->
 <!--  Mandatory -->
-{if isset($grandstream_temp_unit)}
-<P1379>{$grandstream_temp_unit}</P1379>
-{else}
-<P1379>auto</P1379>
-{/if}
+<P1379>c</P1379>
 
 <!--  Currency Update -->
 <!--  Enable Currency update. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index 074a6103fb..247419fdb9 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -1586,7 +1586,7 @@
 <!--  Name -->
 <!--  String -->
 <P507>{$display_name_3}</P507>
-
+	
 <!--  Voice Mail UserID -->
 <!--  String -->
 <P526>*97</P526>
@@ -4573,7 +4573,7 @@
 <!--  String -->
 <!--  For GXP2130, Default value is Grandstream GXP2130. -->
 <!-- P148>Grandstream GXP2130</P148> -->
-
+ 
 <!--  For GXP2140, Default value is Grandstream GXP2140. -->
 <!-- P148>Grandstream GXP2140</P148> -->
 
@@ -5493,7 +5493,7 @@
 <!--  User-Agent Prefix -->
 <!--  String -->
 <P8358></P8358>
-
+ 
 <!--  Auto Provision List Starting Point. 0 - Extension Boards, 1 - VPKs, 2 - MPK . Default is 0.  - VPK/MPK is for GXP2130 only. Extension Boards/VPK is for GXP2140/2160/2170. -->
 <!--  Number: 0, 1, 2  -->
 <!--  Mandatory -->
@@ -5503,12 +5503,12 @@
 <!--  Number: 10 - 900 -->
 <!--  Mandatory -->
 <P26055>10</P26055>
-
+ 
 <!--  Play Tone On Receiving IM. 0 - Disable, 1 - Enable. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
 <P26056>0</P26056>
-
+ 
 <!--  Allow Incoming Call Before Ringing. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
@@ -5989,11 +5989,7 @@
 <!--  Degree Unit. auto - Automatic, f - Fahrenheit, c - Celsius. Default is auto -->
 <!--  String: auto, f, c -->
 <!--  Mandatory -->
-{if isset($grandstream_temp_unit)}
-<P1379>{$grandstream_temp_unit}</P1379>
-{else}
-<P1379>auto</P1379>
-{/if}
+<P1379>c</P1379>
 
 <!--  Currency Update -->
 <!--  Enable Currency update. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index 074a6103fb..247419fdb9 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -1586,7 +1586,7 @@
 <!--  Name -->
 <!--  String -->
 <P507>{$display_name_3}</P507>
-
+	
 <!--  Voice Mail UserID -->
 <!--  String -->
 <P526>*97</P526>
@@ -4573,7 +4573,7 @@
 <!--  String -->
 <!--  For GXP2130, Default value is Grandstream GXP2130. -->
 <!-- P148>Grandstream GXP2130</P148> -->
-
+ 
 <!--  For GXP2140, Default value is Grandstream GXP2140. -->
 <!-- P148>Grandstream GXP2140</P148> -->
 
@@ -5493,7 +5493,7 @@
 <!--  User-Agent Prefix -->
 <!--  String -->
 <P8358></P8358>
-
+ 
 <!--  Auto Provision List Starting Point. 0 - Extension Boards, 1 - VPKs, 2 - MPK . Default is 0.  - VPK/MPK is for GXP2130 only. Extension Boards/VPK is for GXP2140/2160/2170. -->
 <!--  Number: 0, 1, 2  -->
 <!--  Mandatory -->
@@ -5503,12 +5503,12 @@
 <!--  Number: 10 - 900 -->
 <!--  Mandatory -->
 <P26055>10</P26055>
-
+ 
 <!--  Play Tone On Receiving IM. 0 - Disable, 1 - Enable. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
 <P26056>0</P26056>
-
+ 
 <!--  Allow Incoming Call Before Ringing. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
@@ -5989,11 +5989,7 @@
 <!--  Degree Unit. auto - Automatic, f - Fahrenheit, c - Celsius. Default is auto -->
 <!--  String: auto, f, c -->
 <!--  Mandatory -->
-{if isset($grandstream_temp_unit)}
-<P1379>{$grandstream_temp_unit}</P1379>
-{else}
-<P1379>auto</P1379>
-{/if}
+<P1379>c</P1379>
 
 <!--  Currency Update -->
 <!--  Enable Currency update. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 47657146e0..247419fdb9 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -1586,7 +1586,7 @@
 <!--  Name -->
 <!--  String -->
 <P507>{$display_name_3}</P507>
-
+	
 <!--  Voice Mail UserID -->
 <!--  String -->
 <P526>*97</P526>
@@ -4573,7 +4573,7 @@
 <!--  String -->
 <!--  For GXP2130, Default value is Grandstream GXP2130. -->
 <!-- P148>Grandstream GXP2130</P148> -->
-
+ 
 <!--  For GXP2140, Default value is Grandstream GXP2140. -->
 <!-- P148>Grandstream GXP2140</P148> -->
 
@@ -5493,7 +5493,7 @@
 <!--  User-Agent Prefix -->
 <!--  String -->
 <P8358></P8358>
-
+ 
 <!--  Auto Provision List Starting Point. 0 - Extension Boards, 1 - VPKs, 2 - MPK . Default is 0.  - VPK/MPK is for GXP2130 only. Extension Boards/VPK is for GXP2140/2160/2170. -->
 <!--  Number: 0, 1, 2  -->
 <!--  Mandatory -->
@@ -5503,12 +5503,12 @@
 <!--  Number: 10 - 900 -->
 <!--  Mandatory -->
 <P26055>10</P26055>
-
+ 
 <!--  Play Tone On Receiving IM. 0 - Disable, 1 - Enable. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
 <P26056>0</P26056>
-
+ 
 <!--  Allow Incoming Call Before Ringing. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
@@ -5989,11 +5989,7 @@
 <!--  Degree Unit. auto - Automatic, f - Fahrenheit, c - Celsius. Default is auto -->
 <!--  String: auto, f, c -->
 <!--  Mandatory -->
-<P1379>{if isset ($grandstream_temp_unit)}
-<P1379>{}$grandstream_temp_unit}</P1379>
-{else}
-<P1379>auto</P1379>
-{/if}
+<P1379>c</P1379>
 
 <!--  Currency Update -->
 <!--  Enable Currency update. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 8bd7f5997a..a411419a0b 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -7262,11 +7262,7 @@
 <!-- # Degree Unit. auto - Automatic, f - Fahrenheit, c - Celsius. Default is auto -->
 <!-- # String: auto, f, c -->
 <!-- # Mandatory -->
-<P1379>{if isset ($grandstream_temp_unit)}
-<P1379>{}$grandstream_temp_unit}</P1379>
-{else}
 <P1379>auto</P1379>
-{/if}
 
 <!-- # Currency Update -->
 <!-- # Enable Currency update. 0 - No, 1 - Yes. Default is 1 -->