Merge pull request #3271 from Hypolite/issue/#3189

Fix Diaspora code blocks being mangled

include/bb2diaspora.php

@@ -59,15 +59,6 @@ function diaspora2bb($s) {
 
 	$s = str_replace('#', '#', $s);
 
-	$search = array(" \n", "\n ");
-	$replace = array("\n", "\n");
-	do {
-		$oldtext = $s;
-		$s = str_replace($search, $replace, $s);
-	} while ($oldtext != $s);
-
-	$s = str_replace("\n\n", '<br>', $s);
-
 	$s = html2bbcode($s);
 
 	// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands

include/html2bbcode.php

@@ -79,16 +79,25 @@ function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb)
 	return($replace);
 }
 
-function _replace_code_cb($m){
-	return "<code>".str_replace("\n","<br>\n",$m[1]). "</code>";
-}
-
 function html2bbcode($message)
 {
 
 	$message = str_replace("\r", "", $message);
 
-	$message = preg_replace_callback("|<pre><code>([^<]*)</code></pre>|ism", "_replace_code_cb", $message);
+	// Removing code blocks before the whitespace removal processing below
+	$codeblocks = [];
+	$message = preg_replace_callback('#<pre><code(?: class="([^"]*)")?>(.*)</code></pre>#iUs',
+		function ($matches) use (&$codeblocks) {
+			$return = '[codeblock-' . count($codeblocks) . ']';
+
+            $prefix = '[code]';
+            if ($matches[1] != '') {
+                $prefix = '[code=' . $matches[1] . ']';
+            }
+			$codeblocks[] = $prefix . $matches[2] . '[/code]';
+			return $return;
+		}
+	, $message);
 
 	$message = str_replace(array(
 					"<li><p>",
@@ -232,7 +241,6 @@ function html2bbcode($message)
 	node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]');
 	node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
 
-	node2bbcode($doc, 'code', array(), '[code]', '[/code]');
 	node2bbcode($doc, 'key', array(), '[code]', '[/code]');
 
 	$message = $doc->saveHTML();
@@ -302,6 +310,19 @@ function html2bbcode($message)
 	// Handling Yahoo style of mails
 	$message = str_replace('[hr][b]From:[/b]', '[quote][b]From:[/b]', $message);
 
-	return(trim($message));
+	// Restore code blocks
+	$message = preg_replace_callback('#\[codeblock-([0-9]+)\]#iU',
+		function ($matches) use ($codeblocks) {
+            $return = '';
+            if (isset($codeblocks[intval($matches[1])])) {
+                $return = $codeblocks[$matches[1]];
+            }
+			return $return;
+		}
+	, $message);
+
+	$message = trim($message);
+
+	return $message;
 }
 ?>

mod/babel.php

@@ -1,78 +1,73 @@
 <?php
 
-require_once('include/bbcode.php');
+require_once 'include/bbcode.php';
-require_once('library/markdown.php');
+require_once 'library/markdown.php';
-require_once('include/bb2diaspora.php');
+require_once 'include/bb2diaspora.php';
-require_once('include/html2bbcode.php');
+require_once 'include/html2bbcode.php';
 
 function visible_lf($s) {
 	return str_replace("\n", '<br />', $s);
 }
 
 function babel_content(App $a) {
-
 	$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 .= 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 />';
 
 	$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 .= 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 .= "<h2>" . t("Source input: ") . "</h2>" . EOL. EOL;
+		$o .= '<h2>' . t('Source input: ') . '</h2>' . EOL. EOL;
 		$o .= visible_lf($text) . EOL. EOL;
 
 		$html = bbcode($text);
-		$o .= "<h2>" . t("bb2html (raw HTML): ") . "</h2>" . 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 .= '<h2>' . t('bb2html: ') . '</h2>' . EOL. EOL;
 		$o .= $html. EOL. EOL;
 
 		$bbcode = html2bbcode($html);
-		$o .= "<h2>" . t("bb2html2bb: ") . "</h2>" . EOL. EOL;
+		$o .= '<h2>' . t('bb2html2bb: ') . '</h2>' . EOL. EOL;
 		$o .= visible_lf($bbcode) . EOL. EOL;
 
 		$diaspora = bb2diaspora($text);
-		$o .= "<h2>" . t("bb2md: ") . "</h2>" . EOL. EOL;
+		$o .= '<h2>' . t('bb2md: ') . '</h2>' . EOL. EOL;
 		$o .= visible_lf($diaspora) . EOL. EOL;
 
 		$html = Markdown($diaspora);
-		$o .= "<h2>" . t("bb2md2html: ") . "</h2>" . EOL. EOL;
+		$o .= '<h2>' . t('bb2md2html: ') . '</h2>' . EOL. EOL;
 		$o .= $html. EOL. EOL;
 
 		$bbcode = diaspora2bb($diaspora);
-		$o .= "<h2>" . t("bb2dia2bb: ") . "</h2>" . EOL. EOL;
+		$o .= '<h2>' . t('bb2dia2bb: ') . '</h2>' . EOL. EOL;
 		$o .= visible_lf($bbcode) . EOL. EOL;
 
 		$bbcode = html2bbcode($html);
-		$o .= "<h2>" . t("bb2md2html2bb: ") . "</h2>" . 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 .= '<h2>' . t('Source input (Diaspora format): ') . '</h2>' . EOL. EOL;
-		$o .= visible_lf($d2bbtext) . EOL. EOL;
+		$o .= '<pre>' . $d2bbtext . '</pre>' . EOL. EOL;
-
 
 		$bb = diaspora2bb($d2bbtext);
-		$o .= "<h2>" . t("diaspora2bb: ") . "</h2>" . EOL. EOL;
+		$o .= '<h2>' . t('diaspora2bb: ') . '</h2>' . EOL. EOL;
-		$o .= visible_lf($bb) . EOL. EOL;
+		$o .= '<pre>' . $bb . '</pre>' . EOL. EOL;
 	}
 
 	return $o;