https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
627fa08
)
Fix formatting in mod/help
author
Hypolite Petovan
<mrpetovan@gmail.com>
Tue, 10 Jul 2018 01:53:19 +0000
(21:53 -0400)
committer
Hypolite Petovan
<mrpetovan@gmail.com>
Mon, 16 Jul 2018 23:38:17 +0000
(19:38 -0400)
mod/help.php
patch
|
blob
|
history
diff --git
a/mod/help.php
b/mod/help.php
index
981fe97
..
ef64073
100644
(file)
--- a/
mod/help.php
+++ b/
mod/help.php
@@
-2,31
+2,32
@@
/**
* @file mod/help.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;
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')) {
-
- 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)
+{
+ 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);
+ }
-function help_content(App $a) {
+ return '';
+}
+function help_content(App $a)
+{
Nav::setSelected('help');
global $lang;
Nav::setSelected('help');
global $lang;
@@
-37,9
+38,11
@@
function help_content(App $a) {
$path = '';
// looping through the argv keys bigger than 0 to build
// a path relative to /help
$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 .= '/';
+ }
+
$path .= argv($x);
}
$title = basename($path);
$path .= argv($x);
}
$title = basename($path);
@@
-47,6
+50,7
@@
function help_content(App $a) {
$text = load_doc_file('doc/' . $path . '.md');
$a->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', notags($title));
}
$text = load_doc_file('doc/' . $path . '.md');
$a->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', notags($title));
}
+
$home = load_doc_file('doc/Home.md');
if (!$text) {
$text = $home;
$home = load_doc_file('doc/Home.md');
if (!$text) {
$text = $home;
@@
-60,8
+64,8
@@
function help_content(App $a) {
header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . L10n::t('Not Found'));
$tpl = get_markup_template("404.tpl");
return replace_macros($tpl, [
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.')
-
]);
+ '$message' => L10n::t('Page not found.')
+ ]);
}
$html = Markdown::convert($text, false);
}
$html = Markdown::convert($text, false);
@@
-69,34
+73,46
@@
function help_content(App $a) {
if ($filename !== "Home") {
// create TOC but not for home
$lines = explode("\n", $html);
if ($filename !== "Home") {
// create TOC but not for home
$lines = explode("\n", $html);
- $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") {
+ $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);
$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>";
}
}
- 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;
+
+ $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;
}
}
}
$lastlevel = $level;
}
}
}
- for($k=0;$k<$lastlevel; $k++) $toc.="</ul>";
- $html = implode("\n",$lines);
+
+ 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>';
}
return $html;
$a->page['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . $a->page['aside'] . '</div>';
}
return $html;
-
}
}