GNU social config paths, removed StatusNet/Laconica

[quix0rs-gnu-social.git] / lib / gnusocial.php

diff --git a/lib/gnusocial.php b/lib/gnusocial.php
index 5551f432040096d0c0fa1d4930ead29369d521c7..ed87782c472e1f3a8dde0b6f5592dda487904fe7 100644 (file)
--- a/lib/gnusocial.php
+++ b/lib/gnusocial.php
@@ -27,6 +27,7 @@ global $config, $_server, $_path;
  */
 class GNUsocial
 {
+    protected static $config_files = array();
     protected static $have_config;
     protected static $is_api;
     protected static $is_ajax;
@@ -258,6 +259,15 @@ class GNUsocial
         return self::$have_config;
     }
 
+    /**
+     * Returns a list of configuration files that have
+     * been loaded for this instance of GNU social.
+     */
+    public static function configFiles()
+    {
+        return self::$config_files;
+    }
+
     public static function isApi()
     {
         return self::$is_api;
@@ -373,15 +383,11 @@ class GNUsocial
         if (isset($conffile)) {
             $config_files = array($conffile);
         } else {
-            $config_files = array('/etc/statusnet/statusnet.php',
-                                  '/etc/statusnet/laconica.php',
-                                  '/etc/laconica/laconica.php',
-                                  '/etc/statusnet/'.$_server.'.php',
-                                  '/etc/laconica/'.$_server.'.php');
+            $config_files = array('/etc/gnusocial/config.php',
+                                  '/etc/gnusocial/config.d/'.$_server.'.php');
 
             if (strlen($_path) > 0) {
-                $config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php';
-                $config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php';
+                $config_files[] = '/etc/gnusocial/config.d/'.$_server.'_'.$_path.'.php';
             }
 
             $config_files[] = INSTALLDIR.'/config.php';
@@ -393,8 +399,8 @@ class GNUsocial
             if (@file_exists($_config_file)) {
                 // Ignore 0-byte config files
                 if (filesize($_config_file) > 0) {
-                    common_log(LOG_INFO, "Including config file: " . $_config_file);
                     include($_config_file);
+                    self::$config_files[] = $_config_file;
                     self::$have_config = true;
                 }
             }