X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=4856d18ab181fbf02b59a1a91a4bd9f5d70b2539;hb=b4d14164bb47a76e62977447816fae5b65ea4da7;hp=1dc775887ebf3e2936c2c0fbbc2bbd98c92a36ed;hpb=56ee734b00aead633d5d213a6b140b75bc17ba96;p=friendica.git

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 1dc775887e..4856d18ab1 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -1,14 +1,15 @@
 <?php
 
-use Friendica\App;
-
+use Friendica\Content\Text\Markdown;
+use Friendica\Core\Addon;
+use Friendica\Core\System;
+use Friendica\Model\Contact;
+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";
+require_once 'include/event.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
@@ -21,7 +22,7 @@ function diaspora_mention2bb($match) {
 		return;
 	}
 
-	$data = get_contact_details_by_addr($match[2]);
+	$data = Contact::getDetailsByAddr($match[2]);
 
 	$name = $match[1];
 
@@ -51,12 +52,12 @@ function diaspora2bb($s) {
 	$s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s);
 
 	// The parser cannot handle paragraphs correctly
-	$s = str_replace(array('</p>', '<p>', '<p dir="ltr">'), array('<br>', '<br>', '<br>'), $s);
+	$s = str_replace(['</p>', '<p>', '<p dir="ltr">'], ['<br>', '<br>', '<br>'], $s);
 
 	// Escaping the hash tags
 	$s = preg_replace('/\#([^\s\#])/', '&#35;$1', $s);
 
-	$s = Markdown($s);
+	$s = Markdown::convert($s);
 
 	$regexp = "/@\{(?:([^\}]+?); )?([^\} ]+)\}/";
 	$s = preg_replace_callback($regexp, 'diaspora_mention2bb', $s);
@@ -94,7 +95,7 @@ function diaspora2bb($s) {
  */
 function diaspora_mentions($match) {
 
-	$contact = get_contact_details_by_url($match[3]);
+	$contact = Contact::getDetailsByURL($match[3]);
 
 	if (!x($contact, 'addr')) {
 		$contact = Probe::uri($match[3]);
@@ -144,12 +145,16 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
 
 	// Extracting multi-line code blocks before the whitespace processing/code highlighter in bbcode()
 	$codeblocks = [];
-	$Text = preg_replace_callback('#\[code(?:=([^\]]*))?\](?=\n)(.*?)\[\/code\]#is',
+
+	$Text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#is",
 		function ($matches) use (&$codeblocks) {
-			$return = '#codeblock-' . count($codeblocks) . '#';
+			$return = $matches[0];
+			if (strpos($matches[2], "\n") !== false) {
+				$return = '#codeblock-' . count($codeblocks) . '#';
 
-            $prefix = '````' . $matches[1] . PHP_EOL;
-			$codeblocks[] = $prefix . trim($matches[2]) . PHP_EOL . '````';
+				$prefix = '````' . $matches[1] . PHP_EOL;
+				$codeblocks[] = $prefix . trim($matches[2]) . PHP_EOL . '````';
+			}
 			return $return;
 		}
 	, $Text);
@@ -174,11 +179,11 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
 	}
 
 	// mask some special HTML chars from conversation to markdown
-	$Text = str_replace(array('&lt;', '&gt;', '&amp;'), array('&_lt_;', '&_gt_;', '&_amp_;'), $Text);
+	$Text = str_replace(['&lt;', '&gt;', '&amp;'], ['&_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.
-	$Text = str_replace(array("</a><blockquote>"), array("</a><br><blockquote>"), $Text);
+	$Text = str_replace(["</a><blockquote>"], ["</a><br><blockquote>"], $Text);
 
 	$stamp1 = microtime(true);
 
@@ -187,12 +192,12 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
 	$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(['&\_lt\_;', '&\_gt\_;', '&\_amp\_;'], ['&lt;', '&gt;', '&amp;'], $Text);
 
 	$a->save_timestamp($stamp1, "parser");
 
 	// Libertree has a problem with escaped hashtags.
-	$Text = str_replace(array('\#'), array('#'), $Text);
+	$Text = str_replace(['\#'], ['#'], $Text);
 
 	// Remove any leading or trailing whitespace, as this will mess up
 	// the Diaspora signature verification and cause the item to disappear
@@ -214,7 +219,7 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
 		}
 	, $Text);
 
-	call_hooks('bb2diaspora',$Text);
+	Addon::callHooks('bb2diaspora',$Text);
 
 	return $Text;
 }
@@ -240,7 +245,7 @@ function format_event_diaspora($ev) {
 			$ev['start'] , $bd_format ))
 			:  day_translate(datetime_convert('UTC', 'UTC',
 			$ev['start'] , $bd_format)))
-		.  '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
+		.  '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
 
 	if (! $ev['nofinish']) {
 		$o .= t('Finishes:') . ' ' . '['
@@ -248,7 +253,7 @@ function format_event_diaspora($ev) {
 				$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";
+			. '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
 	}
 
 	if (strlen($ev['location'])) {