Merge develop into 3011_hcard_vcard

[friendica.git] / mod / babel.php

diff --git a/mod/babel.php b/mod/babel.php
index 1c881a5bd2fb54f0c74fc7ac10262fb2c171d4d2..d31e090c554ee7f0b2c4eb6e716ed5b0d1f646ab 100644 (file)
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -11,7 +11,7 @@ function visible_lf($s) {
 
 function babel_content(&$a) {
 
-       $o .= '<h3>Babel Diagnostic</h3>';
+       $o .= '<h1>Babel Diagnostic</h1>';
 
        $o .= '<form action="babel" method="post">';
        $o .= t('Source (bbcode) text:') . EOL . '<textarea name="text" >' . htmlspecialchars($_REQUEST['text']) .'</textarea>' . EOL;
@@ -19,38 +19,61 @@ function babel_content(&$a) {
 
        $o .= '<br /><br />';
 
+       $o .= '<form action="babel" method="post">';
+       $o .= t('Source (Diaspora) text to convert to BBcode:') . EOL . '<textarea name="d2bbtext" >' . 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 .= t("Source input: ") . EOL. EOL; 
+               $o .= "<h2>" . t("Source input: ") . "</h2>" . EOL. EOL; 
                $o .= visible_lf($text) . EOL. EOL; 
 
                $html = bbcode($text);
-               $o .= t("bb2html: ") . EOL. EOL; 
+               $o .= "<h2>" . t("bb2html (raw HTML): ") . "</h2>" . EOL. EOL; 
+               $o .= htmlspecialchars($html). EOL. EOL; 
+
+               //$html = bbcode($text);
+               $o .= "<h2>" . t("bb2html: ") . "</h2>" . EOL. EOL; 
                $o .= $html. EOL. EOL; 
 
                $bbcode = html2bbcode($html);
-               $o .= t("bb2html2bb: ") . EOL. EOL; 
+               $o .= "<h2>" . t("bb2html2bb: ") . "</h2>" . EOL. EOL; 
                $o .= visible_lf($bbcode) . EOL. EOL; 
 
                $diaspora = bb2diaspora($text);
-               $o .= t("bb2md: ") . EOL. EOL; 
+               $o .= "<h2>" . t("bb2md: ") . "</h2>" . EOL. EOL; 
                $o .= visible_lf($diaspora) . EOL. EOL; 
 
                $html = Markdown($diaspora);
-               $o .= t("bb2md2html: ") . EOL. EOL; 
+               $o .= "<h2>" . t("bb2md2html: ") . "</h2>" . EOL. EOL; 
                $o .= $html. EOL. EOL; 
 
                $bbcode = diaspora2bb($diaspora);
-               $o .= t("bb2dia2bb: ") . EOL. EOL; 
+               $o .= "<h2>" . t("bb2dia2bb: ") . "</h2>" . EOL. EOL; 
                $o .= visible_lf($bbcode) . EOL. EOL; 
 
                $bbcode = html2bbcode($html);
-               $o .= t("bb2md2html2bb: ") . EOL. EOL; 
+               $o .= "<h2>" . t("bb2md2html2bb: ") . "</h2>" . EOL. EOL; 
                $o .= visible_lf($bbcode) . EOL. EOL; 
 
 
 
        }
+
+       if(x($_REQUEST,'d2bbtext')) {
+
+               $d2bbtext = trim($_REQUEST['d2bbtext']);
+               $o .= "<h2>" . t("Source input (Diaspora format): ") . "</h2>" . EOL. EOL; 
+               $o .= visible_lf($d2bbtext) . EOL. EOL; 
+
+
+               $bb = diaspora2bb($d2bbtext);
+               $o .= "<h2>" . t("diaspora2bb: ") . "</h2>" . EOL. EOL; 
+               $o .= visible_lf($bb) . EOL. EOL; 
+       }
+
        return $o;
 }