Parameter should fit ...

[friendica.git] / mod / help.php

diff --git a/mod/help.php b/mod/help.php
index 602653eea8f095585132ee3da175452a52c89806..9a4b275f956185f1890701b9329c2cb167fa209a 100644 (file)
--- a/mod/help.php
+++ b/mod/help.php
@@ -1,4 +1,8 @@
 <?php
+
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once('library/markdown.php');
 
 if (!function_exists('load_doc_file')) {
@@ -30,10 +34,9 @@ function help_content(App $a) {
                $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 < argc(); $x ++) {
+                       if(strlen($path))
                                $path .= '/';
-                       }
                        $path .= argv($x);
                }
                $title = basename($path);
@@ -47,7 +50,7 @@ function help_content(App $a) {
                $filename = "Home";
                $a->page['title'] = t('Help');
        } else {
-               $a->page['aside'] = Markdown($home);
+               $a->page['aside'] = Markdown($home, false);
        }
 
        if (!strlen($text)) {
@@ -58,7 +61,7 @@ function help_content(App $a) {
                                ));
        }
 
-       $html = Markdown($text);
+       $html = Markdown($text, false);
 
        if ($filename !== "Home") {
                // create TOC but not for home
@@ -66,35 +69,29 @@ function help_content(App $a) {
                $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){
+               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) {
-                                               $toc.="<ul>";
+                                               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 = 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;
                                }
                        }
                }
-               for ($k=0;$k<$lastlevel; $k++) $toc.="</ul>";
+               for($k=0;$k<$lastlevel; $k++) $toc.="</ul>";
                $html = implode("\n",$lines);
 
-               $a->page['aside'] = $toc.$a->page['aside'];
+               $a->page['aside'] = '<section class="help-aside-wrapper">' . $toc . $a->page['aside'] . '</section>';
        }
 
        $html = "