X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fhelp.php;h=981fe97f70759103fa16ab8c50dcbadb8f316d57;hb=7211fc4f1ac33819ed0543ac65f9a075250c3190;hp=0512e0f2e0d1839391e2e2c34f95e510030920f4;hpb=ca734f168caaa3a9fb66fd7ada6ecc26e1299ae6;p=friendica.git

diff --git a/mod/help.php b/mod/help.php
index 0512e0f2e0..981fe97f70 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -1,5 +1,12 @@
 <?php
-require_once('library/markdown.php');
+/**
+ * @file mod/help.php
+ */
+use Friendica\App;
+use Friendica\Content\Nav;
+use Friendica\Content\Text\Markdown;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
 
 if (!function_exists('load_doc_file')) {
 
@@ -18,9 +25,9 @@ if (!function_exists('load_doc_file')) {
 
 }
 
-function help_content(&$a) {
+function help_content(App $a) {
 
-	nav_set_selected('help');
+	Nav::setSelected('help');
 
 	global $lang;
 
@@ -38,33 +45,33 @@ function help_content(&$a) {
 		$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('-', ' ', notags($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($home);
+		$a->page['aside'] = Markdown::convert($home, false);
 	}
 
 	if (!strlen($text)) {
-		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
+		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . L10n::t('Not Found'));
 		$tpl = get_markup_template("404.tpl");
-		return replace_macros($tpl, array(
-					'$message' => t('Page not found.')
-				));
+		return replace_macros($tpl, [
+					'$message' => L10n::t('Page not found.')
+				]);
 	}
 
-	$html = Markdown($text);
+	$html = Markdown::convert($text, false);
 
 	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'>";
+		$toc="<h2>TOC</h2><ul id='toc'>";
 		$lastlevel=1;
-		$idnum = array(0,0,0,0,0,0,0);
+		$idnum = [0,0,0,0,0,0,0];
 		foreach($lines as &$line){
 			if (substr($line,0,2)=="<h") {
 				$level = substr($line,2,1);
@@ -77,7 +84,7 @@ function help_content(&$a) {
 					if ($level>$lastlevel) $toc.="<ul>";
 					$idnum[$level]++;
 					$id = implode("_", array_slice($idnum,1,$level));
-					$href = App::get_baseurl()."/help/{$filename}#{$id}";
+					$href = System::baseUrl()."/help/{$filename}#{$id}";
 					$toc .= "<li><a href='{$href}'>".strip_tags($line)."</a></li>";
 					$line = "<a name='{$id}'></a>".$line;
 					$lastlevel = $level;
@@ -87,16 +94,9 @@ function help_content(&$a) {
 		for($k=0;$k<$lastlevel; $k++) $toc.="</ul>";
 		$html = implode("\n",$lines);
 
-		$a->page['aside'] = $toc.$a->page['aside'];
+		$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;
 
 }