Move PConfig::get() to DI::pConfig()->get()

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

diff --git a/src/Module/Help.php b/src/Module/Help.php
index 04c4828526a7d01e4adc5320886e0112cd1b632c..b18500a1096907f45b4e6d5ac0c7d0c054ad15fb 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;
 
@@ -14,42 +15,42 @@ use Friendica\Util\Strings;
  */
 class Help extends BaseModule
 {
-       public static function content()
+       public static function content(array $parameters = [])
        {
                Nav::setSelected('help');
 
                $text = '';
                $filename = '';
 
-               $app = self::getApp();
-               $config = $app->getConfig();
+               $a = DI::app();
+               $config = DI::config();
                $lang = $config->get('system', 'language');
 
                // @TODO: Replace with parameter from router
-               if ($app->argc > 1) {
+               if ($a->argc > 1) {
                        $path = '';
                        // looping through the argv keys bigger than 0 to build
                        // a path relative to /help
-                       for ($x = 1; $x < $app->argc; $x ++) {
+                       for ($x = 1; $x < $a->argc; $x ++) {
                                if (strlen($path)) {
                                        $path .= '/';
                                }
 
-                               $path .= $app->getArgumentValue($x);
+                               $path .= DI::args()->get($x);
                        }
                        $title = basename($path);
                        $filename = $path;
                        $text = self::loadDocFile('doc/' . $path . '.md', $lang);
-                       $app->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title));
+                       DI::page()['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title));
                }
 
                $home = self::loadDocFile('doc/Home.md', $lang);
                if (!$text) {
                        $text = $home;
                        $filename = "Home";
-                       $app->page['title'] = L10n::t('Help');
+                       DI::page()['title'] = L10n::t('Help');
                } else {
-                       $app->page['aside'] = Markdown::convert($home, false);
+                       DI::page()['aside'] = Markdown::convert($home, false);
                }
 
                if (!strlen($text)) {
@@ -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 = DI::baseUrl()->get() . "/help/{$filename}#{$anchor}";
+                                               $toc .= "<li><a href=\"{$href}\">" . strip_tags($line) . "</a></li>";
                                                $id = implode("_", array_slice($idNum, 1, $level));
-                                               $href = $app->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;
                                        }
                                }
@@ -99,7 +104,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;