Prevent infinite loops with Config when App is in install mode

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 6c078e2249dbb016cfa038a10ffafac7035093e3..7ad28c96f5660c3c8da843c91c97b3b308404426 100755 (executable)
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -54,6 +54,7 @@ require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
 
-$oAuth = new ExAuth();
-
-$oAuth->readStdin();
\ No newline at end of file
+if ($a->mode === App::MODE_NORMAL) {
+       $oAuth = new ExAuth();
+       $oAuth->readStdin();
+}
\ No newline at end of file

diff --git a/src/Core/Config.php b/src/Core/Config.php
index 3c1d3245fd2256e3bde8fdd3801d4181ce84e8de..b327eb133ff9e1233d247bed46605eaff22bf82c 100644 (file)
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -29,6 +29,11 @@ class Config extends BaseObject
 
        public static function init()
        {
+               // Database isn't ready or populated yet
+               if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
+                       return;
+               }
+
                if (self::getApp()->getConfigValue('system', 'config_adapter') == 'preload') {
                        self::$adapter = new Config\PreloadConfigAdapter();
                } else {
@@ -48,6 +53,11 @@ class Config extends BaseObject
         */
        public static function load($family = "config")
        {
+               // Database isn't ready or populated yet
+               if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
+                       return;
+               }
+
                if (empty(self::$adapter)) {
                        self::init();
                }
@@ -76,6 +86,11 @@ class Config extends BaseObject
         */
        public static function get($family, $key, $default_value = null, $refresh = false)
        {
+               // Database isn't ready or populated yet, fallback to file config
+               if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
+                       return self::getApp()->getConfigValue($family, $key, $default_value);
+               }
+
                if (empty(self::$adapter)) {
                        self::init();
                }
@@ -99,6 +114,11 @@ class Config extends BaseObject
         */
        public static function set($family, $key, $value)
        {
+               // Database isn't ready or populated yet
+               if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
+                       return false;
+               }
+
                if (empty(self::$adapter)) {
                        self::init();
                }
@@ -119,6 +139,11 @@ class Config extends BaseObject
         */
        public static function delete($family, $key)
        {
+               // Database isn't ready or populated yet
+               if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
+                       return false;
+               }
+
                if (empty(self::$adapter)) {
                        self::init();
                }

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 274122deda4513dd63acaeded4414989b0d7fd21..3b01bceeaf8a916bcd86584b454f98f489f78ada 100644 (file)
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -9,7 +9,6 @@
 namespace Friendica\Core;
 
 use Friendica\BaseObject;
-use Friendica\Core\Config;
 
 require_once 'include/dba.php';
 
@@ -29,7 +28,12 @@ class PConfig extends BaseObject
 
        public static function init($uid)
        {
-               if (Config::get('system', 'config_adapter') == 'preload') {
+               // Database isn't ready or populated yet
+               if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
+                       return;
+               }
+
+               if (self::getApp()->getConfigValue('system', 'config_adapter') == 'preload') {
                        self::$adapter = new Config\PreloadPConfigAdapter($uid);
                } else {
                        self::$adapter = new Config\JITPConfigAdapter($uid);
@@ -49,6 +53,11 @@ class PConfig extends BaseObject
         */
        public static function load($uid, $family)
        {
+               // Database isn't ready or populated yet
+               if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
+                       return;
+               }
+
                if (empty(self::$adapter)) {
                        self::init($uid);
                }
@@ -73,6 +82,11 @@ class PConfig extends BaseObject
         */
        public static function get($uid, $family, $key, $default_value = null, $refresh = false)
        {
+               // Database isn't ready or populated yet
+               if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
+                       return;
+               }
+
                if (empty(self::$adapter)) {
                        self::init($uid);
                }
@@ -97,6 +111,11 @@ class PConfig extends BaseObject
         */
        public static function set($uid, $family, $key, $value)
        {
+               // Database isn't ready or populated yet
+               if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
+                       return false;
+               }
+
                if (empty(self::$adapter)) {
                        self::init($uid);
                }
@@ -118,6 +137,11 @@ class PConfig extends BaseObject
         */
        public static function delete($uid, $family, $key)
        {
+               // Database isn't ready or populated yet
+               if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
+                       return false;
+               }
+
                if (empty(self::$adapter)) {
                        self::init($uid);
                }