From 2a98d8cfdb3d75a18a29eca003ebd8b95d2c3340 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Sat, 10 Jul 2021 12:17:46 +0200
Subject: [PATCH] Override chan-sccp default context

---
 install.php              | 8 ++++++--
 views/hardware.phone.php | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/install.php b/install.php
index 0f22f48..8eea9f1 100644
--- a/install.php
+++ b/install.php
@@ -998,16 +998,20 @@ function cleanUpSccpSettings() {
                 unset($settingsFromDb[$valueArray['Name']]);
             }
         } else {
+            ($sysConfiguration[$valueArray['Name']]['DefaultValue'] == '(null)') ? '' : $sysConfiguration[$valueArray['Name']]['DefaultValue'];
             $sysConfiguration[$valueArray['Name']] = $valueArray;
             if (array_key_exists($valueArray['Name'],$settingsFromDb)) {
                 if (!empty($sysConfiguration[$valueArray['Name']]['DefaultValue'])) {
+                    // Preserve sequence and type
                     $settingsFromDb[$valueArray['Name']]['systemdefault'] = $sysConfiguration[$valueArray['Name']]['DefaultValue'];
                 }
             } else {
-
-                    $settingsFromDb[$valueArray['Name']] = array('keyword' => $valueArray['Name'], 'seq' => 0, 'type' => 0, 'data' => '', 'systemdefault' => $sysConfiguration[$valueArray['Name']]['DefaultValue']);
+                $settingsFromDb[$valueArray['Name']] = array('keyword' => $valueArray['Name'], 'seq' => 0, 'type' => 0, 'data' => '', 'systemdefault' => $sysConfiguration[$valueArray['Name']]['DefaultValue']);
             }
         }
+        // Override certain chan-sccp defaults as they are based on a non-FreePbx system
+        $settingsFromDb['context']['systemdefault'] = 'from-internal'
+
         unset($sysConfiguration[$key]);
     }
     unset($sysConfiguration['Options']);
diff --git a/views/hardware.phone.php b/views/hardware.phone.php
index a18f259..562e30c 100644
--- a/views/hardware.phone.php
+++ b/views/hardware.phone.php
@@ -36,7 +36,7 @@
                         <tr>
                             <th data-checkbox="true"></th>
                             <th data-sortable="true" data-field="mac"><?php echo _('Device SEP ID') ?></th>
-                            <th data-sortable="true" data-field="description"><?php echo _('Device  Descriptions') ?></th>
+                            <th data-sortable="true" data-field="description"><?php echo _('Device  Description') ?></th>
                             <th data-sortable="true" data-formatter="DispayTypeFormatter" data-field="type"><?php echo _('Device type') ?></th>
                             <th data-sortable="true" data-field="button" data-formatter="LineFormatter"><?php echo _('Line') ?></th>
                             <th data-sortable="true" data-field="status"><?php echo _('Status') ?></th>