X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=87a8eaa9b38d6518c57c779e0cf026d5567737bf;hb=58d5d918314a2b01762c0fca33368a5a62a89512;hp=9518fe7dd1fd1dee880a53c78201e021b6e3bf38;hpb=722e03cc58ed636fa1a3ace1b12ccd4d92e4ed08;p=friendica.git

diff --git a/include/bbcode.php b/include/bbcode.php
index 9518fe7dd1..87a8eaa9b3 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,13 +1,16 @@
 <?php
 
 use Friendica\App;
+use Friendica\Content\Smilies;
+use Friendica\Content\OEmbed;
+use Friendica\Core\Cache;
+use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Model\Contact;
+use Friendica\Util\Map;
 
-require_once 'include/oembed.php';
 require_once 'include/event.php';
-require_once 'include/map.php';
 require_once 'mod/proxy.php';
-require_once 'include/Contact.php';
 require_once 'include/plaintext.php';
 
 function bb_PictureCacheExt($matches) {
@@ -30,11 +33,11 @@ function bb_PictureCache($matches) {
 
 function bb_map_coords($match) {
 	// the extra space in the following line is intentional
-	return str_replace($match[0], '<div class="map"  >' . generate_map(str_replace('/', ' ', $match[1])) . '</div>', $match[0]);
+	return str_replace($match[0], '<div class="map"  >' . Map::byCoordinates(str_replace('/', ' ', $match[1])) . '</div>', $match[0]);
 }
 function bb_map_location($match) {
 	// the extra space in the following line is intentional
-	return str_replace($match[0], '<div class="map"  >' . generate_named_map($match[1]) . '</div>', $match[0]);
+	return str_replace($match[0], '<div class="map"  >' . Map::byLocation($match[1]) . '</div>', $match[0]);
 }
 
 function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
@@ -49,28 +52,22 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
 		$data["title"] = str_replace(array("http://", "https://"), "", $data["title"]);
 	}
 
-	if (((strpos($data["text"], "[img=") !== false) OR (strpos($data["text"], "[img]") !== false)) AND ($data["image"] != "")) {
+	if (((strpos($data["text"], "[img=") !== false)
+		|| (strpos($data["text"], "[img]") !== false)
+		|| Config::get('system', 'always_show_preview'))
+		&& ($data["image"] != "")) {
 		$data["preview"] = $data["image"];
 		$data["image"] = "";
 	}
 
 	if ($simplehtml == 7) {
-		$title2 = $data["title"];
-
-		$test1 = trim(html_entity_decode($data["text"],ENT_QUOTES,'UTF-8'));
-		$test2 = trim(html_entity_decode($data["title"],ENT_QUOTES,'UTF-8'));
-
-		// If the link description is similar to the text above then don't add the link description
-		if (($data["title"] != "") AND ((strpos($test1,$test2) !== false) OR
-			(similar_text($test1,$test2) / strlen($data["title"])) > 0.9)) {
-			$title2 = $data["url"];
-		}
-		$text = sprintf('<a href="%s" title="%s" class="attachment" rel="nofollow external">%s</a><br />',
-				$data["url"], $data["title"], $title2);
-	} elseif (($simplehtml != 4) AND ($simplehtml != 0)) {
+		$text = style_url_for_mastodon($data["url"]);
+	} elseif (($simplehtml != 4) && ($simplehtml != 0)) {
 		$text = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]);
 	} else {
-		$text = sprintf('<span class="type-%s">', $data["type"]);
+		if ($simplehtml != 4) {
+			$text = sprintf('<span class="type-%s">', $data["type"]);
+		}
 
 		$bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]);
 		if ($tryoembed) {
@@ -82,22 +79,26 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
 		if (strstr(strtolower($oembed), "<iframe ")) {
 			$text = $oembed;
 		} else {
-			if (($data["image"] != "") AND !strstr(strtolower($oembed), "<img ")) {
+			if (($data["image"] != "") && !strstr(strtolower($oembed), "<img ")) {
 				$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], proxy_url($data["image"]), $data["title"]);
-			} elseif (($data["preview"] != "") AND !strstr(strtolower($oembed), "<img ")) {
+			} elseif (($data["preview"] != "") && !strstr(strtolower($oembed), "<img ")) {
 				$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], proxy_url($data["preview"]), $data["title"]);
 			}
 
-			if (($data["type"] == "photo") AND ($data["url"] != "") AND ($data["image"] != "")) {
+			if (($data["type"] == "photo") && ($data["url"] != "") && ($data["image"] != "")) {
 				$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], proxy_url($data["image"]), $data["title"]);
 			} else {
 				$text .= $oembed;
 			}
 
 			if (trim($data["description"]) != "") {
-				$text .= sprintf('<blockquote>%s</blockquote></span>', trim(bbcode($data["description"])));
+				$text .= sprintf('<blockquote>%s</blockquote>', trim(bbcode($data["description"])));
 			}
 		}
+
+		if ($simplehtml != 4) {
+			$text .= '</span>';
+		}
 	}
 	return trim($data["text"].' '.$text.' '.$data["after"]);
 }
@@ -114,25 +115,25 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false)
 
 	$title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false);
 	$text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false);
-	if ($plaintext OR (($title != "") AND strstr($text, $title))) {
+	if ($plaintext || (($title != "") && strstr($text, $title))) {
 		$data["title"] = $data["url"];
-	} elseif (($text != "") AND strstr($title, $text)) {
+	} elseif (($text != "") && strstr($title, $text)) {
 		$data["text"] = $data["title"];
 		$data["title"] = $data["url"];
 	}
 
-	if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) {
+	if (($data["text"] == "") && ($data["title"] != "") && ($data["url"] == "")) {
 		return $data["title"] . $data["after"];
 	}
 
 	// If the link already is included in the post, don't add it again
-	if (($data["url"] != "") AND strpos($data["text"], $data["url"])) {
+	if (($data["url"] != "") && strpos($data["text"], $data["url"])) {
 		return $data["text"] . $data["after"];
 	}
 
 	$text = $data["text"];
 
-	if (($data["url"] != "") AND ($data["title"] != "")) {
+	if (($data["url"] != "") && ($data["title"] != "")) {
 		$text .= "\n[url=" . $data["url"] . "]" . $data["title"] . "[/url]";
 	} elseif (($data["url"] != "")) {
 		$text .= "\n" . $data["url"];
@@ -158,7 +159,7 @@ function cleancss($input) {
 	for ($i = 0; $i < strlen($input); $i++) {
 		$char = substr($input, $i, 1);
 
-		if (($char >= "a") and ($char <= "z")) {
+		if (($char >= "a") && ($char <= "z")) {
 			$cleaned .= $char;
 		}
 
@@ -171,14 +172,14 @@ function cleancss($input) {
 }
 
 /**
- * @brief Converts [url] BBCodes in a format that looks fine on Mastodon.
+ * @brief Converts [url] BBCodes in a format that looks fine on Mastodon. (callback function)
  * @param array $match Array with the matching values
- * @return string replaced value
+ * @return string reformatted link including HTML codes
  */
 function bb_style_url($match) {
         $url = $match[1];
 
-	if (isset($match[2]) AND ($match[1] != $match[2])) {
+	if (isset($match[2]) && ($match[1] != $match[2])) {
 		return $match[0];
 	}
 
@@ -187,12 +188,22 @@ function bb_style_url($match) {
                 return $match[0];
         }
 
+	return style_url_for_mastodon($url);
+}
+
+/**
+ * @brief Converts [url] BBCodes in a format that looks fine on Mastodon and GNU Social.
+ * @param string $url URL that is about to be reformatted
+ * @return string reformatted link including HTML codes
+ */
+function style_url_for_mastodon($url) {
         $styled_url = $url;
 
+        $parts = parse_url($url);
         $scheme = $parts['scheme'].'://';
         $styled_url = str_replace($scheme, '', $styled_url);
 
-        $html = '<a href="%s" rel="nofollow noopener" target="_blank">'.
+        $html = '<a href="%s" class="attachment" rel="nofollow noopener" target="_blank">'.
                  '<span class="invisible">%s</span>';
 
         if (strlen($styled_url) > 30) {
@@ -219,7 +230,7 @@ function tryoembed($match) {
 	$url = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
 				array("https://www.youtube.com/", "https://player.vimeo.com/"), $url);
 
-	$o = oembed_fetch_url($url);
+	$o = OEmbed::fetchURL($url);
 
 	if (!is_object($o)) {
 		return $match[0];
@@ -233,7 +244,7 @@ function tryoembed($match) {
 		return $match[0];
 	}
 
-	$html = oembed_format_object($o);
+	$html = OEmbed::formatObject($o);
 
 	return $html;
 }
@@ -257,7 +268,6 @@ function bb_spacefy($st) {
  * returning [i]italic[/i]
  */
 function bb_unspacefy_and_trim($st) {
-	$whole_match = $st[0];
 	$captured = $st[1];
 	$unspacefied = preg_replace("/\[ (.*?)\ ]/", "[$1]", $captured);
 	return $unspacefied;
@@ -363,7 +373,6 @@ function bb_tag_preg_replace($pattern, $replace, $name, $s) {
 	return $string;
 }
 
-if (! function_exists('bb_extract_images')) {
 function bb_extract_images($body) {
 
 	$saved_image = array();
@@ -405,9 +414,8 @@ function bb_extract_images($body) {
 	$new_body = $new_body . $orig_body;
 
 	return array('body' => $new_body, 'images' => $saved_image);
-}}
+}
 
-if (! function_exists('bb_replace_images')) {
 function bb_replace_images($body, $images) {
 
 	$newbody = $body;
@@ -422,164 +430,176 @@ function bb_replace_images($body, $images) {
 	}
 
 	return $newbody;
-}}
+}
 
-function bb_ShareAttributes($share, $simplehtml) {
+function bb_ShareAttributes($share, $simplehtml)
+{
 	$attributes = $share[2];
 
 	$author = "";
 	preg_match("/author='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
-		$author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
+	if (x($matches, 1)) {
+		$author = html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8');
+	}
 
 	preg_match('/author="(.*?)"/ism', $attributes, $matches);
-	if ($matches[1] != "")
+	if (x($matches, 1)) {
 		$author = $matches[1];
+	}
 
 	$profile = "";
 	preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
+	if (x($matches, 1)) {
 		$profile = $matches[1];
+	}
 
 	preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-	if ($matches[1] != "")
+	if (x($matches, 1)) {
 		$profile = $matches[1];
+	}
 
 	$avatar = "";
 	preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
+	if (x($matches, 1)) {
 		$avatar = $matches[1];
+	}
 
 	preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
-	if ($matches[1] != "")
+	if (x($matches, 1)) {
 		$avatar = $matches[1];
+	}
 
 	$link = "";
 	preg_match("/link='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
+	if (x($matches, 1)) {
 		$link = $matches[1];
+	}
 
 	preg_match('/link="(.*?)"/ism', $attributes, $matches);
-	if ($matches[1] != "")
+	if (x($matches, 1)) {
 		$link = $matches[1];
+	}
 
 	$posted = "";
 
-	$itemcache = get_itemcachepath();
-
 	preg_match("/posted='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
+	if (x($matches, 1)) {
 		$posted = $matches[1];
+	}
 
 	preg_match('/posted="(.*?)"/ism', $attributes, $matches);
-	if ($matches[1] != "")
+	if (x($matches, 1)) {
 		$posted = $matches[1];
-
-	// relative dates only make sense when they aren't cached
-	if ($itemcache == "")
-		$reldate = (($posted) ? " " . relative_date($posted) : '');
+	}
 
 	// We only call this so that a previously unknown contact can be added.
 	// This is important for the function "get_contact_details_by_url".
 	// This function then can fetch an entry from the contact table.
-	get_contact($profile, 0);
+	Contact::getIdForURL($profile, 0);
 
-	$data = get_contact_details_by_url($profile);
+	$data = Contact::getDetailsByURL($profile);
 
-	if (isset($data["name"]) AND ($data["name"] != "") AND isset($data["addr"]) AND ($data["addr"] != ""))
-	        $userid_compact = $data["name"]." (".$data["addr"].")";
-	else
-		$userid_compact = GetProfileUsername($profile,$author, true);
+	if (x($data, "name") && x($data, "addr")) {
+		$userid_compact = $data["name"] . " (" . $data["addr"] . ")";
+	} else {
+		$userid_compact = GetProfileUsername($profile, $author, true);
+	}
 
-	if (isset($data["addr"]) AND ($data["addr"] != ""))
+	if (x($data, "addr")) {
 		$userid = $data["addr"];
-	else
-		$userid = GetProfileUsername($profile,$author, false);
+	} else {
+		$userid = GetProfileUsername($profile, $author, false);
+	}
 
-	if (isset($data["name"]) AND ($data["name"] != ""))
+	if (x($data, "name")) {
 		$author = $data["name"];
+	}
 
-	if (isset($data["micro"]) AND ($data["micro"] != ""))
+	if (x($data, "micro")) {
 		$avatar = $data["micro"];
+	}
 
 	$preshare = trim($share[1]);
 
-	if ($preshare != "")
+	if ($preshare != "") {
 		$preshare .= "<br /><br />";
+	}
 
 	switch ($simplehtml) {
 		case 1:
-			$text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' <a href="'.$profile.'">'.$userid."</a>: <br />»".$share[3]."«";
+			$text = $preshare . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . ' <a href="' . $profile . '">' . $userid . "</a>: <br />»" . $share[3] . "«";
 			break;
 		case 2:
-			$text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
+			$text = $preshare . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . ' ' . $userid_compact . ": <br />" . $share[3];
 			break;
 		case 3: // Diaspora
-			$headline .= '<b>'.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').$userid.':</b><br />';
+			$headline .= '<b>' . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . $userid . ':</b><br />';
 
 			$text = trim($share[1]);
 
-			if ($text != "")
+			if ($text != "") {
 				$text .= "<hr />";
+			}
 
 			if (substr(normalise_link($link), 0, 19) != "http://twitter.com/") {
-				$text .= $headline.'<blockquote>'.trim($share[3])."</blockquote><br />";
+				$text .= $headline . '<blockquote>' . trim($share[3]) . "</blockquote><br />";
 
-				if ($link != "")
-					$text .= '<br /><a href="'.$link.'">[l]</a>';
-			} else
-				$text .= '<br /><a href="'.$link.'">'.$link.'</a>';
+				if ($link != "") {
+					$text .= '<br /><a href="' . $link . '">[l]</a>';
+				}
+			} else {
+				$text .= '<br /><a href="' . $link . '">' . $link . '</a>';
+			}
 
 			break;
 		case 4:
-			$headline = '<div class="shared_header">';
-			$headline .= '<span><b>'.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
-			$headline .= sprintf(t('<a href="%1$s" target="_blank">%2$s</a> %3$s'), $link, $userid, $posted);
-			$headline .= ":</b></span></div>";
+			$headline .= '<br /><b>' . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
+			$headline .= t('<a href="%1$s" target="_blank">%2$s</a> %3$s', $link, $userid, $posted);
+			$headline .= ":</b><br />";
 
 			$text = trim($share[1]);
 
-			if ($text != "")
+			if ($text != "") {
 				$text .= "<hr />";
+			}
 
-			$text .= $headline.'<blockquote class="shared_content">'.trim($share[3])."</blockquote><br />";
+			$text .= $headline . '<blockquote class="shared_content">' . trim($share[3]) . "</blockquote><br />";
 
 			break;
 		case 5:
-			$text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
+			$text = $preshare . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . ' ' . $userid_compact . ": <br />" . $share[3];
 			break;
 		case 6: // app.net
-			$text = $preshare."&gt;&gt; @".$userid_compact.": <br />".$share[3];
+			$text = $preshare . "&gt;&gt; @" . $userid_compact . ": <br />" . $share[3];
 			break;
 		case 7: // statusnet/GNU Social
-			$text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')." @".$userid_compact.": ".$share[3];
+			$text = $preshare . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . " @" . $userid_compact . ": " . $share[3];
 			break;
 		case 8: // twitter
-			$text = $preshare."RT @".$userid_compact.": ".$share[3];
+			$text = $preshare . "RT @" . $userid_compact . ": " . $share[3];
 			break;
 		case 9: // Google+/Facebook
-			$text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.": <br />".$share[3];
+			$text = $preshare . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . ' ' . $userid_compact . ": <br />" . $share[3];
 
-			if ($link != "")
-				$text .= "<br /><br />".$link;
+			if ($link != "") {
+				$text .= "<br /><br />" . $link;
+			}
 			break;
 		default:
-			$text = trim($share[1])."\n";
+			$text = trim($share[1]) . "\n";
 
 			$avatar = proxy_url($avatar, false, PROXY_SIZE_THUMB);
 
 			$tpl = get_markup_template('shared_content.tpl');
-			$text .= replace_macros($tpl,
-					array(
-						'$profile' => $profile,
-						'$avatar' => $avatar,
-						'$author' => $author,
-						'$link' => $link,
-						'$posted' => $posted,
-						'$reldate' => $reldate,
-						'$content' => trim($share[3])
-					)
-				);
+			$text .= replace_macros($tpl, array(
+					'$profile' => $profile,
+					'$avatar' => $avatar,
+					'$author' => $author,
+					'$link' => $link,
+					'$posted' => $posted,
+					'$content' => trim($share[3])
+				)
+			);
 			break;
 	}
 
@@ -693,7 +713,7 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork =
 }
 
 function bb_DiasporaLinks($match) {
-	return "[url=".App::get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]";
+	return "[url=".System::baseUrl()."/display/".$match[1]."]".$match[2]."[/url]";
 }
 
 function bb_RemovePictureLinks($match) {
@@ -745,7 +765,7 @@ function bb_RemovePictureLinks($match) {
 }
 
 function bb_expand_links($match) {
-	if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3])) {
+	if (($match[3] == "") || ($match[2] == $match[3]) || stristr($match[2], $match[3])) {
 		return ($match[1] . "[url]" . $match[2] . "[/url]");
 	} else {
 		return ($match[1] . $match[3] . " [url]" . $match[2] . "[/url]");
@@ -905,7 +925,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	$Text = str_replace("\r\n", "\n", $Text);
 
 	// removing multiplicated newlines
-	if (get_config("system", "remove_multiplicated_lines")) {
+	if (Config::get("system", "remove_multiplicated_lines")) {
 		$search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n",
 				"\n[h1]", "[/h1]\n", "\n[h2]", "[/h2]\n", "\n[h3]", "[/h3]\n", "\n[h4]", "[/h4]\n", "\n[h5]", "[/h5]\n", "\n[h6]", "[/h6]\n");
 		$replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ", "[/attachment]",
@@ -931,18 +951,18 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	$MAILSearchString = $URLSearchString;
 
 	// Remove all hashtag addresses
-	if ((!$tryoembed OR $simplehtml) AND !in_array($simplehtml, array(3, 7))) {
-		$Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
+	if ((!$tryoembed || $simplehtml) && !in_array($simplehtml, array(3, 7))) {
+		$Text = preg_replace("/([#@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
 	} elseif ($simplehtml == 3) {
-		$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+		$Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
 			'$1<a href="$2">$3</a>',
 			$Text);
 	} elseif ($simplehtml == 7) {
-		$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+		$Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
 			'$1<span class="vcard"><a href="$2" class="url" title="$3"><span class="fn nickname mention">$3</span></a></span>',
 			$Text);
 	} elseif (!$simplehtml) {
-		$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+		$Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
 			'$1<a href="$2" class="userinfo mention" title="$3">$3</a>',
 			$Text);
 	}
@@ -954,13 +974,13 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 				"[bookmark=$1]$2[/bookmark]", $Text);
 
 	if (in_array($simplehtml, array(2, 6, 7, 8, 9))) {
-		$Text = preg_replace_callback("/([^#@])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "bb_expand_links", $Text);
-		//$Text = preg_replace("/[^#@]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
+		$Text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "bb_expand_links", $Text);
+		//$Text = preg_replace("/[^#@!]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
 		$Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$Text);
 	}
 
 	if ($simplehtml == 5) {
-		$Text = preg_replace("/[^#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text);
+		$Text = preg_replace("/[^#@!]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text);
 	}
 
 	// Perform URL Search
@@ -977,6 +997,11 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	// Handle Diaspora posts
 	$Text = preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi", 'bb_DiasporaLinks', $Text);
 
+	// Server independent link to posts and comments
+	// See issue: https://github.com/diaspora/diaspora_federation/issues/75
+	$expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
+	$Text = preg_replace($expression, System::baseUrl()."/display/$1", $Text);
+
 	// if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text
 //	if ($simplehtml != 7) {
 		if (!$forplaintext) {
@@ -1012,7 +1037,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	// we may need to restrict this further if it picks up too many strays
 	// link acct:user@host to a webfinger profile redirector
 
-	$Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . App::get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>', $Text);
+	$Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . System::baseUrl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>', $Text);
 
 	// Perform MAIL Search
 	$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
@@ -1127,7 +1152,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	// Check for [spoiler] text
 	// handle nested quotes
 	$endlessloop = 0;
-	while ((strpos($Text, "[/spoiler]") !== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) {
+	while ((strpos($Text, "[/spoiler]") !== false) && (strpos($Text, "[spoiler]") !== false) && (++$endlessloop < 20)) {
 		$Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism", "$SpoilerLayout", $Text);
 	}
 
@@ -1137,7 +1162,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 
 	// handle nested quotes
 	$endlessloop = 0;
-	while ((strpos($Text, "[/spoiler]")!== false)  and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20)) {
+	while ((strpos($Text, "[/spoiler]")!== false)  && (strpos($Text, "[spoiler=") !== false) && (++$endlessloop < 20)) {
 		$Text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism",
 				     "<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>",
 				     $Text);
@@ -1149,7 +1174,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	// Check for [quote] text
 	// handle nested quotes
 	$endlessloop = 0;
-	while ((strpos($Text, "[/quote]") !== false) and (strpos($Text, "[quote]") !== false) and (++$endlessloop < 20)) {
+	while ((strpos($Text, "[/quote]") !== false) && (strpos($Text, "[quote]") !== false) && (++$endlessloop < 20)) {
 		$Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism", "$QuoteLayout", $Text);
 	}
 
@@ -1159,7 +1184,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 
 	// handle nested quotes
 	$endlessloop = 0;
-	while ((strpos($Text, "[/quote]")!== false)  and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) {
+	while ((strpos($Text, "[/quote]")!== false)  && (strpos($Text, "[quote=") !== false) && (++$endlessloop < 20)) {
 		$Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
 				     "<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>",
 				     $Text);
@@ -1185,9 +1210,9 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 			return bb_ShareAttributes($match, $simplehtml);
 		}, $Text);
 
-	$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
-	$Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
-	//$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
+	$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '<br/><img src="' .System::baseUrl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
+	$Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .System::baseUrl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
+	//$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .System::baseUrl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
 
 	// Try to Oembed
 	if ($tryoembed) {
@@ -1248,7 +1273,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 //	$Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
 
 	// oembed tag
-	$Text = oembed_bbcode2html($Text);
+	$Text = OEmbed::BBCode2HTML($Text);
 
 	// Avoid triple linefeeds through oembed
 	$Text = str_replace("<br style='clear:left'></span><br /><br />", "<br style='clear:left'></span><br />", $Text);
@@ -1270,6 +1295,10 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 		$Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism", '', $Text);
 	}
 
+	// Replace non graphical smilies for external posts
+	if ($simplehtml) {
+		$Text = Smilies::replace($Text, false, true);
+	}
 
 	// Replace inline code blocks
 	$Text = preg_replace_callback("|(?!<br[^>]*>)<code>([^<]*)</code>(?!<br[^>]*>)|ism",
@@ -1309,6 +1338,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 
 	// Always allowed protocol even if config isn't set or not including it
 	$allowed_link_protocols[] = 'http';
+	$allowed_link_protocols[] = 'redir/';
 
 	$regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism';
 	$Text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 class="invalid-href" title="' . t('Invalid link protocol') . '">', $Text);
@@ -1320,7 +1350,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	// Clean up the HTML by loading and saving the HTML with the DOM.
 	// Bad structured html can break a whole page.
 	// For performance reasons do it only with ativated item cache or at export.
-	if (!$tryoembed OR (get_itemcachepath() != "")) {
+	if (!$tryoembed || (get_itemcachepath() != "")) {
 		$doc = new DOMDocument();
 		$doc->preserveWhiteSpace = false;