Merge pull request #9963 from mexon/mat/support-cid-scheme

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

diff --git a/src/App/Module.php b/src/App/Module.php
index a8648d0aa0cc54778b689f4bf457626750d77663..fff7641b76059113bd194fa5ba9cbabeb9866a67 100644 (file)
--- a/src/App/Module.php
+++ b/src/App/Module.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 Friendica\App;
-use Friendica\BaseObject;
+use Friendica\BaseModule;
 use Friendica\Core;
 use Friendica\LegacyModule;
 use Friendica\Module\Home;
@@ -11,6 +30,7 @@ use Friendica\Module\HTTPException\MethodNotAllowed;
 use Friendica\Module\HTTPException\PageNotFound;
 use Friendica\Network\HTTPException\MethodNotAllowedException;
 use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -59,7 +79,7 @@ class Module
        private $module;
 
        /**
-        * @var BaseObject The module class
+        * @var BaseModule The module class
         */
        private $module_class;
 
@@ -149,15 +169,15 @@ class Module
        /**
         * Determine the class of the current module
         *
-        * @param Arguments                 $args   The Friendica execution arguments
-        * @param Router                    $router The Friendica routing instance
-        * @param Core\Config\Configuration $config The Friendica Configuration
+        * @param Arguments           $args   The Friendica execution arguments
+        * @param Router              $router The Friendica routing instance
+        * @param Core\Config\IConfig $config The Friendica Configuration
         *
         * @return Module The determined module of this call
         *
         * @throws \Exception
         */
-       public function determineClass(Arguments $args, Router $router, Core\Config\Configuration $config)
+       public function determineClass(Arguments $args, Router $router, Core\Config\IConfig $config)
        {
                $printNotAllowedAddon = false;
 
@@ -207,18 +227,18 @@ class Module
        /**
         * Run the determined module class and calls all hooks applied to
         *
-        * @param Core\L10n\L10n  $l10n         The L10n instance
-        * @param App             $app          The whole Friendica app (for method arguments)
-        * @param LoggerInterface $logger       The Friendica logger
-        * @param array           $server       The $_SERVER variable
-        * @param array           $post         The $_POST variables
+        * @param \Friendica\Core\L10n $l10n    The L10n instance
+        * @param App\BaseURL          $baseUrl The Friendica Base URL
+        * @param LoggerInterface      $logger  The Friendica logger
+        * @param array                $server  The $_SERVER variable
+        * @param array                $post    The $_POST variables
         *
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public function run(Core\L10n\L10n $l10n, App $app, LoggerInterface $logger, array $server, array $post)
+       public function run(Core\L10n $l10n, App\BaseURL $baseUrl, LoggerInterface $logger, Profiler $profiler, array $server, array $post)
        {
                if ($this->printNotAllowedAddon) {
-                       info($l10n->t("You must be logged in to use addons. "));
+                       notice($l10n->t("You must be logged in to use addons. "));
                }
 
                /* The URL provided does not resolve to a valid module.
@@ -239,7 +259,7 @@ class Module
 
                        if (!empty($queryString) && ($queryString === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
                                $logger->info('index.php: dreamhost_error_hack invoked.', ['Original URI' => $server['REQUEST_URI']]);
-                               $app->internalRedirect($server['REQUEST_URI']);
+                               $baseUrl->redirect($server['REQUEST_URI']);
                        }
 
                        $logger->debug('index.php: page not found.', ['request_uri' => $server['REQUEST_URI'], 'address' => $server['REMOTE_ADDR'], 'query' => $server['QUERY_STRING']]);
@@ -247,10 +267,15 @@ class Module
 
                $placeholder = '';
 
+               $profiler->set(microtime(true), 'ready');
+               $timestamp = microtime(true);
+
                Core\Hook::callAll($this->module . '_mod_init', $placeholder);
 
                call_user_func([$this->module_class, 'init'], $this->module_parameters);
 
+               $profiler->set(microtime(true) - $timestamp, 'init');
+
                if ($server['REQUEST_METHOD'] === 'POST') {
                        Core\Hook::callAll($this->module . '_mod_post', $post);
                        call_user_func([$this->module_class, 'post'], $this->module_parameters);