From b6dfb51993761b603134f3a39d85ebf164bccf88 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Sun, 4 Jul 2021 09:02:33 +0200
Subject: [PATCH] Conditional include of Use chan-sccp defaults/Customise
 button

If there is no chan-sccp default, do not add the button to use chan-sccp default/customise

This adds a large block of html + php enclosed within {}. Add documentation so that this is clear
---
 conf/sccpgeneral.xml.v433 |  8 ++++----
 views/formShowSysDefs.php | 13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/conf/sccpgeneral.xml.v433 b/conf/sccpgeneral.xml.v433
index 14e8ca8..4967003 100644
--- a/conf/sccpgeneral.xml.v433
+++ b/conf/sccpgeneral.xml.v433
@@ -411,7 +411,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IS" id="5" seq="0">
             <name>simulate_enbloc</name>
             <label>Simulated Enbloc Dialing</label>
-            <default>on</default>
+            <default></default>
             <button value="yes">Yes</button>
             <button value="no">No</button>
             <help>Use simulated enbloc dialing to speedup connection when dialing while onhook (older phones)</help>
@@ -897,7 +897,7 @@ and open the template in the editor. Base Version before all crash :-)
                 <default>0x4</default>
                 <class>sccp-custom</class>
             </input>
-            <help>SCCP Type Of Service / Class Of Service: SCCP Type or Class of Service - this is modifiable, but don't.</help>
+            <help>SCCP Signalling Type Of Service / Class Of Service - this is modifiable, but it is not recommended to change</help>
         </item>
         <item type="IE" id="2">
             <label>SCCP Audio ToS / CoS</label>
@@ -911,7 +911,7 @@ and open the template in the editor. Base Version before all crash :-)
                 <default>0x6</default>
                 <class>sccp-custom</class>
             </input>
-            <help>Audio Type Of Service / Class Of Service: Audio Type or Class of Service - this is modifiable, but don't.</help>
+            <help>Audio Type Of Service / Class Of Service - this is modifiable, but it is not recommended to change</help>
         </item>
         <item type="IE" id="3">
             <label>SCCP Video ToS / CoS</label>
@@ -925,7 +925,7 @@ and open the template in the editor. Base Version before all crash :-)
                 <default>0x5</default>
                 <class>sccp-custom</class>
             </input>
-            <help>Video Type Of Service / Class Of Service: Video Type or Class of Service - this is modifiable, but don't.</help>
+            <help>Video Type Of Service / Class Of Service - this is modifiable, but it is not recommended to change</help>
         </item>
     </page_group>
 
diff --git a/views/formShowSysDefs.php b/views/formShowSysDefs.php
index 9a4c18d..9480a30 100644
--- a/views/formShowSysDefs.php
+++ b/views/formShowSysDefs.php
@@ -420,6 +420,13 @@ foreach ($items as $child) {
                         <label class="control-label" for="<?php echo $res_id; ?>"><?php echo _($child->label)?></label>
                         <i class="fa fa-question-circle fpbx-help-icon" data-for="<?php echo $res_id; ?>"></i>
                     </div>
+
+                    <?php
+                    if (!empty($sccp_defaults[$res_n]['systemdefault'])) {
+                    // There is a system default, so add button to customise or reset
+                    // the closing } is after the code to include the button at line ~498
+                    ?>
+                    <!-- Start include of defaults button -->
                     <div class="col-md-3">
 
                     <?php
@@ -486,6 +493,12 @@ foreach ($items as $child) {
                     <div class="col-md-3">
                         <i><?php echo "Enter new site value for {$res_n}"; ?></i>
                     </div>
+                    <!-- Finish include of defaults button -->
+                    <?php
+                    // Close the conditional include of the defaults button opened at line ~425
+                    }
+                    ?>
+
                     <div class="col-md-9 radioset " data-hide="on">
 
                         <?php