]> git.mxchange.org Git - friendica.git/blobdiff - src/App.php
API: fix sender/recipient of PMs: check api_user before get user info.
[friendica.git] / src / App.php
index b285218f483c7fed8d2d3ca26bd9b3c504bf8eec..f5626761e59d5ac8327e4d7fb6ada1395f1137a4 100644 (file)
@@ -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;
 
@@ -861,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 ++) {
@@ -986,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;
                }
        }
@@ -1044,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;
        }
 
@@ -1095,4 +1097,90 @@ class App
 
                return false;
        }
+
+       /**
+        * Returns the current theme name.
+        *
+        * @return string
+        */
+       public function getCurrentTheme()
+       {
+               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;
+       }
+
+       /**
+        * Computes the current theme name based on the node settings, the user settings and the device type
+        *
+        * @throws Exception
+        */
+       private function computeCurrentTheme()
+       {
+               $system_theme = Config::get('system', 'theme');
+               if (!$system_theme) {
+                       throw new Exception(L10n::t('No system theme config value set.'));
+               }
+
+               // Sane default
+               $this->current_theme = $system_theme;
+
+               $allowed_themes = explode(',', Config::get('system', 'allowed_themes', $system_theme));
+
+               $page_theme = null;
+               // Find the theme that belongs to the user whose stuff we are looking at
+               if ($this->profile_uid && ($this->profile_uid != local_user())) {
+                       // Allow folks to override user themes and always use their own on their own site.
+                       // This works only if the user is on the same server
+                       $user = dba::selectFirst('user', ['theme'], ['uid' => $this->profile_uid]);
+                       if (DBM::is_result($user) && !PConfig::get(local_user(), 'system', 'always_my_theme')) {
+                               $page_theme = $user['theme'];
+                       }
+               }
+
+               $user_theme = defaults($_SESSION, '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');
+                       $user_mobile_theme = defaults($_SESSION, 'mobile-theme', $system_mobile_theme);
+
+                       // --- means same mobile theme as desktop
+                       if (!empty($user_mobile_theme) && $user_mobile_theme !== '---') {
+                               $user_theme = $user_mobile_theme;
+                       }
+               }
+
+               if ($page_theme) {
+                       $theme_name = $page_theme;
+               } else {
+                       $theme_name = $user_theme;
+               }
+
+               if ($theme_name
+                       && in_array($theme_name, $allowed_themes)
+                       && (file_exists('view/theme/' . $theme_name . '/style.css')
+                       || file_exists('view/theme/' . $theme_name . '/style.php'))
+               ) {
+                       $this->current_theme = $theme_name;
+               }
+       }
+
+       /**
+        * @brief Return full URL to theme which is currently in effect.
+        *
+        * Provide a sane default if nothing is chosen or the specified theme does not exist.
+        *
+        * @return string
+        */
+       public function getCurrentThemeStylesheetPath()
+       {
+               return Core\Theme::getStylesheetPath($this->getCurrentTheme());
+       }
 }