admin mail list seems wrong escaped

[friendica.git] / mod / help.php

diff --git a/mod/help.php b/mod/help.php
index ef640737aa1bf3ceb94a78590449d18b8c7c8f77..cdfedac6ffedfabc26ea8598d5e610d0d50fe08c 100644 (file)
--- a/mod/help.php
+++ b/mod/help.php
@@ -6,13 +6,15 @@
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Text\Markdown;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\Util\Strings;
 
 function load_doc_file($s)
 {
-       global $lang;
-       if (!isset($lang)) $lang = 'en';
+       $lang = Config::get('system', 'language');
        $b = basename($s);
        $d = dirname($s);
        if (file_exists("$d/$lang/$b")) {
@@ -30,25 +32,24 @@ function help_content(App $a)
 {
        Nav::setSelected('help');
 
-       global $lang;
-
        $text = '';
+       $filename = '';
 
        if ($a->argc > 1) {
                $path = '';
                // looping through the argv keys bigger than 0 to build
                // a path relative to /help
-               for ($x = 1; $x < argc(); $x ++) {
+               for ($x = 1; $x < $a->argc; $x ++) {
                        if (strlen($path)) {
                                $path .= '/';
                        }
 
-                       $path .= argv($x);
+                       $path .= $a->getArgumentValue($x);
                }
                $title = basename($path);
                $filename = $path;
                $text = load_doc_file('doc/' . $path . '.md');
-               $a->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', notags($title));
+               $a->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title));
        }
 
        $home = load_doc_file('doc/Home.md');
@@ -62,8 +63,8 @@ function help_content(App $a)
 
        if (!strlen($text)) {
                header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . L10n::t('Not Found'));
-               $tpl = get_markup_template("404.tpl");
-               return replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate("404.tpl");
+               return Renderer::replaceMacros($tpl, [
                        '$message' => L10n::t('Page not found.')
                ]);
        }
@@ -83,7 +84,7 @@ function help_content(App $a)
                                        $level = intval($level);
                                        if ($level < $lastlevel) {
                                                for ($k = $level; $k < $lastlevel; $k++) {
-                                                       $toc .= "</ul>";
+                                                       $toc .= "</ul></li>";
                                                }
 
                                                for ($k = $level + 1; $k < count($idnum); $k++) {
@@ -92,7 +93,7 @@ function help_content(App $a)
                                        }
 
                                        if ($level > $lastlevel) {
-                                               $toc .= "<ul>";
+                                               $toc .= "<li><ul>";
                                        }
 
                                        $idnum[$level] ++;