Merge pull request #9602 from AndyHee/patch-20201125

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 9b6f6a5a296eea138749891e8b93c320caeeeee0..c69abf212748239dbb1cba3a5890eca8736426d4 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -24,7 +24,7 @@ namespace Friendica;
 use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
-use Friendica\App\Authentication;
+use Friendica\Security\Authentication;
 use Friendica\Core\Config\Cache;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\PConfig\IPConfig;
@@ -77,7 +77,6 @@ class App
        public $sourcename              = '';
        public $videowidth              = 425;
        public $videoheight             = 350;
-       public $force_max_items         = 0;
        public $theme_events_in_profile = true;
        public $queue;
 
@@ -240,22 +239,6 @@ class App
                }
        }
 
-       /**
-        * Returns the current UserAgent as a String
-        *
-        * @return string the UserAgent as a String
-        * @throws HTTPException\InternalServerErrorException
-        */
-       public function getUserAgent()
-       {
-               return
-                       FRIENDICA_PLATFORM . " '" .
-                       FRIENDICA_CODENAME . "' " .
-                       FRIENDICA_VERSION . '-' .
-                       DB_UPDATE_VERSION . '; ' .
-                       $this->baseURL->get();
-       }
-
        /**
         * Returns the current theme name. May be overriden by the mobile theme name.
         *
@@ -464,7 +447,7 @@ class App
                                Core\Worker::executeIfIdle();
                        }
 
-                       if ($this->mode->isNormal()) {
+                       if ($this->mode->isNormal() && !$this->mode->isBackend()) {
                                $requester = HTTPSignature::getSigner('', $_SERVER);
                                if (!empty($requester)) {
                                        Profile::addVisitorCookieForHandle($requester);
@@ -472,7 +455,7 @@ class App
                        }
 
                        // ZRL
-                       if (!empty($_GET['zrl']) && $this->mode->isNormal()) {
+                       if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend()) {
                                if (!local_user()) {
                                        // Only continue when the given profile link seems valid
                                        // Valid profile links contain a path with "/profile/" and no query parameters