Move mod/home to src/Module/Home

[friendica.git] / mod / help.php

diff --git a/mod/help.php b/mod/help.php
index 53118544fb1a72781e73090f1266f550817c134d..19b629271ecb304f611f149e94128c483e4faad6 100644 (file)
--- a/mod/help.php
+++ b/mod/help.php
@@ -8,7 +8,9 @@ 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)
 {
@@ -31,6 +33,7 @@ function help_content(App $a)
        Nav::setSelected('help');
 
        $text = '';
+       $filename = '';
 
        if ($a->argc > 1) {
                $path = '';
@@ -46,7 +49,7 @@ function help_content(App $a)
                $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');
@@ -59,11 +62,7 @@ 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, [
-                       '$message' => L10n::t('Page not found.')
-               ]);
+               throw new \Friendica\Network\HTTPException\NotFoundException();
        }
 
        $html = Markdown::convert($text, false);
@@ -81,7 +80,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++) {
@@ -90,7 +89,7 @@ function help_content(App $a)
                                        }
 
                                        if ($level > $lastlevel) {
-                                               $toc .= "<ul>";
+                                               $toc .= "<li><ul>";
                                        }
 
                                        $idnum[$level] ++;