Use a process identifier for logging that contains the pid (#5359)

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index f08f6f66dca4a32955e82c0ab2ce718fc9d2fb7e..38b207c2668acc0a0e1139ffc221ca144346709e 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;
 
@@ -172,14 +174,31 @@ class App
                $this->callstack['parser'] = [];
 
                $this->config = [];
-               $this->page = [];
+
+               $this->page = [
+                       'aside' => '',
+                       'bottom' => '',
+                       'content' => '',
+                       'end' => '',
+                       'footer' => '',
+                       'htmlhead' => '',
+                       'nav' => '',
+                       'page_title' => '',
+                       'right_aside' => '',
+                       'template' => '',
+                       'title' => ''
+               ];
+
                $this->pager = [];
 
                $this->query_string = '';
 
-               $this->process_id = uniqid('log', true);
+               $this->process_id = System::processID('log');
 
-               startup();
+               set_time_limit(0);
+
+               // This has to be quite large to deal with embedded private photos
+               ini_set('pcre.backtrack_limit', 500000);
 
                $this->scheme = 'http';
 
@@ -288,7 +307,7 @@ class App
                $this->is_tablet = $mobile_detect->isTablet();
 
                // Friendica-Client
-               $this->is_friendica_app = ($_SERVER['HTTP_USER_AGENT'] == 'Apache-HttpClient/UNAVAILABLE (java 1.4)');
+               $this->is_friendica_app = isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT'] == 'Apache-HttpClient/UNAVAILABLE (java 1.4)';
 
                // Register template engines
                $this->register_template_engine('Friendica\Render\FriendicaSmartyEngine');
@@ -407,11 +426,17 @@ class App
        public function set_baseurl($url)
        {
                $parsed = @parse_url($url);
+               $hostname = '';
 
                if (x($parsed)) {
-                       $this->scheme = $parsed['scheme'];
+                       if (!empty($parsed['scheme'])) {
+                               $this->scheme = $parsed['scheme'];
+                       }
+
+                       if (!empty($parsed['host'])) {
+                               $hostname = $parsed['host'];
+                       }
 
-                       $hostname = $parsed['host'];
                        if (x($parsed, 'port')) {
                                $hostname .= ':' . $parsed['port'];
                        }
@@ -427,7 +452,7 @@ class App
                                $this->hostname = Config::get('config', 'hostname');
                        }
 
-                       if (!isset($this->hostname) || ( $this->hostname == '')) {
+                       if (!isset($this->hostname) || ($this->hostname == '')) {
                                $this->hostname = $hostname;
                        }
                }
@@ -861,19 +886,7 @@ 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'));
+               array_unshift($args, $this->getConfigValue('config', 'php_path', 'php'));
 
                for ($x = 0; $x < count($args); $x ++) {
                        $args[$x] = escapeshellarg($args[$x]);
@@ -885,7 +898,7 @@ class App
                        return;
                }
 
-               if (Config::get('system', 'proc_windows')) {
+               if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
                        $resource = proc_open('cmd /c start /b ' . $cmdline, [], $foo, $this->get_basepath());
                } else {
                        $resource = proc_open($cmdline . ' &', [], $foo, $this->get_basepath());
@@ -986,6 +999,10 @@ class App
                if ($cat === 'config') {
                        $this->config[$k] = $value;
                } else {
+                       if (!isset($this->config[$cat])) {
+                               $this->config[$cat] = [];
+                       }
+
                        $this->config[$cat][$k] = $value;
                }
        }
@@ -1044,6 +1061,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;
        }
 
@@ -1103,10 +1128,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;
        }
 
@@ -1138,7 +1168,12 @@ class App
                        }
                }
 
-               $user_theme = defaults($_SESSION, 'theme', $system_theme);
+               if (!empty($_SESSION)) {
+                       $user_theme = defaults($_SESSION, 'theme', $system_theme);
+               } else {
+                       $user_theme = $system_theme;
+               }
+
                // Specific mobile theme override
                if (($this->is_mobile || $this->is_tablet) && defaults($_SESSION, 'show-mobile', true)) {
                        $system_mobile_theme = Config::get('system', 'mobile-theme');