X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fbabel.php;h=a4fbd172eed6282015c2c3d7a0720fe9738b73cf;hb=391c5913227c7f62f19b4f08906b0b1b0b618b33;hp=1c881a5bd2fb54f0c74fc7ac10262fb2c171d4d2;hpb=64fc1318c68e55f3ba3cf393c32d6d8d12cd51d5;p=friendica.git

diff --git a/mod/babel.php b/mod/babel.php
index 1c881a5bd2..a4fbd172ee 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -1,56 +1,78 @@
 <?php
 
-require_once('include/bbcode.php');
-require_once('library/markdown.php');
-require_once('include/bb2diaspora.php');
-require_once('include/html2bbcode.php');
+use Friendica\Content\Text\Markdown;
 
-function visible_lf($s) {
-	return str_replace("\n",'<br />', $s);
-}
+require_once 'include/bbcode.php';
+require_once 'include/bb2diaspora.php';
+require_once 'include/html2bbcode.php';
+require_once 'include/pgettext.php';
 
-function babel_content(&$a) {
+function visible_lf($s)
+{
+	return str_replace("\n", '<br />', $s);
+}
 
-	$o .= '<h3>Babel Diagnostic</h3>';
+function babel_content()
+{
+	$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;
-	$o .= '<input type="submit" name="submit" value="Submit" /></form>'; 
+	$o .= t('Source (bbcode) 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 />';
 
-	if(x($_REQUEST,'text')) {
+	$o .= '<form action="babel" method="post">';
+	$o .= t('Source (Diaspora) 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 .= t("Source input: ") . EOL. EOL; 
-		$o .= visible_lf($text) . 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 .= $html. EOL. EOL; 
+		$o .= '<h2>' . t('bbcode (raw HTML): ') . '</h2>' . EOL . EOL;
+		$o .= htmlspecialchars($html) . EOL . EOL;
+
+		//$html = bbcode($text);
+		$o .= '<h2>' . t('bbcode: ') . '</h2>' . EOL . EOL;
+		$o .= $html . EOL . EOL;
 
 		$bbcode = html2bbcode($html);
-		$o .= t("bb2html2bb: ") . EOL. EOL; 
-		$o .= visible_lf($bbcode) . EOL. EOL; 
+		$o .= '<h2>' . t('bbcode => html2bbcode: ') . '</h2>' . EOL . EOL;
+		$o .= visible_lf($bbcode) . EOL . EOL;
 
 		$diaspora = bb2diaspora($text);
-		$o .= t("bb2md: ") . EOL. EOL; 
-		$o .= visible_lf($diaspora) . EOL. EOL; 
+		$o .= '<h2>' . t('bb2diaspora: ') . '</h2>' . EOL . EOL;
+		$o .= visible_lf($diaspora) . EOL . EOL;
 
-		$html = Markdown($diaspora);
-		$o .= t("bb2md2html: ") . EOL. EOL; 
-		$o .= $html. EOL. EOL; 
+		$html = Markdown::convert($diaspora);
+		$o .= '<h2>' . t('bb2diaspora => Markdown: ') . '</h2>' . EOL . EOL;
+		$o .= $html . EOL . EOL;
 
 		$bbcode = diaspora2bb($diaspora);
-		$o .= t("bb2dia2bb: ") . EOL. EOL; 
-		$o .= visible_lf($bbcode) . EOL. EOL; 
+		$o .= '<h2>' . t('bb2diaspora => diaspora2bb: ') . '</h2>' . EOL . EOL;
+		$o .= visible_lf($bbcode) . EOL . EOL;
 
 		$bbcode = html2bbcode($html);
-		$o .= t("bb2md2html2bb: ") . EOL. EOL; 
-		$o .= visible_lf($bbcode) . EOL. EOL; 
-
+		$o .= '<h2>' . t('bbcode => html2bbcode: ') . '</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 .= '<pre>' . $d2bbtext . '</pre>' . EOL . EOL;
 
+		$bb = diaspora2bb($d2bbtext);
+		$o .= '<h2>' . t('diaspora2bb: ') . '</h2>' . EOL . EOL;
+		$o .= '<pre>' . $bb . '</pre>' . EOL . EOL;
 	}
+
 	return $o;
 }