Some of the last direct SQL calls to the item table had been changed

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 815a02f281896efab1c1ce0b6f2e288115c6f521..f5626761e59d5ac8327e4d7fb6ada1395f1137a4 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -9,6 +9,8 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use dba;
 
 use Detection\MobileDetect;
 
@@ -32,6 +34,10 @@ require_once 'include/text.php';
  */
 class App
 {
+       const MODE_NORMAL = 0;
+       const MODE_INSTALL = 1;
+       const MODE_MAINTENANCE = 2;
+
        public $module_loaded = false;
        public $module_class = null;
        public $query_string;
@@ -52,6 +58,7 @@ class App
        public $argv;
        public $argc;
        public $module;
+       public $mode = App::MODE_NORMAL;
        public $pager;
        public $strings;
        public $basepath;
@@ -288,6 +295,14 @@ class App
                // Register template engines
                $this->register_template_engine('Friendica\Render\FriendicaSmartyEngine');
 
+               /**
+                * Load the configuration file which contains our DB credentials.
+                * Ignore errors. If the file doesn't exist or is empty, we are running in
+                * installation mode.    *
+                */
+               $this->mode = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? App::MODE_NORMAL : App::MODE_INSTALL);
+
+
                self::$a = $this;
        }
 
@@ -848,18 +863,6 @@ class App
                        return;
                }
 
-               // If the last worker fork was less than 2 seconds before then don't fork another one.
-               // This should prevent the forking of masses of workers.
-               $cachekey = 'app:proc_run:started';
-               $result = Cache::get($cachekey);
-
-               if (!is_null($result) && ( time() - $result) < 2) {
-                       return;
-               }
-
-               // Set the timestamp of the last proc_run
-               Cache::set($cachekey, time(), CACHE_MINUTE);
-
                array_unshift($args, ((x($this->config, 'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php'));
 
                for ($x = 0; $x < count($args); $x ++) {
@@ -973,6 +976,10 @@ class App
                if ($cat === 'config') {
                        $this->config[$k] = $value;
                } else {
+                       if (!isset($this->config[$cat])) {
+                               $this->config[$cat] = [];
+                       }
+
                        $this->config[$cat][$k] = $value;
                }
        }
@@ -1031,6 +1038,14 @@ class App
                // Only arrays are serialized in database, so we have to unserialize sparingly
                $value = is_string($v) && preg_match("|^a:[0-9]+:{.*}$|s", $v) ? unserialize($v) : $v;
 
+               if (!isset($this->config[$uid])) {
+                       $this->config[$uid] = [];
+               }
+
+               if (!isset($this->config[$uid][$cat])) {
+                       $this->config[$uid][$cat] = [];
+               }
+
                $this->config[$uid][$cat][$k] = $value;
        }
 
@@ -1068,6 +1083,21 @@ class App
                return $sender_email;
        }
 
+       /**
+        * @note Checks, if the App is in the Maintenance-Mode
+        *
+        * @return boolean
+        */
+       public function checkMaintenanceMode()
+       {
+               if (Config::get('system', 'maintenance')) {
+                       $this->mode = App::MODE_MAINTENANCE;
+                       return true;
+               }
+
+               return false;
+       }
+
        /**
         * Returns the current theme name.
         *
@@ -1075,10 +1105,15 @@ class App
         */
        public function getCurrentTheme()
        {
-               if (!$this->current_theme) {
-                       $this->computeCurrentTheme();
+               if ($this->mode == App::MODE_INSTALL) {
+                       return '';
                }
 
+               //// @TODO Compute the current theme only once (this behavior has
+               /// already been implemented, but it didn't work well -
+               /// https://github.com/friendica/friendica/issues/5092)
+               $this->computeCurrentTheme();
+
                return $this->current_theme;
        }