Rewrite Proxy module

[friendica.git] / mod / babel.php

diff --git a/mod/babel.php b/mod/babel.php
index cafd06556b8adde32498fe28dd39c9e120e2849f..64c9557767d278d7a6122019dbd6016f4c3087d0 100644 (file)
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -5,10 +5,13 @@
 
 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()
@@ -20,13 +23,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\x29"),
-                                       'content' => htmlspecialchars($html)
+                                       'title' => L10n::t('BBCode::convert (raw HTML)'),
+                                       'content' => visible_whitespace(htmlspecialchars($html))
                                ];
 
                                $results[] = [
@@ -37,13 +46,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 +64,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 +100,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 +112,24 @@ function babel_content()
                                $bbcode = Text\HTML::toBBCode($html);
                                $results[] = [
                                        'title' => L10n::t('HTML::toBBCode'),
-                                       'content' => visible_lf($bbcode)
+                                       '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);
@@ -103,8 +140,8 @@ function babel_content()
                }
        }
 
-       $tpl = get_markup_template('babel.tpl');
-       $o = replace_macros($tpl, [
+       $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'],