X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fhelp.php;h=3df280dbd64e0698ccdb1df8f183bea93de5b5a1;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=981fe97f70759103fa16ab8c50dcbadb8f316d57;hpb=0c0b715c633f78467f82fdb1d69c230aaef765ce;p=friendica.git diff --git a/mod/help.php b/mod/help.php index 981fe97f70..3df280dbd6 100644 --- a/mod/help.php +++ b/mod/help.php @@ -2,51 +2,56 @@ /** * @file mod/help.php */ + 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; -if (!function_exists('load_doc_file')) { - - function load_doc_file($s) { - global $lang; - if (!isset($lang)) - $lang = 'en'; - $b = basename($s); - $d = dirname($s); - if (file_exists("$d/$lang/$b")) - return file_get_contents("$d/$lang/$b"); - if (file_exists($s)) - return file_get_contents($s); - return ''; +function load_doc_file($s) +{ + $lang = Config::get('system', 'language'); + $b = basename($s); + $d = dirname($s); + if (file_exists("$d/$lang/$b")) { + return file_get_contents("$d/$lang/$b"); } -} + if (file_exists($s)) { + return file_get_contents($s); + } -function help_content(App $a) { + return ''; +} +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 ++) { - if(strlen($path)) + 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'); if (!$text) { $text = $home; @@ -58,10 +63,10 @@ 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.') - ]); + $tpl = Renderer::getMarkupTemplate("404.tpl"); + return Renderer::replaceMacros($tpl, [ + '$message' => L10n::t('Page not found.') + ]); } $html = Markdown::convert($text, false); @@ -69,34 +74,46 @@ function help_content(App $a) { if ($filename !== "Home") { // create TOC but not for home $lines = explode("\n", $html); - $toc="