Merge pull request #5332 from annando/fix-lock

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index dd3d2397cb941766089a3d8ca0d665a7a9441457..a2bdd03df6c1801f1836f8edb5f9fd68eb883adc 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -181,7 +181,10 @@ class App
 
                $this->process_id = uniqid('log', true);
 
-               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';
 
@@ -290,7 +293,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');
@@ -409,11 +412,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'];
                        }
@@ -429,7 +438,7 @@ class App
                                $this->hostname = Config::get('config', 'hostname');
                        }
 
-                       if (!isset($this->hostname) || ( $this->hostname == '')) {
+                       if (!isset($this->hostname) || ($this->hostname == '')) {
                                $this->hostname = $hostname;
                        }
                }
@@ -863,7 +872,7 @@ class App
                        return;
                }
 
-               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]);
@@ -875,7 +884,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());
@@ -976,6 +985,10 @@ class App
                if ($cat === 'config') {
                        $this->config[$k] = $value;
                } else {
+                       if (!isset($this->config[$cat])) {
+                               $this->config[$cat] = [];
+                       }
+
                        $this->config[$cat][$k] = $value;
                }
        }
@@ -1034,6 +1047,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;
        }