Merge pull request #5109 from rabuzarus/20180522_-_frio_nav_about_instance

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 815a02f281896efab1c1ce0b6f2e288115c6f521..655ea84f00d958008c6d7c8fffcf6d0ed8adb1a6 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -32,6 +32,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 +56,7 @@ class App
        public $argv;
        public $argc;
        public $module;
+       public $mode = App::MODE_NORMAL;
        public $pager;
        public $strings;
        public $basepath;
@@ -288,6 +293,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 +861,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 ++) {
@@ -1068,6 +1069,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,6 +1091,10 @@ class App
         */
        public function getCurrentTheme()
        {
+               if ($this->mode == App::MODE_INSTALL) {
+                       return '';
+               }
+
                if (!$this->current_theme) {
                        $this->computeCurrentTheme();
                }