Merge pull request #13599 from Raroun/Fix_for_Pull_Request_#13596_missing_a_hidden...

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

diff --git a/src/Module/Help.php b/src/Module/Help.php
index ddf5b06d8337398015598897d4df0ae591367623..3212d2fe48c6ac339e9c7d613f62ac2ea4cedc08 100644 (file)
--- a/src/Module/Help.php
+++ b/src/Module/Help.php
@@ -1,55 +1,72 @@
 <?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;
 
 use Friendica\BaseModule;
 use Friendica\Content\Nav;
 use Friendica\Content\Text\Markdown;
-use Friendica\Core\L10n;
+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()
+       protected function content(array $request = []): string
        {
                Nav::setSelected('help');
 
                $text = '';
                $filename = '';
 
-               $a = self::getApp();
-               $config = $a->getConfig();
-               $lang = $config->get('system', 'language');
+               $config = DI::config();
+               $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 .= '/';
                                }
 
-                               $path .= $a->getArgumentValue($x);
+                               $path .= DI::args()->get($x);
                        }
                        $title = basename($path);
                        $filename = $path;
                        $text = self::loadDocFile('doc/' . $path . '.md', $lang);
-                       $a->page['title'] = 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);
                if (!$text) {
                        $text = $home;
                        $filename = "Home";
-                       $a->page['title'] = L10n::t('Help');
+                       DI::page()['title'] = DI::l10n()->t('Help');
                } else {
-                       $a->page['aside'] = Markdown::convert($home, false);
+                       DI::page()['aside'] = Markdown::convert($home, false);
                }
 
                if (!strlen($text)) {
@@ -65,31 +82,33 @@ class Help extends BaseModule
                        $lastLevel = 1;
                        $idNum = [0, 0, 0, 0, 0, 0, 0];
                        foreach ($lines as &$line) {
-                               if (substr($line, 0, 2) == "<h") {
-                                       $level = substr($line, 2, 1);
-                                       if ($level != "r") {
-                                               $level = intval($level);
-                                               if ($level < $lastLevel) {
-                                                       for ($k = $level; $k < $lastLevel; $k++) {
-                                                               $toc .= "</ul></li>";
-                                                       }
-
-                                                       for ($k = $level + 1; $k < count($idNum); $k++) {
-                                                               $idNum[$k] = 0;
-                                                       }
+                               $matches = [];
+                               if (preg_match('#<h([1-6])>([^<]+?)</h\1>#i', $line, $matches)) {
+                                       $level = $matches[1];
+                                       $anchor = urlencode($matches[2]);
+                                       if ($level < $lastLevel) {
+                                               for ($k = $level; $k < $lastLevel; $k++) {
+                                                       $toc .= "</ul></li>";
                                                }
 
-                                               if ($level > $lastLevel) {
-                                                       $toc .= "<li><ul>";
+                                               for ($k = $level + 1; $k < count($idNum); $k++) {
+                                                       $idNum[$k] = 0;
                                                }
+                                       }
 
-                                               $idNum[$level] ++;
-                                               $id = implode("_", array_slice($idNum, 1, $level));
-                                               $href = $a->getBaseURL() . "/help/{$filename}#{$id}";
-                                               $toc .= "<li><a href='{$href}'>" . strip_tags($line) . "</a></li>";
-                                               $line = "<a name='{$id}'></a>" . $line;
-                                               $lastLevel = $level;
+                                       if ($level > $lastLevel) {
+                                               $toc .= "<li><ul>";
                                        }
+
+                                       $idNum[$level] ++;
+
+                                       $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;
+                                       $line = "<a name=\"{$anchor}\"></a>" . $line;
+
+                                       $lastLevel = $level;
                                }
                        }
 
@@ -99,7 +118,7 @@ class Help extends BaseModule
 
                        $html = implode("\n", $lines);
 
-                       $a->page['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . $a->page['aside'] . '</div>';
+                       DI::page()['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . DI::page()['aside'] . '</div>';
                }
 
                return $html;