app/core/ConfigLoader.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Core;
-
-class ConfigLoader
-{
-    /**
-     * Load configuration array from a set of possible file locations.
-     *
-     * @param string[] $locations
-     * @return array
-     */
-    public static function loadConfig(array $locations): array
-    {
-        $configFile = null;
-        foreach ($locations as $location) {
-            if (file_exists($location)) {
-                $configFile = $location;
-                break;
-            }
-        }
-        if (!$configFile) {
-            die('Config file not found');
-        }
-        return require $configFile;
-    }
-}

public_html/index.php

@@ -111,16 +111,29 @@ $allowed_urls = [
 // Let plugins filter/extend allowed_urls
 $allowed_urls = filter_allowed_urls($allowed_urls);
 
-require_once __DIR__ . '/../app/core/ConfigLoader.php';
+// cnfig file
-use App\Core\ConfigLoader;
+// possible locations, in order of preference
-
+$config_file_locations = [
-// Load configuration
-$config = ConfigLoader::loadConfig([
     __DIR__ . '/../app/config/jilo-web.conf.php',
     __DIR__ . '/../jilo-web.conf.php',
     '/srv/jilo-web/jilo-web.conf.php',
-    '/opt/jilo-web/jilo-web.conf.php',
+    '/opt/jilo-web/jilo-web.conf.php'
-]);
+];
+$config_file = null;
+// try to find the config file
+foreach ($config_file_locations as $location) {
+    if (file_exists($location)) {
+        $config_file = $location;
+        break;
+    }
+}
+// if found, use it
+if ($config_file) {
+    $localConfigPath = str_replace(__DIR__ . '/..', '', $config_file);
+    $config = require $config_file;
+} else {
+    die('Config file not found');
+}
 
 $app_root = $config['folder'];