Remove deprecated App::getHostName() - process methods to DI::baseUrl()->getHostName()

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

diff --git a/src/Module/Help.php b/src/Module/Help.php
index 3b3ce58704663cc6422e5da1284fafe04d5e0224..70c99a0a6fd7c47c78c80f8be0d39a8bb54dd814 100644 (file)
--- a/src/Module/Help.php
+++ b/src/Module/Help.php
@@ -6,6 +6,7 @@ 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;
 
@@ -21,8 +22,8 @@ class Help extends BaseModule
                $text = '';
                $filename = '';
 
-               $a = self::getApp();
-               $config = $a->getConfig();
+               $a = DI::app();
+               $config = DI::config();
                $lang = $config->get('system', 'language');
 
                // @TODO: Replace with parameter from router
@@ -35,7 +36,7 @@ class Help extends BaseModule
                                        $path .= '/';
                                }
 
-                               $path .= $a->getArgumentValue($x);
+                               $path .= DI::args()->get($x);
                        }
                        $title = basename($path);
                        $filename = $path;
@@ -65,10 +66,11 @@ 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);
+                               $matches = [];
+                               foreach ($lines as &$line) {
+                                       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>";
@@ -84,10 +86,13 @@ class Help extends BaseModule
                                                }
 
                                                $idNum[$level] ++;
+
+                                               $href = $a->getBaseURL() . "/help/{$filename}#{$anchor}";
+                                               $toc .= "<li><a href=\"{$href}\">" . strip_tags($line) . "</a></li>";
                                                $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;
+                                               $line = "<a name=\"{$id}\"></a>" . $line;
+                                               $line = "<a name=\"{$anchor}\"></a>" . $line;
+
                                                $lastLevel = $level;
                                        }
                                }