From 4b40811d60146f71e02f562665c3ac40672eaa4d Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Tue, 20 Jul 2021 15:40:35 +0200
Subject: [PATCH] Fix issue with uninitialised adv.ini

Change logic to ensure adv.ini is initialised - necessary as used __Construct before sccp_manager installer can initialise.
---
 sccpManClasses/extconfigs.class.php | 37 ++++++++++++-----------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/sccpManClasses/extconfigs.class.php b/sccpManClasses/extconfigs.class.php
index 7f6cb5f..8e31d36 100644
--- a/sccpManClasses/extconfigs.class.php
+++ b/sccpManClasses/extconfigs.class.php
@@ -281,43 +281,36 @@ class extconfigs
                         );
         $baseConfig = array();
 
-        if (!empty($settingsFromDb['tftp_rewrite_path']['data'])) {
+        if (empty($settingsFromDb['tftp_rewrite_path']['data'])) {
+            $settingsFromDb['tftp_rewrite_path']['data'] = $settingsFromDb['tftp_path']['data'];
+        } else {
             // Have a setting in sccpsettings. It should start with $tftp_path
             // If not we will replace it with $tftp_path. Avoids issues with legacy values
             if (!strpos($settingsFromDb['tftp_rewrite_path']["data"],$settingsFromDb['tftp_path']['data'])) {
-
-                $adv_ini = "{$settingsFromDb['tftp_path']['data']}/index.cnf";
                 $settingsFromDb['tftp_rewrite_path']['data'] = $settingsFromDb['tftp_path']['data'];
             }
-            $adv_ini = "{$settingsFromDb['tftp_rewrite_path']["data"]}/index.cnf";
         }
-
+        $adv_ini = "{$settingsFromDb['tftp_rewrite_path']["data"]}/index.cnf";
         $adv_tree_mode = 'def';
 
         switch ($settingsFromDb['tftp_rewrite']['data']) {
             case 'pro':
                 $adv_tree_mode = 'pro';
-                if (!empty($adv_ini)) {
-                    if (!empty($adv_ini) && file_exists($adv_ini)) {
-                        $adv_ini_array = parse_ini_file($adv_ini);
-                        $adv_config = array_merge($adv_config, $adv_ini_array);
-                    }
+                if (!empty($adv_ini) && file_exists($adv_ini)) {
+                    $adv_ini_array = parse_ini_file($adv_ini);
+                    $adv_config = array_merge($adv_config, $adv_ini_array);
                 }
                 // rewrite adv_ini to reflect the new $adv_config
-                if (!empty($adv_ini)) {
-                    if (file_exists($adv_ini)){
-                        rename($adv_ini, "{$adv_ini}.old");
-                    }
+                if (file_exists($adv_ini)){
+                    rename($adv_ini, "{$adv_ini}.old");
                 }
-                if (!empty($adv_ini)) {
-                    $indexFile = fopen($adv_ini,'w');
-                    fwrite($indexFile, "[main]\n");
-                    foreach ($adv_config as $advKey => $advVal) {
-                        fwrite($indexFile, "{$advKey} = {$advVal}\n");
-                    }
-                    fclose($indexFile);
-                    $settingsFromDb['tftp_rewrite']['data'] = 'pro';
+                $indexFile = fopen($adv_ini,'w');
+                fwrite($indexFile, "[main]\n");
+                foreach ($adv_config as $advKey => $advVal) {
+                    fwrite($indexFile, "{$advKey} = {$advVal}\n");
                 }
+                fclose($indexFile);
+                $settingsFromDb['tftp_rewrite']['data'] = 'pro';
                 break;
             case 'on':
             case 'internal':