X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fbb2diaspora.php;h=a07a583538e4ac5e88b1613ff765c50837c83846;hb=f639a86d02e378d591eee973dc79b32a6496d92b;hp=95e2365248e6da095e54c2ef6393c979de6fab3f;hpb=28c08467fd33d556e8e496351745773564aa2683;p=friendica.git

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 95e2365248..a07a583538 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -1,11 +1,12 @@
 <?php
 
-require_once 'include/oembed.php';
-require_once 'include/event.php';
-require_once 'library/markdown.php';
-require_once 'include/html2bbcode.php';
-require_once 'include/bbcode.php';
-require_once 'library/html-to-markdown/HTML_To_Markdown.php';
+use League\HTMLToMarkdown\HtmlConverter;
+
+require_once "include/oembed.php";
+require_once "include/event.php";
+require_once "library/markdown.php";
+require_once "include/html2bbcode.php";
+require_once "include/bbcode.php";
 
 /**
  * @brief Callback function to replace a Diaspora style mention in a mention for Friendica
@@ -105,8 +106,18 @@ function diaspora_mentions($match) {
 	return $mention;
 }
 
+/**
+ * @brief Converts a BBCode text into Markdown
+ *
+ * This function converts a BBCode item body to be sent to Markdown-enabled
+ * systems like Diaspora and Libertree
+ *
+ * @param string $Text
+ * @param bool $preserve_nl Effects unclear, unused in Friendica
+ * @param bool $fordiaspora Diaspora requires more changes than Libertree
+ * @return string
+ */
 function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
-
 	$a = get_app();
 
 	$OriginalText = $Text;
@@ -120,13 +131,27 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
 	 * Transform #tags, strip off the [url] and replace spaces with underscore
 	 */
 	$URLSearchString = "^\[\]";
-	$Text = preg_replace_callback("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i", create_function('$match',
-		'return \'#\'. str_replace(\' \', \'_\', $match[2]);'
-	), $Text);
+	$Text = preg_replace_callback("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i",
+		function ($matches) {
+			return '#' . str_replace(' ', '_', $matches[2]);
+		}
+	, $Text);
 
 	// Converting images with size parameters to simple images. Markdown doesn't know it.
 	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
 
+	// Extracting multi-line code blocks before the whitespace processing/code highlighter in bbcode()
+	$codeblocks = [];
+	$Text = preg_replace_callback('#\[code(?:=([^\]]*))?\](?=\n)(.*?)\[\/code\]#is',
+		function ($matches) use (&$codeblocks) {
+			$return = '#codeblock-' . count($codeblocks) . '#';
+
+            $prefix = '````' . $matches[1] . PHP_EOL;
+			$codeblocks[] = $prefix . trim($matches[2]) . PHP_EOL . '````';
+			return $return;
+		}
+	, $Text);
+
 	// Convert it to HTML - don't try oembed
 	if ($fordiaspora) {
 		$Text = bbcode($Text, $preserve_nl, false, 3);
@@ -136,19 +161,18 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
 			$tagline = "";
 			foreach ($tags[2] as $tag) {
 				$tag = html_entity_decode($tag, ENT_QUOTES, 'UTF-8');
-				if (!strpos(html_entity_decode($Text, ENT_QUOTES, 'UTF-8'), "#" . $tag)) {
-					$tagline .= "#" . $tag . " ";
+				if (!strpos(html_entity_decode($Text, ENT_QUOTES, 'UTF-8'), '#' . $tag)) {
+					$tagline .= '#' . $tag . ' ';
 				}
 			}
 			$Text = $Text." ".$tagline;
 		}
-
 	} else {
 		$Text = bbcode($Text, $preserve_nl, false, 4);
 	}
 
 	// mask some special HTML chars from conversation to markdown
-	$Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
+	$Text = str_replace(array('&lt;', '&gt;', '&amp;'), array('&_lt_;', '&_gt_;', '&_amp_;'), $Text);
 
 	// If a link is followed by a quote then there should be a newline before it
 	// Maybe we should make this newline at every time before a quote.
@@ -157,10 +181,11 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
 	$stamp1 = microtime(true);
 
 	// Now convert HTML to Markdown
-	$Text = new HTML_To_Markdown($Text);
+	$converter = new HtmlConverter();
+	$Text = $converter->convert($Text);
 
 	// unmask the special chars back to HTML
-	$Text = str_replace(array('&_lt_;','&_gt_;','&_amp_;'),array('&lt;','&gt;','&amp;'),$Text);
+	$Text = str_replace(array('&_lt_;', '&_gt_;', '&_amp_;'), array('&lt;', '&gt;', '&amp;'), $Text);
 
 	$a->save_timestamp($stamp1, "parser");
 
@@ -176,14 +201,25 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
 		$Text = preg_replace_callback("/([@]\[(.*?)\])\(([$URLSearchString]*?)\)/ism", 'diaspora_mentions', $Text);
 	}
 
+	// Restore code blocks
+	$Text = preg_replace_callback('/#codeblock-([0-9]+)#/iU',
+		function ($matches) use ($codeblocks) {
+            $return = '';
+            if (isset($codeblocks[intval($matches[1])])) {
+                $return = $codeblocks[$matches[1]];
+            }
+			return $return;
+		}
+	, $Text);
+
 	call_hooks('bb2diaspora',$Text);
 
 	return $Text;
 }
 
 function unescape_underscores_in_links($m) {
-	$y = str_replace('\\_','_', $m[2]);
-	return '[' . $m[1] . '](' . $y . ')';
+	$y = str_replace('\\_', '_', $m[2]);
+	return('[' . $m[1] . '](' . $y . ')');
 }
 
 function format_event_diaspora($ev) {