X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fbabel.php;h=e5ae96be70489556dd683a3ce3340b469d7a6b6b;hb=761bdafa34bfdf1b2b43a3f06ae092e0925898ac;hp=4550a8efbf954fc49a21b64a8dbcbba584183990;hpb=a0451e1c6285212ed406b343b97e4a53859a673d;p=friendica.git

diff --git a/mod/babel.php b/mod/babel.php
index 4550a8efbf..e5ae96be70 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -6,9 +6,11 @@
 use Friendica\Content\Text;
 use Friendica\Core\L10n;
 
-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()
@@ -20,13 +22,19 @@ function babel_content()
 				$bbcode = trim($_REQUEST['text']);
 				$results[] = [
 					'title' => L10n::t('Source input'),
-					'content' => visible_lf($bbcode)
+					'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 \x28raw HTML\x28"),
-					'content' => htmlspecialchars($html)
+					'title' => L10n::t('BBCode::convert (raw HTML)'),
+					'content' => visible_whitespace(htmlspecialchars($html))
 				];
 
 				$results[] = [
@@ -37,13 +45,13 @@ function babel_content()
 				$bbcode2 = Text\HTML::toBBCode($html);
 				$results[] = [
 					'title' => L10n::t('BBCode::convert => HTML::toBBCode'),
-					'content' => visible_lf($bbcode2)
+					'content' => visible_whitespace($bbcode2)
 				];
 
 				$markdown = Text\BBCode::toMarkdown($bbcode);
 				$results[] = [
 					'title' => L10n::t('BBCode::toMarkdown'),
-					'content' => visible_lf($markdown)
+					'content' => visible_whitespace($markdown)
 				];
 
 				$html2 = Text\Markdown::convert($markdown);
@@ -55,22 +63,33 @@ function babel_content()
 				$bbcode3 = Text\Markdown::toBBCode($markdown);
 				$results[] = [
 					'title' => L10n::t('BBCode::toMarkdown => Markdown::toBBCode'),
-					'content' => visible_lf($bbcode3)
+					'content' => visible_whitespace($bbcode3)
 				];
 
 				$bbcode4 = Text\HTML::toBBCode($html2);
 				$results[] = [
 					'title' => L10n::t('BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode'),
-					'content' => visible_lf($bbcode4)
+					'content' => visible_whitespace($bbcode4)
 				];
 				break;
 			case 'markdown':
 				$markdown = trim($_REQUEST['text']);
 				$results[] = [
-					'title' => L10n::t('Source input \x28Diaspora format\x29'),
+					'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'),
@@ -80,7 +99,7 @@ function babel_content()
 			case 'html' :
 				$html = trim($_REQUEST['text']);
 				$results[] = [
-					'title' => L10n::t("Raw HTML input"),
+					'title' => L10n::t('Raw HTML input'),
 					'content' => htmlspecialchars($html)
 				];
 
@@ -92,7 +111,13 @@ function babel_content()
 				$bbcode = Text\HTML::toBBCode($html);
 				$results[] = [
 					'title' => L10n::t('HTML::toBBCode'),
-					'content' => visible_lf($bbcode)
+					'content' => visible_whitespace($bbcode)
+				];
+
+				$markdown = Text\HTML::toMarkdown($html);
+				$results[] = [
+					'title' => L10n::t('HTML::toMarkdown'),
+					'content' => visible_whitespace($markdown)
 				];
 
 				$text = Text\HTML::toPlaintext($html);
@@ -105,7 +130,7 @@ function babel_content()
 
 	$tpl = get_markup_template('babel.tpl');
 	$o = replace_macros($tpl, [
-		'$text'          => ['text', L10n::t('Source text'), defaults($_REQUEST, 'text', ''), ''],
+		'$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'],