X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fbabel.php;h=6e47b81084b0f158be746c56af021f026cd0c7ff;hb=4af0119b7310e9731e60b11a14fd917580b95715;hp=e8ea11c94e904305d6d89985c5ab730e6cfcabb6;hpb=b067a1114679ebc3dc6132759c511c3ac8b73e49;p=friendica.git
diff --git a/mod/babel.php b/mod/babel.php
index e8ea11c94e..6e47b81084 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -1,79 +1,168 @@
', $s);
-}
-
-function babel_content(App $a) {
-
- $o .= '
Babel Diagnostic
';
-
- $o .= '';
-
- $o .= '
';
-
- $o .= '';
-
- $o .= '
';
-
- if(x($_REQUEST,'text')) {
-
- $text = trim($_REQUEST['text']);
- $o .= "" . t("Source input: ") . "
" . EOL. EOL;
- $o .= visible_lf($text) . EOL. EOL;
-
- $html = bbcode($text);
- $o .= "" . t("bb2html (raw HTML): ") . "
" . EOL. EOL;
- $o .= htmlspecialchars($html). EOL. EOL;
-
- //$html = bbcode($text);
- $o .= "" . t("bb2html: ") . "
" . EOL. EOL;
- $o .= $html. EOL. EOL;
-
- $bbcode = html2bbcode($html);
- $o .= "" . t("bb2html2bb: ") . "
" . EOL. EOL;
- $o .= visible_lf($bbcode) . EOL. EOL;
-
- $diaspora = bb2diaspora($text);
- $o .= "" . t("bb2md: ") . "
" . EOL. EOL;
- $o .= visible_lf($diaspora) . EOL. EOL;
-
- $html = Markdown($diaspora);
- $o .= "" . t("bb2md2html: ") . "
" . EOL. EOL;
- $o .= $html. EOL. EOL;
-
- $bbcode = diaspora2bb($diaspora);
- $o .= "" . t("bb2dia2bb: ") . "
" . EOL. EOL;
- $o .= visible_lf($bbcode) . EOL. EOL;
-
- $bbcode = html2bbcode($html);
- $o .= "" . t("bb2md2html2bb: ") . "
" . EOL. EOL;
- $o .= visible_lf($bbcode) . EOL. EOL;
+use Friendica\Content\Text;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+function visible_whitespace($s)
+{
+ $s = str_replace(' ', ' ', $s);
+ return str_replace(["\r\n", "\n", "\r"], '
', $s);
+}
+function babel_content()
+{
+ $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)
+ ];
+
+ $item = [
+ 'body' => $bbcode,
+ 'tag' => '',
+ ];
+
+ \Friendica\Model\Item::setHashtags($item);
+ $results[] = [
+ 'title' => L10n::t('Item Body'),
+ 'content' => visible_whitespace($item['body'])
+ ];
+ $results[] = [
+ 'title' => L10n::t('Item Tags'),
+ 'content' => $item['tag']
+ ];
+ break;
+ case 'markdown':
+ $markdown = trim($_REQUEST['text']);
+ $results[] = [
+ 'title' => L10n::t('Source input (Diaspora format)'),
+ 'content' => '' . $markdown . '
'
+ ];
+
+ $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' => '' . $bbcode . '
'
+ ];
+ 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' => '' . $text . '
'
+ ];
+ }
}
- if(x($_REQUEST,'d2bbtext')) {
-
- $d2bbtext = trim($_REQUEST['d2bbtext']);
- $o .= "" . t("Source input (Diaspora format): ") . "
" . EOL. EOL;
- $o .= visible_lf($d2bbtext) . EOL. EOL;
-
-
- $bb = diaspora2bb($d2bbtext);
- $o .= "" . t("diaspora2bb: ") . "
" . EOL. EOL;
- $o .= visible_lf($bb) . EOL. EOL;
- }
+ $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'],
+ '$results' => $results
+ ]);
return $o;
}