Bläddra i källkod

Prevent infinite loops with Config when App is in install mode

tags/2018.09
Hypolite Petovan 2 år sedan
förälder
incheckning
fd7179ee6c
3 ändrade filer med 55 tillägg och 5 borttagningar
  1. +4
    -3
      bin/auth_ejabberd.php
  2. +25
    -0
      src/Core/Config.php
  3. +26
    -2
      src/Core/PConfig.php

+ 4
- 3
bin/auth_ejabberd.php Visa fil

@@ -54,6 +54,7 @@ require_once "include/dba.php";

$a = new App(dirname(__DIR__));

$oAuth = new ExAuth();

$oAuth->readStdin();
if ($a->mode === App::MODE_NORMAL) {
$oAuth = new ExAuth();
$oAuth->readStdin();
}

+ 25
- 0
src/Core/Config.php Visa fil

@@ -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();
}


+ 26
- 2
src/Core/PConfig.php Visa fil

@@ -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);
}


Laddar…
Avbryt
Spara