diff options
| author |  Tom Willemse | 2024-06-05 16:01:19 -0700 |
|---|---|---|
| committer | Tom Willemse | 2024-06-05 16:01:19 -0700 |
| commit | 9bcc5827388491d37591a86a175f63fa9cd38d41 (patch) | |
| tree | ae5ba1327aa3125af8959728db464bef65f307a6 /src | |
| parent | abbaa41854ba13266aadeafda81553d11dd50947 (diff) | |
| download | scuttle-9bcc5827388491d37591a86a175f63fa9cd38d41.tar.gz scuttle-9bcc5827388491d37591a86a175f63fa9cd38d41.zip | |
Clean up configuration file finding
Don't make finding the default files dependent on finding regular files.
Diffstat (limited to 'src')
| -rw-r--r-- | src/SemanticScuttle/Config.php | 31 |
1 files changed, 14 insertions, 17 deletions
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)) { |