From 97c1f6d5d4848e317f662db2fc0fb0d8d16c1cad Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Fri, 30 Jul 2021 10:18:27 +0200
Subject: [PATCH] Minor settings changes

---
 conf/sccpgeneral.xml.v433            | 2 +-
 install.php                          | 3 ++-
 module.xml                           | 2 +-
 sccpManClasses/dbinterface.class.php | 1 -
 sccpManClasses/formcreate.class.php  | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/conf/sccpgeneral.xml.v433 b/conf/sccpgeneral.xml.v433
index 47522ad..58c6c13 100644
--- a/conf/sccpgeneral.xml.v433
+++ b/conf/sccpgeneral.xml.v433
@@ -218,7 +218,7 @@ and open the template in the editor. Base Version before all crash :-)
             <label>Device Connect Address / Name </label>
             <name>ccm_address</name>
             <cbutton field="internal" value="internal">Internal</cbutton>
-            <default>0.0.0.0:2000</default>
+            <default>0.0.0.0/2000</default>
             <input value="NONE" field="ip" nameseparator=":">
                 <options placeholder="0.0.0.0 / pbx.org"/>
                 <class></class>
diff --git a/install.php b/install.php
index c7d87d7..4953688 100644
--- a/install.php
+++ b/install.php
@@ -990,7 +990,7 @@ function checkTftpServer() {
 
     // Get TFTP mapping Status
     $settingsFromDb['tftp_rewrite'] = array('keyword' => 'tftp_rewrite', 'seq' => 20, 'type' => 0, 'data' => 'off', 'systemdefault' => '');
-    if (\FreePbx::Sccp_manager()->checkTftpMapping()) {
+    if ($thisInstaller->checkTftpMapping()) {
         $settingsFromDb['tftp_rewrite']['data'] = 'pro';
     }
 
@@ -1100,6 +1100,7 @@ function cleanUpSccpSettings() {
         }
         // Override certain chan-sccp defaults as they are based on a non-FreePbx system
         $settingsFromDb['context']['systemdefault'] = 'from-internal';
+        $settingsFromDb['directed_pickup']['systemdefault'] = 'no';
 
         unset($sysConfiguration[$key]);
     }
diff --git a/module.xml b/module.xml
index 33f9036..28e6e6d 100644
--- a/module.xml
+++ b/module.xml
@@ -1,7 +1,7 @@
 <module>
 	<rawname>sccp_manager</rawname>
 	<name>SCCP Manager</name>
-	<version>14.3.0.1</version>
+	<version>14.3.0.0</version>
 	<type>setup</type>
 	<category>SCCP Connectivity</category>
 	<publisher>Steve Lad, Alex GP</publisher>
diff --git a/sccpManClasses/dbinterface.class.php b/sccpManClasses/dbinterface.class.php
index 2af41b4..d16470c 100644
--- a/sccpManClasses/dbinterface.class.php
+++ b/sccpManClasses/dbinterface.class.php
@@ -400,7 +400,6 @@ class dbinterface
     {
         $result = 0;
         $check_fields = [
-                        '430' => ['_hwlang' => "varchar(12)"],
                         '431' => ['private'=> "enum('on','off')"],
                         '433' => ['directed_pickup'=>'']
                         ];
diff --git a/sccpManClasses/formcreate.class.php b/sccpManClasses/formcreate.class.php
index 184805a..fc86a9a 100644
--- a/sccpManClasses/formcreate.class.php
+++ b/sccpManClasses/formcreate.class.php
@@ -384,8 +384,7 @@ class formcreate
                     }
 
                     // Output current value
-                    // TODO: This is debug code and needs to be set to only echo res_v
-                    echo $res_v . $res_n . $sccp_defaults[$res_n]['systemdefault'] . $usingSysDefaults;
+                    echo $res_v;
                     ?>
                     </div>
                     <div class="col-md-4">