X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FHelp.php;h=a65bff6eaec95ecfc517a84bc7176a8d62f6c8c9;hb=f096b8c8794cdda681d8d307d40edcc01848e5ee;hp=7c1ecd74650b480661adbbf522da1cd30a7ed932;hpb=fceb4f3823c13675ffd2db8bea64af6aa7fc5406;p=friendica.git

diff --git a/src/Module/Help.php b/src/Module/Help.php
index 7c1ecd7465..a65bff6eae 100644
--- a/src/Module/Help.php
+++ b/src/Module/Help.php
@@ -1,11 +1,29 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Content\Nav;
 use Friendica\Content\Text\Markdown;
-use Friendica\Core\L10n;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Strings;
@@ -36,21 +54,21 @@ class Help extends BaseModule
 					$path .= '/';
 				}
 
-				$path .= $a->getArgumentValue($x);
+				$path .= DI::args()->get($x);
 			}
 			$title = basename($path);
 			$filename = $path;
 			$text = self::loadDocFile('doc/' . $path . '.md', $lang);
-			$a->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title));
+			DI::page()['title'] = DI::l10n()->t('Help:') . ' ' . str_replace('-', ' ', Strings::escapeTags($title));
 		}
 
 		$home = self::loadDocFile('doc/Home.md', $lang);
 		if (!$text) {
 			$text = $home;
 			$filename = "Home";
-			$a->page['title'] = L10n::t('Help');
+			DI::page()['title'] = DI::l10n()->t('Help');
 		} else {
-			$a->page['aside'] = Markdown::convert($home, false);
+			DI::page()['aside'] = Markdown::convert($home, false);
 		}
 
 		if (!strlen($text)) {
@@ -67,34 +85,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] ++;
+					if ($level > $lastLevel) {
+						$toc .= "<li><ul>";
+					}
 
-						$href = $a->getBaseURL() . "/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;
+					$idNum[$level] ++;
 
-						$lastLevel = $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;
 				}
 			}
 
@@ -104,7 +120,7 @@ class Help extends BaseModule
 
 			$html = implode("\n", $lines);
 
-			$a->page['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . $a->page['aside'] . '</div>';
+			DI::page()['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . DI::page()['aside'] . '</div>';
 		}
 
 		return $html;