Decouple conversation creation from rendering

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

diff --git a/src/Module/Help.php b/src/Module/Help.php
index f5e1edd747e95adddbbfec3ecc498efa3df6b4a6..3212d2fe48c6ac339e9c7d613f62ac2ea4cedc08 100644 (file)
--- a/src/Module/Help.php
+++ b/src/Module/Help.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @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\Module;
 
@@ -7,30 +26,28 @@ use Friendica\Content\Nav;
 use Friendica\Content\Text\Markdown;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
-use Friendica\Util\Strings;
 
 /**
  * Shows the friendica help based on the /doc/ directory
  */
 class Help extends BaseModule
 {
-       public static function content(array $parameters = [])
+       protected function content(array $request = []): string
        {
                Nav::setSelected('help');
 
                $text = '';
                $filename = '';
 
-               $a = DI::app();
                $config = DI::config();
-               $lang = $config->get('system', 'language');
+               $lang = DI::session()->get('language', $config->get('system', 'language'));
 
                // @TODO: Replace with parameter from router
-               if ($a->argc > 1) {
+               if (DI::args()->getArgc() > 1) {
                        $path = '';
                        // looping through the argv keys bigger than 0 to build
                        // a path relative to /help
-                       for ($x = 1; $x < $a->argc; $x ++) {
+                       for ($x = 1; $x < DI::args()->getArgc(); $x ++) {
                                if (strlen($path)) {
                                        $path .= '/';
                                }
@@ -40,7 +57,7 @@ class Help extends BaseModule
                        $title = basename($path);
                        $filename = $path;
                        $text = self::loadDocFile('doc/' . $path . '.md', $lang);
-                       DI::page()['title'] = DI::l10n()->t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title));
+                       DI::page()['title'] = DI::l10n()->t('Help:') . ' ' . str_replace('-', ' ', $title);
                }
 
                $home = self::loadDocFile('doc/Home.md', $lang);
@@ -85,7 +102,7 @@ class Help extends BaseModule
 
                                        $idNum[$level] ++;
 
-                                       $href = DI::baseUrl()->get() . "/help/{$filename}#{$anchor}";
+                                       $href = "help/{$filename}#{$anchor}";
                                        $toc .= "<li><a href=\"{$href}\">" . strip_tags($line) . "</a></li>";
                                        $id = implode("_", array_slice($idNum, 1, $level));
                                        $line = "<a name=\"{$id}\"></a>" . $line;