X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FDebug%2FBabel.php;h=ecad73f4dcd82eee64b5bd39415b2883f9efbffc;hb=f58d42e317cbf323fb2c802a0cb71a4799863008;hp=19e3ec2131282248455f0676c5d7ae2b8bfb1f3c;hpb=66d4e5ce5fe6c0dc5aedd9dcc2233b76218ac18c;p=friendica.git

diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php
index 19e3ec2131..ecad73f4dc 100644
--- a/src/Module/Debug/Babel.php
+++ b/src/Module/Debug/Babel.php
@@ -1,12 +1,32 @@
 <?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\Debug;
 
 use Friendica\BaseModule;
 use Friendica\Content\Text;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Tag;
 use Friendica\Util\XML;
 
 /**
@@ -14,172 +34,185 @@ use Friendica\Util\XML;
  */
 class Babel extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		function visible_whitespace($s)
 		{
-			$s = str_replace(' ', '&nbsp;', $s);
-
-			return str_replace(["\r\n", "\n", "\r"], '<br />', $s);
+			return '<pre>' . htmlspecialchars($s) . '</pre>';
 		}
 
 		$results = [];
 		if (!empty($_REQUEST['text'])) {
-			switch (defaults($_REQUEST, 'type', 'bbcode')) {
+			switch (($_REQUEST['type'] ?? '') ?: 'bbcode') {
 				case 'bbcode':
 					$bbcode = trim($_REQUEST['text']);
 					$results[] = [
-						'title'   => L10n::t('Source input'),
+						'title'   => DI::l10n()->t('Source input'),
 						'content' => visible_whitespace($bbcode)
 					];
 
 					$plain = Text\BBCode::toPlaintext($bbcode, false);
 					$results[] = [
-						'title'   => L10n::t('BBCode::toPlaintext'),
+						'title'   => DI::l10n()->t('BBCode::toPlaintext'),
 						'content' => visible_whitespace($plain)
 					];
 
 					$html = Text\BBCode::convert($bbcode);
 					$results[] = [
-						'title'   => L10n::t('BBCode::convert (raw HTML)'),
-						'content' => visible_whitespace(htmlspecialchars($html))
+						'title'   => DI::l10n()->t('BBCode::convert (raw HTML)'),
+						'content' => visible_whitespace($html)
 					];
 
 					$results[] = [
-						'title'   => L10n::t('BBCode::convert'),
+						'title'   => DI::l10n()->t('BBCode::convert'),
 						'content' => $html
 					];
 
 					$bbcode2 = Text\HTML::toBBCode($html);
 					$results[] = [
-						'title'   => L10n::t('BBCode::convert => HTML::toBBCode'),
+						'title'   => DI::l10n()->t('BBCode::convert => HTML::toBBCode'),
 						'content' => visible_whitespace($bbcode2)
 					];
 
 					$markdown = Text\BBCode::toMarkdown($bbcode);
 					$results[] = [
-						'title'   => L10n::t('BBCode::toMarkdown'),
+						'title'   => DI::l10n()->t('BBCode::toMarkdown'),
 						'content' => visible_whitespace($markdown)
 					];
 
 					$html2 = Text\Markdown::convert($markdown);
 					$results[] = [
-						'title'   => L10n::t('BBCode::toMarkdown => Markdown::convert'),
+						'title'   => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert (raw HTML)'),
+						'content' => visible_whitespace($html2)
+					];
+					$results[] = [
+						'title'   => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert'),
 						'content' => $html2
 					];
 
 					$bbcode3 = Text\Markdown::toBBCode($markdown);
 					$results[] = [
-						'title'   => L10n::t('BBCode::toMarkdown => Markdown::toBBCode'),
+						'title'   => DI::l10n()->t('BBCode::toMarkdown => Markdown::toBBCode'),
 						'content' => visible_whitespace($bbcode3)
 					];
 
 					$bbcode4 = Text\HTML::toBBCode($html2);
 					$results[] = [
-						'title'   => L10n::t('BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode'),
+						'title'   => DI::l10n()->t('BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode'),
 						'content' => visible_whitespace($bbcode4)
 					];
 
-					$item = [
-						'body' => $bbcode,
-						'tag'  => '',
-					];
+					$item = ['body' => $bbcode];
+
+					$tags = Text\BBCode::getTags($bbcode);
 
 					Item::setHashtags($item);
 					$results[] = [
-						'title'   => L10n::t('Item Body'),
+						'title'   => DI::l10n()->t('Item Body'),
 						'content' => visible_whitespace($item['body'])
 					];
 					$results[] = [
-						'title'   => L10n::t('Item Tags'),
-						'content' => $item['tag']
+						'title'   => DI::l10n()->t('Item Tags'),
+						'content' => visible_whitespace(var_export($tags, true)),
 					];
 					break;
+				case 'diaspora':
+					$diaspora = trim($_REQUEST['text']);
+					$results[] = [
+						'title'   => DI::l10n()->t('Source input (Diaspora format)'),
+						'content' => visible_whitespace($diaspora),
+					];
+
+					$markdown = XML::unescape($diaspora);
 				case 'markdown':
-					$markdown = trim($_REQUEST['text']);
+					if (!isset($markdown)) {
+						$markdown = trim($_REQUEST['text']);
+					}
+
 					$results[] = [
-						'title'   => L10n::t('Source input (Diaspora format)'),
-						'content' => '<pre>' . htmlspecialchars($markdown) . '</pre>'
+						'title'   => DI::l10n()->t('Source input (Markdown)'),
+						'content' => visible_whitespace($markdown),
 					];
 
-					$html = Text\Markdown::convert(html_entity_decode($markdown,ENT_COMPAT, 'UTF-8'));
+					$html = Text\Markdown::convert($markdown);
 					$results[] = [
-						'title'   => L10n::t('Markdown::convert (raw HTML)'),
-						'content' => visible_whitespace(htmlspecialchars($html))
+						'title'   => DI::l10n()->t('Markdown::convert (raw HTML)'),
+						'content' => visible_whitespace($html),
 					];
 
 					$results[] = [
-						'title'   => L10n::t('Markdown::convert'),
+						'title'   => DI::l10n()->t('Markdown::convert'),
 						'content' => $html
 					];
 
-					$bbcode = Text\Markdown::toBBCode(XML::unescape($markdown));
+					$bbcode = Text\Markdown::toBBCode($markdown);
 					$results[] = [
-						'title'   => L10n::t('Markdown::toBBCode'),
-						'content' => '<pre>' . $bbcode . '</pre>'
+						'title'   => DI::l10n()->t('Markdown::toBBCode'),
+						'content' => visible_whitespace($bbcode),
 					];
 					break;
 				case 'html' :
 					$html = trim($_REQUEST['text']);
 					$results[] = [
-						'title'   => L10n::t('Raw HTML input'),
-						'content' => htmlspecialchars($html)
+						'title'   => DI::l10n()->t('Raw HTML input'),
+						'content' => visible_whitespace($html),
 					];
 
 					$results[] = [
-						'title'   => L10n::t('HTML Input'),
+						'title'   => DI::l10n()->t('HTML Input'),
 						'content' => $html
 					];
 
 					$bbcode = Text\HTML::toBBCode($html);
 					$results[] = [
-						'title'   => L10n::t('HTML::toBBCode'),
+						'title'   => DI::l10n()->t('HTML::toBBCode'),
 						'content' => visible_whitespace($bbcode)
 					];
 
 					$html2 = Text\BBCode::convert($bbcode);
 					$results[] = [
-						'title'   => L10n::t('HTML::toBBCode => BBCode::convert'),
+						'title'   => DI::l10n()->t('HTML::toBBCode => BBCode::convert'),
 						'content' => $html2
 					];
 
 					$results[] = [
-						'title'   => L10n::t('HTML::toBBCode => BBCode::convert (raw HTML)'),
+						'title'   => DI::l10n()->t('HTML::toBBCode => BBCode::convert (raw HTML)'),
 						'content' => htmlspecialchars($html2)
 					];
 
 					$bbcode2plain = Text\BBCode::toPlaintext($bbcode);
 					$results[] = [
-						'title'   => L10n::t('HTML::toBBCode => BBCode::toPlaintext'),
-						'content' => '<pre>' . $bbcode2plain . '</pre>'
+						'title'   => DI::l10n()->t('HTML::toBBCode => BBCode::toPlaintext'),
+						'content' => visible_whitespace($bbcode2plain),
 					];
 
 					$markdown = Text\HTML::toMarkdown($html);
 					$results[] = [
-						'title'   => L10n::t('HTML::toMarkdown'),
+						'title'   => DI::l10n()->t('HTML::toMarkdown'),
 						'content' => visible_whitespace($markdown)
 					];
 
 					$text = Text\HTML::toPlaintext($html, 0);
 					$results[] = [
-						'title'   => L10n::t('HTML::toPlaintext'),
-						'content' => '<pre>' . $text . '</pre>'
+						'title'   => DI::l10n()->t('HTML::toPlaintext'),
+						'content' => visible_whitespace($text),
 					];
 
 					$text = Text\HTML::toPlaintext($html, 0, true);
 					$results[] = [
-						'title'   => L10n::t('HTML::toPlaintext (compact)'),
-						'content' => '<pre>' . $text . '</pre>'
+						'title'   => DI::l10n()->t('HTML::toPlaintext (compact)'),
+						'content' => visible_whitespace($text),
 					];
 			}
 		}
 
 		$tpl = Renderer::getMarkupTemplate('babel.tpl');
 		$o = Renderer::replaceMacros($tpl, [
-			'$text'          => ['text', L10n::t('Source text'), defaults($_REQUEST, 'text', ''), ''],
-			'$type_bbcode'   => ['type', L10n::t('BBCode'), 'bbcode', '', defaults($_REQUEST, 'type', 'bbcode') == 'bbcode'],
-			'$type_markdown' => ['type', L10n::t('Markdown'), 'markdown', '', defaults($_REQUEST, 'type', 'bbcode') == 'markdown'],
-			'$type_html'     => ['type', L10n::t('HTML'), 'html', '', defaults($_REQUEST, 'type', 'bbcode') == 'html'],
+			'$text'          => ['text', DI::l10n()->t('Source text'), $_REQUEST['text'] ?? '', ''],
+			'$type_bbcode'   => ['type', DI::l10n()->t('BBCode'), 'bbcode', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'bbcode'],
+			'$type_diaspora' => ['type', DI::l10n()->t('Diaspora'), 'diaspora', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'diaspora'],
+			'$type_markdown' => ['type', DI::l10n()->t('Markdown'), 'markdown', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'markdown'],
+			'$type_html'     => ['type', DI::l10n()->t('HTML'), 'html', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'html'],
 			'$results'       => $results
 		]);