]> git.mxchange.org Git - friendica.git/blobdiff - src/App.php
Quoted posts from Twitter now contain media again
[friendica.git] / src / App.php
index c56222b63f5d7b52bfa9daf98b929b13842c68b7..a141adf4917c015eb57acfa3399834d765553246 100644 (file)
@@ -145,7 +145,7 @@ class App
                $this->nickname = $nickname;
        }
 
-       public function isLoggedIn()
+       public function isLoggedIn(): bool
        {
                return local_user() && $this->user_id && ($this->user_id == local_user());
        }
@@ -155,7 +155,7 @@ class App
         *
         * @return bool true if user is an admin
         */
-       public function isSiteAdmin()
+       public function isSiteAdmin(): bool
        {
                $admin_email = $this->config->get('config', 'admin_email');
 
@@ -166,18 +166,18 @@ class App
 
        /**
         * Fetch the user id
-        * @return int 
+        * @return int User id
         */
-       public function getLoggedInUserId()
+       public function getLoggedInUserId(): int
        {
                return $this->user_id;
        }
 
        /**
         * Fetch the user nick name
-        * @return string
+        * @return string User's nickname
         */
-       public function getLoggedInUserNickname()
+       public function getLoggedInUserNickname(): string
        {
                return $this->nickname;
        }
@@ -198,7 +198,7 @@ class App
         *
         * @return int
         */
-       public function getProfileOwner():int
+       public function getProfileOwner(): int
        {
                return $this->profile_owner;
        }
@@ -219,7 +219,7 @@ class App
         *
         * @return int
         */
-       public function getContactId():int
+       public function getContactId(): int
        {
                return $this->contact_id;
        }
@@ -241,7 +241,7 @@ class App
         *
         * @return int
         */
-       public function getTimeZone():string
+       public function getTimeZone(): string
        {
                return $this->timezone;
        }
@@ -260,9 +260,9 @@ class App
        /**
         * Fetch workerqueue information
         *
-        * @return array 
+        * @return array Worker queue
         */
-       public function getQueue()
+       public function getQueue(): array
        {
                return $this->queue ?? [];
        }
@@ -270,8 +270,8 @@ class App
        /**
         * Fetch a specific workerqueue field
         *
-        * @param string $index 
-        * @return mixed 
+        * @param string $index Work queue record to fetch
+        * @return mixed Work queue item or NULL if not found
         */
        public function getQueueValue(string $index)
        {
@@ -306,9 +306,9 @@ class App
        /**
         * The basepath of this app
         *
-        * @return string
+        * @return string Base path from configuration
         */
-       public function getBasePath()
+       public function getBasePath(): string
        {
                // Don't use the basepath of the config table for basepath (it should always be the config-file one)
                return $this->config->getCache()->get('system', 'basepath');
@@ -396,10 +396,10 @@ class App
        /**
         * Returns the current theme name. May be overriden by the mobile theme name.
         *
-        * @return string
+        * @return string Current theme name or empty string in installation phase
         * @throws Exception
         */
-       public function getCurrentTheme()
+       public function getCurrentTheme(): string
        {
                if ($this->mode->isInstall()) {
                        return '';
@@ -425,10 +425,10 @@ class App
        /**
         * Returns the current mobile theme name.
         *
-        * @return string
+        * @return string Mobile theme name or empty string if installer
         * @throws Exception
         */
-       public function getCurrentMobileTheme()
+       public function getCurrentMobileTheme(): string
        {
                if ($this->mode->isInstall()) {
                        return '';
@@ -441,12 +441,22 @@ class App
                return $this->currentMobileTheme;
        }
 
-       public function setCurrentTheme($theme)
+       /**
+        * Setter for current theme name
+        *
+        * @param string $theme Name of current theme
+        */
+       public function setCurrentTheme(string $theme)
        {
                $this->currentTheme = $theme;
        }
 
-       public function setCurrentMobileTheme($theme)
+       /**
+        * Setter for current mobile theme name
+        *
+        * @param string $theme Name of current mobile theme
+        */
+       public function setCurrentMobileTheme(string $theme)
        {
                $this->currentMobileTheme = $theme;
        }
@@ -472,7 +482,7 @@ class App
                        // 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 = $this->database->selectFirst('user', ['theme'], ['uid' => $this->profile_owner]);
-                       if ($this->database->isResult($user) && !$this->pConfig->get(local_user(), 'system', 'always_my_theme')) {
+                       if ($this->database->isResult($user) && !local_user()) {
                                $page_theme = $user['theme'];
                        }
                }
@@ -504,7 +514,7 @@ class App
                if (!empty($this->profile_owner) && ($this->profile_owner != 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
-                       if (!$this->pConfig->get(local_user(), 'system', 'always_my_theme')) {
+                       if (!local_user()) {
                                $page_mobile_theme = $this->pConfig->get($this->profile_owner, 'system', 'mobile-theme');
                        }
                }
@@ -525,10 +535,10 @@ class App
        /**
         * Provide a sane default if nothing is chosen or the specified theme does not exist.
         *
-        * @return string
+        * @return string Current theme's stylsheet path
         * @throws Exception
         */
-       public function getCurrentThemeStylesheetPath()
+       public function getCurrentThemeStylesheetPath(): string
        {
                return Core\Theme::getStylesheetPath($this->getCurrentTheme());
        }
@@ -576,6 +586,7 @@ class App
                $this->profiler->set(microtime(true), 'classinit');
 
                $moduleName = $this->args->getModuleName();
+               $page->setLogging($this->args->getMethod(), $this->args->getModuleName(), $this->args->getCommand());
 
                try {
                        // Missing DB connection: ERROR
@@ -603,9 +614,9 @@ class App
                        if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend() && !local_user()) {
                                // Only continue when the given profile link seems valid
                                // Valid profile links contain a path with "/profile/" and no query parameters
-                               if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
-                                       strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
-                                       if (Core\Session::get('visitor_home') != $_GET["zrl"]) {
+                               if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == '') &&
+                                       strstr(parse_url($_GET['zrl'], PHP_URL_PATH), '/profile/')) {
+                                       if (Core\Session::get('visitor_home') != $_GET['zrl']) {
                                                Core\Session::set('my_url', $_GET['zrl']);
                                                Core\Session::set('authenticated', 0);
 
@@ -637,10 +648,6 @@ class App
                                header('X-Account-Management-Status: none');
                        }
 
-                       $_SESSION['sysmsg']       = Core\Session::get('sysmsg', []);
-                       $_SESSION['sysmsg_info']  = Core\Session::get('sysmsg_info', []);
-                       $_SESSION['last_updated'] = Core\Session::get('last_updated', []);
-
                        /*
                         * check_config() is responsible for running update scripts. These automatically
                         * update the DB schema whenever we push a new one out. It also checks to see if
@@ -694,7 +701,8 @@ class App
                        // Initialize module that can set the current theme in the init() method, either directly or via App->setProfileOwner
                        $page['page_title'] = $moduleName;
 
-                       if (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED)) {
+                       // The "view" module is required to show the theme CSS
+                       if (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED) && $moduleName !== 'view') {
                                $module = $router->getModule(Maintenance::class);
                        } else {
                                // determine the module class and save it to the module instance
@@ -710,8 +718,7 @@ class App
                        $timestamp = microtime(true);
                        $response = $module->run($input);
                        $this->profiler->set(microtime(true) - $timestamp, 'content');
-                       if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML &&
-                               $response->getStatusCode() == 200) {
+                       if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) {
                                $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig);
                        } else {
                                $page->exit($response);
@@ -719,6 +726,7 @@ class App
                } catch (HTTPException $e) {
                        (new ModuleHTTPException())->rawContent($e);
                }
+               $page->logRuntime($this->config, 'runFrontend');
        }
 
        /**
@@ -729,7 +737,7 @@ class App
         *
         * @throws HTTPException\InternalServerErrorException
         */
-       public function redirect($toUrl)
+       public function redirect(string $toUrl)
        {
                if (!empty(parse_url($toUrl, PHP_URL_SCHEME))) {
                        Core\System::externalRedirect($toUrl);