X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fbb2diaspora.php;h=714d780048b9724fe48f5570cd78ed6a433f65a7;hb=05674206ba9a7c70c5e298e3925d95428abff78e;hp=1dc775887ebf3e2936c2c0fbbc2bbd98c92a36ed;hpb=86cae070f2a048e553c545caec54be72c1c14da5;p=friendica.git

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 1dc775887e..714d780048 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -1,14 +1,16 @@
 <?php
 
 use Friendica\App;
+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 '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
@@ -21,7 +23,7 @@ function diaspora_mention2bb($match) {
 		return;
 	}
 
-	$data = get_contact_details_by_addr($match[2]);
+	$data = Contact::getDetailsByAddr($match[2]);
 
 	$name = $match[1];
 
@@ -94,7 +96,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]);
@@ -187,7 +189,7 @@ 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(array('&\_lt\_;', '&\_gt\_;', '&\_amp\_;'), array('&lt;', '&gt;', '&amp;'), $Text);
 
 	$a->save_timestamp($stamp1, "parser");
 
@@ -240,7 +242,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 +250,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'])) {