X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fbabel.php;h=b9846e4fb433a16867f7d6afd20bedff2cbd0aac;hb=5a802bc474abca945240f6a9a2730213e88b30af;hp=3b4fb5bf2bfcd018a332ca887295465c57a69e36;hpb=9ab55181ed9a08c4887eabe5a85e58bc3b34d9fb;p=friendica.git

diff --git a/mod/babel.php b/mod/babel.php
index 3b4fb5bf2b..b9846e4fb4 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -2,79 +2,152 @@
 /**
  * @file mod/babel.php
  */
-use Friendica\Content\Text\Markdown;
-use Friendica\Core\L10n;
 
-require_once 'include/bbcode.php';
-require_once 'include/bb2diaspora.php';
-require_once 'include/html2bbcode.php';
+use Friendica\Content\Text;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 
-function visible_lf($s)
+function visible_whitespace($s)
 {
-	return str_replace("\n", '<br />', $s);
+	$s = str_replace(' ', '&nbsp;', $s);
+
+	return str_replace(["\r\n", "\n", "\r"], '<br />', $s);
 }
 
 function babel_content()
 {
-	$o = '<h1>Babel Diagnostic</h1>';
-
-	$o .= '<form action="babel" method="post">';
-	$o .= L10n::t("Source \x28bbcode\x29 text:") . EOL;
-	$o .= '<textarea name="text" cols="80" rows="10">' . htmlspecialchars($_REQUEST['text']) . '</textarea>' . EOL;
-	$o .= '<input type="submit" name="submit" value="Submit" /></form>';
-
-	$o .= '<br /><br />';
-
-	$o .= '<form action="babel" method="post">';
-	$o .= L10n::t("Source \x28Diaspora\x29 text to convert to BBcode:") . EOL;
-	$o .= '<textarea name="d2bbtext" cols="80" rows="10">' . htmlspecialchars($_REQUEST['d2bbtext']) . '</textarea>' . EOL;
-	$o .= '<input type="submit" name="submit" value="Submit" /></form>';
-
-	$o .= '<br /><br />';
-
-	if (x($_REQUEST, 'text')) {
-		$text = trim($_REQUEST['text']);
-		$o .= '<h2>' . L10n::t('Source input: ') . '</h2>' . EOL . EOL;
-		$o .= visible_lf($text) . EOL . EOL;
-
-		$html = bbcode($text);
-		$o .= '<h2>' . L10n::t("bbcode \x28raw HTML\x28: ") . '</h2>' . EOL . EOL;
-		$o .= htmlspecialchars($html) . EOL . EOL;
-
-		//$html = bbcode($text);
-		$o .= '<h2>' . L10n::t('bbcode: ') . '</h2>' . EOL . EOL;
-		$o .= $html . EOL . EOL;
-
-		$bbcode = html2bbcode($html);
-		$o .= '<h2>' . L10n::t('bbcode => html2bbcode: ') . '</h2>' . EOL . EOL;
-		$o .= visible_lf($bbcode) . EOL . EOL;
-
-		$diaspora = bb2diaspora($text);
-		$o .= '<h2>' . L10n::t('bb2diaspora: ') . '</h2>' . EOL . EOL;
-		$o .= visible_lf($diaspora) . EOL . EOL;
-
-		$html = Markdown::convert($diaspora);
-		$o .= '<h2>' . L10n::t('bb2diaspora => Markdown: ') . '</h2>' . EOL . EOL;
-		$o .= $html . EOL . EOL;
-
-		$bbcode = diaspora2bb($diaspora);
-		$o .= '<h2>' . L10n::t('bb2diaspora => diaspora2bb: ') . '</h2>' . EOL . EOL;
-		$o .= visible_lf($bbcode) . EOL . EOL;
-
-		$bbcode = html2bbcode($html);
-		$o .= '<h2>' . L10n::t('bbcode => html2bbcode: ') . '</h2>' . EOL . EOL;
-		$o .= visible_lf($bbcode) . EOL . EOL;
+	$results = [];
+	if (!empty($_REQUEST['text'])) {
+		switch (defaults($_REQUEST, 'type', 'bbcode')) {
+			case 'bbcode':
+				$bbcode = trim($_REQUEST['text']);
+				$results[] = [
+					'title' => L10n::t('Source input'),
+					'content' => visible_whitespace($bbcode)
+				];
+
+				$plain = Text\BBCode::toPlaintext($bbcode, false);
+				$results[] = [
+					'title' => 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))
+				];
+
+				$results[] = [
+					'title' => L10n::t('BBCode::convert'),
+					'content' => $html
+				];
+
+				$bbcode2 = Text\HTML::toBBCode($html);
+				$results[] = [
+					'title' => L10n::t('BBCode::convert => HTML::toBBCode'),
+					'content' => visible_whitespace($bbcode2)
+				];
+
+				$markdown = Text\BBCode::toMarkdown($bbcode);
+				$results[] = [
+					'title' => L10n::t('BBCode::toMarkdown'),
+					'content' => visible_whitespace($markdown)
+				];
+
+				$html2 = Text\Markdown::convert($markdown);
+				$results[] = [
+					'title' => L10n::t('BBCode::toMarkdown => Markdown::convert'),
+					'content' => $html2
+				];
+
+				$bbcode3 = Text\Markdown::toBBCode($markdown);
+				$results[] = [
+					'title' => 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'),
+					'content' => visible_whitespace($bbcode4)
+				];
+				break;
+			case 'markdown':
+				$markdown = trim($_REQUEST['text']);
+				$results[] = [
+					'title' => L10n::t('Source input (Diaspora format)'),
+					'content' => '<pre>' . $markdown . '</pre>'
+				];
+
+				$html = Text\Markdown::convert($markdown);
+				$results[] = [
+					'title' => L10n::t('Markdown::convert (raw HTML)'),
+					'content' => htmlspecialchars($html)
+				];
+
+				$results[] = [
+					'title' => L10n::t('Markdown::convert'),
+					'content' => $html
+				];
+
+				$bbcode = Text\Markdown::toBBCode($markdown);
+				$results[] = [
+					'title' => L10n::t('Markdown::toBBCode'),
+					'content' => '<pre>' . $bbcode . '</pre>'
+				];
+				break;
+			case 'html' :
+				$html = trim($_REQUEST['text']);
+				$results[] = [
+					'title' => L10n::t('Raw HTML input'),
+					'content' => htmlspecialchars($html)
+				];
+
+				$results[] = [
+					'title' => L10n::t('HTML Input'),
+					'content' => $html
+				];
+
+				$bbcode = Text\HTML::toBBCode($html);
+				$results[] = [
+					'title' => L10n::t('HTML::toBBCode'),
+					'content' => visible_whitespace($bbcode)
+				];
+
+				$html2 = Text\BBCode::convert($bbcode);
+				$results[] = [
+					'title' => L10n::t('HTML::toBBCode => BBCode::convert'),
+					'content' => $html2
+				];
+
+				$results[] = [
+					'title' => L10n::t('HTML::toBBCode => BBCode::convert (raw HTML)'),
+					'content' => htmlspecialchars($html2)
+				];
+
+				$markdown = Text\HTML::toMarkdown($html);
+				$results[] = [
+					'title' => L10n::t('HTML::toMarkdown'),
+					'content' => visible_whitespace($markdown)
+				];
+
+				$text = Text\HTML::toPlaintext($html);
+				$results[] = [
+					'title' => L10n::t('HTML::toPlaintext'),
+					'content' => '<pre>' . $text . '</pre>'
+				];
+		}
 	}
 
-	if (x($_REQUEST, 'd2bbtext')) {
-		$d2bbtext = trim($_REQUEST['d2bbtext']);
-		$o .= '<h2>' . L10n::t("Source input \x28Diaspora format\x29: ") . '</h2>' . EOL . EOL;
-		$o .= '<pre>' . $d2bbtext . '</pre>' . EOL . EOL;
-
-		$bb = diaspora2bb($d2bbtext);
-		$o .= '<h2>' . L10n::t('diaspora2bb: ') . '</h2>' . EOL . EOL;
-		$o .= '<pre>' . $bb . '</pre>' . EOL . EOL;
-	}
+	$tpl = Renderer::getMarkupTemplate('babel.tpl');
+	$o = Renderer::replaceMacros($tpl, [
+		'$text'          => ['text', L10n::t('Source text'), htmlentities(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'],
+		'$results'       => $results
+	]);
 
 	return $o;
 }