X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=80ee1b50dcc0b505f338ee79f1257287ba023f5a;hb=4a473611163a12b48d3bbad71dc54765be8789f9;hp=03eff5a6b73a5bd2c398d11fe8c4d448110a1497;hpb=ee293f2ce28270e1f8e05ce38991977d41e40c27;p=friendica.git

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 03eff5a6b7..80ee1b50dc 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -1,11 +1,15 @@
 <?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 Friendica\App;
+use Friendica\Network\Probe;
+
+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
@@ -26,14 +30,15 @@ function diaspora_mention2bb($match) {
 		$name = $data['name'];
 	}
 
-	return '@[url='.$data['url'].']'.$name.'[/url]';
+	return '@[url=' . $data['url'] . ']' . $name . '[/url]';
 }
 
-// we don't want to support a bbcode specific markdown interpreter
-// and the markdown library we have is pretty good, but provides HTML output.
-// So we'll use that to convert to HTML, then convert the HTML back to bbcode,
-// and then clean up a few Diaspora specific constructs.
-
+/*
+ * we don't want to support a bbcode specific markdown interpreter
+ * and the markdown library we have is pretty good, but provides HTML output.
+ * So we'll use that to convert to HTML, then convert the HTML back to bbcode,
+ * and then clean up a few Diaspora specific constructs.
+ */
 function diaspora2bb($s) {
 
 	$s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
@@ -92,59 +97,85 @@ function diaspora_mentions($match) {
 
 	$contact = get_contact_details_by_url($match[3]);
 
-	if (!isset($contact['addr'])) {
+	if (!x($contact, 'addr')) {
 		$contact = Probe::uri($match[3]);
 	}
 
-	if (!isset($contact['addr'])) {
+	if (!x($contact, 'addr')) {
 		return $match[0];
 	}
 
-	$mention = '@{'.$match[2].'; '.$contact['addr'].'}';
+	$mention = '@{' . $match[2] . '; ' . $contact['addr'] . '}';
 	return $mention;
 }
 
-function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
-
+/**
+ * @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;
 
 	// Since Diaspora is creating a summary for links, this function removes them before posting
-	if ($fordiaspora)
+	if ($fordiaspora) {
 		$Text = bb_remove_share_information($Text);
+	}
 
 	/**
 	 * 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);
 
 		// Add all tags that maybe were removed
-		if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$OriginalText, $tags)) {
+		if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $OriginalText, $tags)) {
 			$tagline = "";
-			foreach($tags[2] as $tag) {
+			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
+	} 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.
@@ -153,10 +184,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");
 
@@ -172,20 +204,31 @@ 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]);
+	$y = str_replace('\\_', '_', $m[2]);
 	return('[' . $m[1] . '](' . $y . ')');
 }
 
 function format_event_diaspora($ev) {
-
-	if(! ((is_array($ev)) && count($ev)))
+	if (! ((is_array($ev)) && count($ev))) {
 		return '';
+	}
 
 	$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
 
@@ -200,17 +243,19 @@ function format_event_diaspora($ev) {
 			$ev['start'] , $bd_format)))
 		.  '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
 
-	if(! $ev['nofinish'])
+	if (! $ev['nofinish']) {
 		$o .= t('Finishes:') . ' ' . '['
 			. (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
 				$ev['finish'] , $bd_format ))
 				:  day_translate(datetime_convert('UTC', 'UTC',
 				$ev['finish'] , $bd_format )))
 			. '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
+	}
 
-	if(strlen($ev['location']))
+	if (strlen($ev['location'])) {
 		$o .= t('Location:') . bb2diaspora($ev['location'])
 			. "\n";
+	}
 
 	$o .= "\n";
 	return $o;