From 9bcc5827388491d37591a86a175f63fa9cd38d41 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Wed, 5 Jun 2024 16:01:19 -0700
Subject: Clean up configuration file finding

Don't make finding the default files dependent on finding regular files.
---
 src/SemanticScuttle/Config.php | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/SemanticScuttle/Config.php b/src/SemanticScuttle/Config.php
index 3b0f75f..28ae817 100644
--- a/src/SemanticScuttle/Config.php
+++ b/src/SemanticScuttle/Config.php
@@ -81,16 +81,25 @@ class SemanticScuttle_Config
             // then don't look in /etc for config files.
             // the check is not perfect, but it covers most cases
             $arFiles = array(
-                $datadir . 'config.' . $host . '.php',
-                $datadir . 'config.php',
+                "{$datadir}config.{$host}.php",
+                "{$datadir}config.php",
+            );
+            $arDefaultFiles = array(
+                "{$datadir}config.{$host}.default.php",
+                "{$datadir}config.default.php",
             );
         } else {
             $arFiles = array(
-                $datadir . 'config.' . $host . '.php',
-                '/etc/semanticscuttle/config.' . $host . '.php',
-                $datadir . 'config.php',
+                "{$datadir}config.{$host}.php",
+                "/etc/semanticscuttle/config.{$host}.php",
+                "{$datadir}config.php",
                 '/etc/semanticscuttle/config.php',
             );
+            $arDefaultFiles = array(
+                "{$datadir}config.{$host}.default.php",
+                "/etc/semanticscuttle/config.{$host}.default.php",
+                "{$datadir}config.default.php",
+            );
         }
 
         $configfile = null;
@@ -101,18 +110,6 @@ class SemanticScuttle_Config
             }
         }
 
-        //find default file
-        if (null === $configfile) {
-            $arDefaultFiles = array();
-        } else {
-            $arDefaultFiles = array_unique(
-                array(
-                    substr($configfile, 0, -3) . 'default.php',
-                    $datadir . 'config.default.php',
-                    '/etc/semanticscuttle/config.default.php',
-                )
-            );
-        }
         $defaultfile = null;
         foreach ($arDefaultFiles as $file) {
             if (file_exists($this->filePrefix . $file)) {
-- 
cgit v1.2.3-54-g00ecf