Merge pull request #9314 from annando/suggestions

[friendica.git] / src / App / Mode.php

diff --git a/src/App/Mode.php b/src/App/Mode.php
index f3f269b87b9f8b3948556149397cb1e3613aeed1..e19de8f07f4feaba6555f4f6b9394ee37ef9b7f8 100644 (file)
--- a/src/App/Mode.php
+++ b/src/App/Mode.php
@@ -1,9 +1,28 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\App;
 
 use Detection\MobileDetect;
-use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Cache;
 use Friendica\Database\Database;
 use Friendica\Util\BasePath;
 
@@ -19,6 +38,9 @@ class Mode
        const DBCONFIGAVAILABLE   = 4;
        const MAINTENANCEDISABLED = 8;
 
+       const BACKEND_CONTENT_TYPES = ['application/jrd+json', 'text/xml',
+               'application/rss+xml', 'application/atom+xml', 'application/activity+json'];
+
        /***
         * @var int The mode of this Application
         *
@@ -65,7 +87,7 @@ class Mode
         *
         * @throws \Exception
         */
-       public function determine(BasePath $basepath, Database $database, ConfigCache $configCache)
+       public function determine(BasePath $basepath, Database $database, Cache $configCache)
        {
                $mode = 0;
 
@@ -106,16 +128,22 @@ class Mode
        /**
         * Checks if the site is called via a backend process
         *
+        * @param bool         $isBackend    True, if the call is from a backend script (daemon, worker, ...)
         * @param Module       $module       The pre-loaded module (just name, not class!)
         * @param array        $server       The $_SERVER variable
         * @param MobileDetect $mobileDetect The mobile detection library
         *
         * @return Mode returns the determined mode
         */
-       public function determineRunMode(Module $module, array $server, MobileDetect $mobileDetect)
+       public function determineRunMode(bool $isBackend, Module $module, array $server, MobileDetect $mobileDetect)
        {
-               $isBackend = basename(($server['PHP_SELF'] ?? ''), '.php') !== 'index' ||
-                            $module->isBackend();
+               foreach (self::BACKEND_CONTENT_TYPES as $type) {
+                       if (strpos(strtolower($server['HTTP_ACCEPT'] ?? ''), $type) !== false) {
+                               $isBackend = true;
+                       }
+               }
+
+               $isBackend = $isBackend || $module->isBackend();
                $isMobile  = $mobileDetect->isMobile();
                $isTablet  = $mobileDetect->isTablet();
                $isAjax    = strtolower($server['HTTP_X_REQUESTED_WITH'] ?? '') == 'xmlhttprequest';