friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #8159 from MrPetovan/bug/help-toc-loop-de-loop 

Remove duplicated TOC loop in Module\Help
This commit is contained in:
Tobias Diekershoff 2020-01-23 15:31:34 +01:00 committed by GitHub
parent 1f790eaeef 087c3cdcd8
commit 9475383c4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/Module/Help.php
View File

@ -66,34 +66,32 @@ class Help extends BaseModule
$idNum = [0, 0, 0, 0, 0, 0, 0];
foreach ($lines as &$line) {
$matches = [];
foreach ($lines as &$line) {
if (preg_match('#<h([1-6])>([^<]+?)</h\1>#i', $line, $matches)) {
$level = $matches[1];
$anchor = urlencode($matches[2]);
if ($level < $lastLevel) {
for ($k = $level; $k < $lastLevel; $k++) {
$toc .= "</ul></li>";
}
for ($k = $level + 1; $k < count($idNum); $k++) {
$idNum[$k] = 0;
}
if (preg_match('#<h([1-6])>([^<]+?)</h\1>#i', $line, $matches)) {
$level = $matches[1];
$anchor = urlencode($matches[2]);
if ($level < $lastLevel) {
for ($k = $level; $k < $lastLevel; $k++) {
$toc .= "</ul></li>";
}
if ($level > $lastLevel) {
$toc .= "<li><ul>";
for ($k = $level + 1; $k < count($idNum); $k++) {
$idNum[$k] = 0;
}
$idNum[$level] ++;
$href = DI::baseUrl()->get() . "/help/{$filename}#{$anchor}";
$toc .= "<li><a href=\"{$href}\">" . strip_tags($line) . "</a></li>";
$id = implode("_", array_slice($idNum, 1, $level));
$line = "<a name=\"{$id}\"></a>" . $line;
$line = "<a name=\"{$anchor}\"></a>" . $line;
$lastLevel = $level;
}
if ($level > $lastLevel) {
$toc .= "<li><ul>";
}
$idNum[$level] ++;
$href = DI::baseUrl()->get() . "/help/{$filename}#{$anchor}";
$toc .= "<li><a href=\"{$href}\">" . strip_tags($line) . "</a></li>";
$id = implode("_", array_slice($idNum, 1, $level));
$line = "<a name=\"{$id}\"></a>" . $line;
$line = "<a name=\"{$anchor}\"></a>" . $line;
$lastLevel = $level;
}
}