From 5b67c8d6f94bcc339d96c2d9ac2cdd833eab334c Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Fri, 11 Jun 2021 11:08:32 +0200
Subject: [PATCH] Fix issue 12

Remove empty defaults from database definitions - Doctrine parses incorrectly
Add case in installer to create extconfig.conf if does not exist
---
 install.php | 17 ++++++++++++++---
 module.xml  | 12 ++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/install.php b/install.php
index 3e4a033..4bbc094 100644
--- a/install.php
+++ b/install.php
@@ -793,18 +793,23 @@ function Setup_RealTime()
 
     // Check extconfig file for correct connector values
     $ext_conf = '';
-    $ext_conf_file = 'extconfig.conf';
+    $ext_conf_file = '';
     $backup_ext = array('_custom.conf', '_additional.conf','.conf');
     foreach ($backup_ext as $value) {
         if (file_exists($dir . '/extconfig' . $value)) {
             // Last possibility is normal file extconfig.conf
-            $ext_conf_file =  'extconfig' . $value;
+            $ext_conf_file = $dir . 'extconfig' . $value;
             $ext_conf = $cnf_read->getConfig($ext_conf_file);
             break;
         }
     }
+    if (empty($ext_conf_file)) {
+        // Have not found a file, so will need to create. $ext_conf must be empty
+        $ext_conf_file = $dir . '/extconfig.conf';
+    }
 
     if (!empty($ext_conf)) {
+        // Have found a file and read a config. Now need to check required settings
         $currentExtSettings = array();
         $writeExtSettings = $ext_conf;
         if (empty($ext_conf['settings']['sccpdevice']) || ($ext_conf['settings']['sccpdevice'] !== $def_ext_config['sccpdevice'])) {
@@ -816,9 +821,15 @@ function Setup_RealTime()
             $writeExtSettings['settings']['sccpline'] = $def_ext_config['sccpline'];
         }
         if (!empty($writeExtSettings)) {
-            outn("<li>" . _("Updating extconfig file ...") . "</li>");
+            outn("<li>" . _("Updating extconfig file ...  ") . $ext_conf_file . "</li>");
             $cnf_wr->writeConfig($ext_conf_file, $writeExtSettings);
         }
+    } else {
+        // Either did not find file or file did not contain any config, so create and fill
+        outn("<li>" . _("Creating extconfig file ...  ") . . $ext_conf_file . "</li>");
+        $writeExtSettings['settings']['sccpdevice'] = $def_ext_config['sccpdevice'];
+        $writeExtSettings['settings']['sccpline'] = $def_ext_config['sccpline'];
+        $cnf_wr->writeConfig($ext_conf_file, $writeExtSettings);
     }
 
     // Check database settings
diff --git a/module.xml b/module.xml
index 4ed9ca8..ce0761e 100644
--- a/module.xml
+++ b/module.xml
@@ -30,7 +30,7 @@
 	<md5sum></md5sum>
 	<database>
 		<table name="sccpdevice">
-			<field name="name" type="string" length="15" default="" primarykey="true"/>
+			<field name="name" type="string" length="15" primarykey="true"/>
 			<field name="type" type="string" length="15" notnull="false"/>
 			<field name="addon" type="string" length="45" notnull="false"/>
 			<field name="_description" type="string" length="45" notnull="false"/>
@@ -115,14 +115,14 @@
 			<field name="dnd" type="string" default="reject" notnull="false"/>
 			<field name="videomode" type="string" default="auto" notnull="false"/>
 			<field name="setvar" type="string" length="50" notnull="false"/>
-			<field name="name" type="string" length="40" default="" primarykey="true"/>
+			<field name="name" type="string" length="40" primarykey="true"/>
 			<field name="phonecodepage" type="string" length="50" notnull="false"/>
 			<key name="id" type="unique">
 				<column name="id"/>
 			</key>
 	 	</table>
 		<table name="sccpbuttonconfig">
-			 <field name="ref" type="string" length="15" default="" primarykey="true"/>
+			 <field name="ref" type="string" length="15" primarykey="true"/>
 			 <field name="reftype" type="string" length="15" default="sccpdevice" primarykey="true"/>
 			 <field name="instance" type="boolean" default="0" primarykey="true"/>
 			 <field name="buttontype" type="string" default="line" primarykey="true"/>
@@ -134,11 +134,11 @@
 			 </key>
 		 </table>
 		 <table name="sccpdevmodel">
-			 <field name="model" type="string" length="20" default="" primarykey="true"/>
-			 <field name="vendor" type="string" length="40" default="" notnull="false"/>
+			 <field name="model" type="string" length="20" primarykey="true"/>
+			 <field name="vendor" type="string" length="40" notnull="false"/>
 			 <field name="dns" type="integer" default="1" notnull="false"/>
 			 <field name="buttons" type="integer" default="0" notnull="false"/>
-			 <field name="loadimage" type="string" length="40" default="" notnull="false"/>
+			 <field name="loadimage" type="string" length="40" notnull="false"/>
 			 <field name="loadinformationid" type="string" length="30" notnull="false"/>
 			 <field name="enabled" type="integer" default="0" notnull="false"/>
 			 <field name="nametemplate" type="string" length="50" notnull="false"/>