X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fhelp.php;h=3a21695b090f05ee4f4170620ae22be8078f70d0;hb=166b8ad44035def2517a5588c670b27ddfb2e13c;hp=399b7768beb91fcef87341a473effd82918907d8;hpb=36d891bcadd3cc49a352289d4a95da82cfff4ca7;p=friendica.git

diff --git a/mod/help.php b/mod/help.php
index 399b7768be..3a21695b09 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -2,65 +2,70 @@
 /**
  * @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 = '';
 
 	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'] = 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;
 		$filename = "Home";
-		$a->page['title'] = t('Help');
+		$a->page['title'] = L10n::t('Help');
 	} else {
 		$a->page['aside'] = Markdown::convert($home, false);
 	}
 
 	if (!strlen($text)) {
-		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
-		$tpl = get_markup_template("404.tpl");
-		return replace_macros($tpl, array(
-					'$message' => t('Page not found.')
-				));
+		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . L10n::t('Not Found'));
+		$tpl = Renderer::getMarkupTemplate("404.tpl");
+		return Renderer::replaceMacros($tpl, [
+			'$message' => L10n::t('Page not found.')
+		]);
 	}
 
 	$html = Markdown::convert($text, false);
@@ -68,41 +73,46 @@ function help_content(App $a) {
 	if ($filename !== "Home") {
 		// create TOC but not for home
 		$lines = explode("\n", $html);
-		$toc="<style>aside ul {padding-left: 1em;}aside h1{font-size:2em}</style><h2>TOC</h2><ul id='toc'>";
-		$lastlevel=1;
-		$idnum = array(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") {
+		$toc = "<h2>TOC</h2><ul id='toc'>";
+		$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);
-					if ($level<$lastlevel) {
-						for($k=$level;$k<$lastlevel; $k++) $toc.="</ul>";
-						for($k=$level+1;$k<count($idnum);$k++) $idnum[$k]=0;
+					if ($level < $lastlevel) {
+						for ($k = $level; $k < $lastlevel; $k++) {
+							$toc .= "</ul>";
+						}
+
+						for ($k = $level + 1; $k < count($idnum); $k++) {
+							$idnum[$k] = 0;
+						}
 					}
-					if ($level>$lastlevel) $toc.="<ul>";
-					$idnum[$level]++;
-					$id = implode("_", array_slice($idnum,1,$level));
-					$href = System::baseUrl()."/help/{$filename}#{$id}";
-					$toc .= "<li><a href='{$href}'>".strip_tags($line)."</a></li>";
-					$line = "<a name='{$id}'></a>".$line;
+
+					if ($level > $lastlevel) {
+						$toc .= "<ul>";
+					}
+
+					$idnum[$level] ++;
+					$id = implode("_", array_slice($idnum, 1, $level));
+					$href = System::baseUrl() . "/help/{$filename}#{$id}";
+					$toc .= "<li><a href='{$href}'>" . strip_tags($line) . "</a></li>";
+					$line = "<a name='{$id}'></a>" . $line;
 					$lastlevel = $level;
 				}
 			}
 		}
-		for($k=0;$k<$lastlevel; $k++) $toc.="</ul>";
-		$html = implode("\n",$lines);
 
-		$a->page['aside'] = '<section class="help-aside-wrapper">' . $toc . $a->page['aside'] . '</section>';
+		for ($k = 0; $k < $lastlevel; $k++) {
+			$toc .= "</ul>";
+		}
+
+		$html = implode("\n", $lines);
+
+		$a->page['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . $a->page['aside'] . '</div>';
 	}
 
-	$html = "
-		<style>
-		.md_warning {
-			padding: 1em; border: #ff0000 solid 2px;
-			background-color: #f9a3a3; color: #ffffff;
-		}
-		</style>".$html;
 	return $html;
-
 }