removed memcache unit-test because lack of support in travis

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 07e776745535f1b60039a71ca1f7270c9ca6f7a4..92ff0571387cbd928f293698ef6acf88535ac703 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;
 
@@ -179,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';
 
@@ -288,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');
@@ -861,7 +866,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]);
@@ -873,7 +878,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());
@@ -974,6 +979,10 @@ class App
                if ($cat === 'config') {
                        $this->config[$k] = $value;
                } else {
+                       if (!isset($this->config[$cat])) {
+                               $this->config[$cat] = [];
+                       }
+
                        $this->config[$cat][$k] = $value;
                }
        }
@@ -1032,6 +1041,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;
        }
 
@@ -1091,10 +1108,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;
        }