X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=cad7ddc9251df74ca149e7713efcf341c5d541f2;hb=b4d14164bb47a76e62977447816fae5b65ea4da7;hp=749a7c5946729ddb5828ea9d723c5da71ebe9a0c;hpb=af6ca96e66a15b91b3bb276067ec0a33cc8d17e7;p=friendica.git

diff --git a/include/bbcode.php b/include/bbcode.php
index 749a7c5946..cad7ddc925 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -2,14 +2,15 @@
 
 use Friendica\App;
 use Friendica\Content\Smilies;
+use Friendica\Content\OEmbed;
+use Friendica\Core\Addon;
 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/plaintext.php';
 
@@ -33,76 +34,85 @@ 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) {
-
-	$data = get_attachment_data($Text);
+/**
+ * Processes [attachment] tags
+ *
+ * Note: Can produce a [bookmark] tag in the returned string
+ *
+ * @brief Processes [attachment] tags
+ * @param string $return
+ * @param bool|int $simplehtml
+ * @param bool $tryoembed
+ * @return string
+ */
+function bb_attachment($return, $simplehtml = false, $tryoembed = true)
+{
+	$data = get_attachment_data($return);
 	if (!$data) {
-		return $Text;
+		return $return;
 	}
 
 	if (isset($data["title"])) {
 		$data["title"] = strip_tags($data["title"]);
-		$data["title"] = str_replace(array("http://", "https://"), "", $data["title"]);
+		$data["title"] = str_replace(["http://", "https://"], "", $data["title"]);
 	}
 
-	if (((strpos($data["text"], "[img=") !== false)
-		|| (strpos($data["text"], "[img]") !== false)
-		|| Config::get('system', 'always_show_preview'))
-		&& ($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"] = "";
 	}
 
+	$return = '';
 	if ($simplehtml == 7) {
-		$text = style_url_for_mastodon($data["url"]);
+		$return = 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"]);
+		$return = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]);
 	} else {
-		if ($simplehtml != 4) {
-			$text = sprintf('<span class="type-%s">', $data["type"]);
-		} else {
-			$span_end = '';
-		}
-
-		$bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]);
-		if ($tryoembed) {
-			$oembed = tryoembed($bookmark);
-		} else {
-			$oembed = $bookmark[0];
-		}
+		try {
+			if ($tryoembed && OEmbed::isAllowedURL($data['url'])) {
+				$return = OEmbed::getHTML($data['url'], $data['title']);
+			} else {
+				throw new Exception('OEmbed is disabled for this attachment.');
+			}
+		} catch (Exception $e) {
+			if ($simplehtml != 4) {
+				$return = sprintf('<div class="type-%s">', $data["type"]);
+			}
 
-		if (strstr(strtolower($oembed), "<iframe ")) {
-			$text = $oembed;
-		} else {
-			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"] != "") && !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["image"] != "") {
+				$return .= 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"] != "") {
+				$return .= 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") && ($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"]);
+				$return .= 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;
+				$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
 			}
 
-			if (trim($data["description"]) != "") {
-				$text .= sprintf('<blockquote>%s</blockquote>', trim(bbcode($data["description"])));
+			if ($data["description"] != "" && $data["description"] != $data["title"]) {
+				$return .= sprintf('<blockquote>%s</blockquote>', trim(bbcode($data["description"])));
 			}
-		}
 
-		if ($simplehtml != 4) {
-			$text .= '</span>';
+			if ($data["type"] == "link") {
+				$return .= sprintf('<h5><a href="%s">%s</a></h5>', $data['url'], parse_url($data['url'], PHP_URL_HOST));
+			}
+
+			if ($simplehtml != 4) {
+				$return .= '</div>';
+			}
 		}
 	}
-	return trim($data["text"].' '.$text.' '.$data["after"]);
+
+	return trim($data["text"] . ' ' . $return . ' ' . $data["after"]);
 }
 
 function bb_remove_share_information($Text, $plaintext = false, $nolink = false) {
@@ -225,32 +235,6 @@ function stripcode_br_cb($s) {
 	return '[code]' . str_replace('<br />', '', $s[1]) . '[/code]';
 }
 
-function tryoembed($match) {
-	$url = $match[1];
-
-	// Always embed the SSL version
-	$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);
-
-	if (!is_object($o)) {
-		return $match[0];
-	}
-
-	if (isset($match[2])) {
-		$o->title = $match[2];
-	}
-
-	if ($o->type == "error") {
-		return $match[0];
-	}
-
-	$html = oembed_format_object($o);
-
-	return $html;
-}
-
 /*
  * [noparse][i]italic[/i][/noparse] turns into
  * [noparse][ i ]italic[ /i ][/noparse],
@@ -270,7 +254,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;
@@ -298,7 +281,7 @@ function bb_find_open_close($s, $open, $close, $occurence = 1) {
 		return false;
 	}
 
-	$res = array( 'start' => $start_pos, 'end' => $end_pos );
+	$res = [ 'start' => $start_pos, 'end' => $end_pos ];
 
 	return $res;
 }
@@ -334,16 +317,16 @@ function get_bb_tag_pos($s, $name, $occurence = 1) {
 		return false;
 	}
 
-	$res = array(
-		'start' => array(
+	$res = [
+		'start' => [
 			'open'  => $start_open,
 			'close' => $start_close
-		),
-		'end'   => array(
+		],
+		'end'   => [
 			'open'  => $end_open,
 			'close' => $end_open + strlen('[/' . $name . ']')
-		),
-	);
+		],
+	];
 
 	if ($start_equal !== false) {
 		$res['start']['equal'] = $start_equal + 1;
@@ -378,7 +361,7 @@ function bb_tag_preg_replace($pattern, $replace, $name, $s) {
 
 function bb_extract_images($body) {
 
-	$saved_image = array();
+	$saved_image = [];
 	$orig_body = $body;
 	$new_body = '';
 
@@ -416,7 +399,7 @@ function bb_extract_images($body) {
 
 	$new_body = $new_body . $orig_body;
 
-	return array('body' => $new_body, 'images' => $saved_image);
+	return ['body' => $new_body, 'images' => $saved_image];
 }
 
 function bb_replace_images($body, $images) {
@@ -435,60 +418,75 @@ function bb_replace_images($body, $images) {
 	return $newbody;
 }
 
-function bb_ShareAttributes($share, $simplehtml) {
+/**
+ * Processes [share] tags
+ *
+ * Note: Can produce a [bookmark] tag in the output
+ *
+ * @brief Processes [share] tags
+ * @param array    $share      preg_match_callback result array
+ * @param bool|int $simplehtml
+ * @return string
+ */
+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".
@@ -497,99 +495,116 @@ function bb_ShareAttributes($share, $simplehtml) {
 
 	$data = Contact::getDetailsByURL($profile);
 
-	if (isset($data["name"]) && ($data["name"] != "") && isset($data["addr"]) && ($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"]) && ($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"]) && ($data["name"] != ""))
+	if (x($data, "name")) {
 		$author = $data["name"];
+	}
 
-	if (isset($data["micro"]) && ($data["micro"] != ""))
+	if (x($data, "micro")) {
 		$avatar = $data["micro"];
+	}
 
 	$preshare = trim($share[1]);
-
-	if ($preshare != "")
-		$preshare .= "<br /><br />";
+	if ($preshare != "") {
+		$preshare .= "<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 />";
+			if (stripos(normalise_link($link), 'http://twitter.com/') === 0) {
+				$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 .= '<br /><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 .= '<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";
-
-			$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])
-					)
-				);
+			// Transforms quoted tweets in rich attachments to avoid nested tweets
+			if (stripos(normalise_link($link), 'http://twitter.com/') === 0 && OEmbed::isAllowedURL($link)) {
+				try {
+					$oembed = OEmbed::getHTML($link, $preshare);
+				} catch (Exception $e) {
+					$oembed = sprintf('[bookmark=%s]%s[/bookmark]', $link, $preshare);
+				}
+
+				$text = $preshare . $oembed;
+			} else {
+				$text = trim($share[1]) . "\n";
+
+				$avatar = proxy_url($avatar, false, PROXY_SIZE_THUMB);
+
+				$tpl = get_markup_template('shared_content.tpl');
+				$text .= replace_macros($tpl, [
+					'$profile' => $profile,
+					'$avatar' => $avatar,
+					'$author' => $author,
+					'$link' => $link,
+					'$posted' => $posted,
+					'$content' => trim($share[3])
+				]);
+			}
 			break;
 	}
 
@@ -738,7 +753,7 @@ function bb_RemovePictureLinks($match) {
 			$xpath = new DomXPath($doc);
 			$list = $xpath->query("//meta[@name]");
 			foreach ($list as $node) {
-				$attr = array();
+				$attr = [];
 
 				if ($node->attributes->length)
 					foreach ($node->attributes as $attribute)
@@ -795,7 +810,7 @@ function bb_CleanPictureLinksSub($match) {
 			$xpath = new DomXPath($doc);
 			$list = $xpath->query("//meta[@name]");
 			foreach ($list as $node) {
-				$attr = array();
+				$attr = [];
 
 				if ($node->attributes->length)
 					foreach ($node->attributes as $attribute)
@@ -849,10 +864,31 @@ function bb_highlight($match) {
  * @param bool $forplaintext
  * @return string
  */
-function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false) {
-
+function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false)
+{
 	$a = get_app();
 
+	/*
+	 * preg_match_callback function to replace potential Oembed tags with Oembed content
+	 *
+	 * $match[0] = [tag]$url[/tag] or [tag=$url]$title[/tag]
+	 * $match[1] = $url
+	 * $match[2] = $title or absent
+	 */
+	$tryoembed_callback = function ($match)
+	{
+		$url = $match[1];
+		$title = defaults($match, 2, null);
+
+		try {
+			$return = OEmbed::getHTML($url, $title);
+		} catch (Exception $ex) {
+			$return = $match[0];
+		}
+
+		return $return;
+	};
+
 	// Hide all [noparse] contained bbtags by spacefying them
 	// POSSIBLE BUG --> Will the 'preg' functions crash if there's an embedded image?
 
@@ -916,32 +952,48 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 
 	// removing multiplicated newlines
 	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]",
-				"[h1]", "[/h1]", "[h2]", "[/h2]", "[h3]", "[/h3]", "[h4]", "[/h4]", "[h5]", "[/h5]", "[h6]", "[/h6]");
+		$search = ["\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 = ["\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ", "[/attachment]",
+				"[h1]", "[/h1]", "[h2]", "[/h2]", "[h3]", "[/h3]", "[h4]", "[/h4]", "[h5]", "[/h5]", "[h6]", "[/h6]"];
 		do {
 			$oldtext = $Text;
 			$Text = str_replace($search, $replace, $Text);
 		} while ($oldtext != $Text);
 	}
 
+	// Set up the parameters for a URL search string
+	$URLSearchString = "^\[\]";
+	// Set up the parameters for a MAIL search string
+	$MAILSearchString = $URLSearchString;
+
+	// 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 (!$forplaintext) {
+		// Autolink feature (thanks to http://code.seebz.net/p/autolink-php/)
+		$autolink_regex = "`([^\]\=\"']|^)(https?\://[^\s<]+[^\s<\.\)])`ism";
+		$autolink_regex = "/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism";
+		$Text = preg_replace($autolink_regex, '$1[url]$2[/url]', $Text);
+		if ($simplehtml == 7) {
+			$Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'bb_style_url', $Text);
+			$Text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'bb_style_url', $Text);
+		}
+	} else {
+		$Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism", " $1 ", $Text);
+		$Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $Text);
+	}
+
+
 	// Handle attached links or videos
 	$Text = bb_attachment($Text, $simplehtml, $tryoembed);
 
-	$Text = str_replace(array("\r","\n"), array('<br />', '<br />'), $Text);
+	$Text = str_replace(["\r","\n"], ['<br />', '<br />'], $Text);
 
 	if ($preserve_nl) {
-		$Text = str_replace(array("\n", "\r"), array('', ''), $Text);
+		$Text = str_replace(["\n", "\r"], ['', ''], $Text);
 	}
 
-	// Set up the parameters for a URL search string
-	$URLSearchString = "^\[\]";
-	// Set up the parameters for a MAIL search string
-	$MAILSearchString = $URLSearchString;
-
 	// Remove all hashtag addresses
-	if ((!$tryoembed || $simplehtml) && !in_array($simplehtml, array(3, 7))) {
+	if ((!$tryoembed || $simplehtml) && !in_array($simplehtml, [3, 7])) {
 		$Text = preg_replace("/([#@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
 	} elseif ($simplehtml == 3) {
 		$Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
@@ -963,7 +1015,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	$Text = preg_replace("/#\[url\=[$URLSearchString]*\]\^\[\/url\]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i",
 				"[bookmark=$1]$2[/bookmark]", $Text);
 
-	if (in_array($simplehtml, array(2, 6, 7, 8, 9))) {
+	if (in_array($simplehtml, [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("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$Text);
@@ -975,7 +1027,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 
 	// Perform URL Search
 	if ($tryoembed) {
-		$Text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", 'tryoembed', $Text);
+		$Text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $tryoembed_callback, $Text);
 	}
 
 	if ($simplehtml == 5) {
@@ -992,25 +1044,8 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	$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) {
-			if ($simplehtml != 7) {
-				$Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="_blank">$2</a>', $Text);
-			} else {
-				$Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url]$2[/url]', $Text);
-
-				$Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'bb_style_url', $Text);
-				$Text = preg_replace_callback("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", 'bb_style_url', $Text);
-			}
-		} else {
-			$Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism", " $1 ", $Text);
-			$Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $Text);
-		}
-//	}
-
 	if ($tryoembed) {
-		$Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'tryoembed', $Text);
+	//	$Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", $tryoembed_callback, $Text);
 	}
 
 	$Text = preg_replace("/([#])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
@@ -1206,11 +1241,11 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 
 	// Try to Oembed
 	if ($tryoembed) {
-		$Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="$1">$1</a></video>', $Text);
+		$Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="' . $a->videowidth . '" height="' . $a->videoheight . '" loop="true"><a href="$1">$1</a></video>', $Text);
 		$Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
 
-		$Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text);
-		$Text = preg_replace_callback("/\[audio\](.*?)\[\/audio\]/ism", 'tryoembed', $Text);
+		$Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", $tryoembed_callback, $Text);
+		$Text = preg_replace_callback("/\[audio\](.*?)\[\/audio\]/ism", $tryoembed_callback, $Text);
 	} else {
 		$Text = preg_replace("/\[video\](.*?)\[\/video\]/",
 					'<a href="$1" target="_blank">$1</a>', $Text);
@@ -1229,9 +1264,9 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 
 	// Youtube extensions
 	if ($tryoembed) {
-		$Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);
-		$Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text);
-		$Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism", 'tryoembed', $Text);
+		$Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", $tryoembed_callback, $Text);
+		$Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", $tryoembed_callback, $Text);
+		$Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism", $tryoembed_callback, $Text);
 	}
 
 	$Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $Text);
@@ -1246,8 +1281,8 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	}
 
 	if ($tryoembed) {
-		$Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism", 'tryoembed', $Text);
-		$Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism", 'tryoembed', $Text);
+		$Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism", $tryoembed_callback, $Text);
+		$Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism", $tryoembed_callback, $Text);
 	}
 
 	$Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $Text);
@@ -1263,7 +1298,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);
@@ -1318,20 +1353,20 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	$Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text);
 
 	// sanitizes src attributes (http and redir URLs for displaying in a web page, cid used for inline images in emails)
-	static $allowed_src_protocols = array('http', 'redir', 'cid');
+	static $allowed_src_protocols = ['http', 'redir', 'cid'];
 	$Text = preg_replace('#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism',
-			     '<$1$2=""$4 class="invalid-src" title="' . t('Invalid source protocol') . '">', $Text);
+			     '<$1$2=""$4 data-original-src="$3" class="invalid-src" title="' . t('Invalid source protocol') . '">', $Text);
 
 	// sanitize href attributes (only whitelisted protocols URLs)
 	// default value for backward compatibility
-	$allowed_link_protocols = Config::get('system', 'allowed_link_protocols', array('ftp', 'mailto', 'gopher', 'cid'));
+	$allowed_link_protocols = Config::get('system', 'allowed_link_protocols', ['ftp', 'mailto', 'gopher', 'cid']);
 
 	// 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);
+	$Text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 data-original-href="$3" class="invalid-href" title="' . t('Invalid link protocol') . '">', $Text);
 
 	if ($saved_image) {
 		$Text = bb_replace_images($Text, $saved_image);
@@ -1351,7 +1386,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 		@$doc->loadHTML($encoding.$doctype."<html><body>".$Text."</body></html>");
 		$doc->encoding = 'UTF-8';
 		$Text = $doc->saveHTML();
-		$Text = str_replace(array("<html><body>", "</body></html>", $doctype, $encoding), array("", "", "", ""), $Text);
+		$Text = str_replace(["<html><body>", "</body></html>", $doctype, $encoding], ["", "", "", ""], $Text);
 
 		$Text = str_replace('<br></li>', '</li>', $Text);
 
@@ -1365,7 +1400,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
 	//$Text = str_replace('<br /><li>', '<li>', $Text);
 	//$Text = str_replace('<br /><ul', '<ul ', $Text);
 
-	call_hooks('bbcode', $Text);
+	Addon::callHooks('bbcode', $Text);
 
 	return trim($Text);
 }
@@ -1392,7 +1427,7 @@ function remove_abstract($text) {
  */
 function fetch_abstract($text, $addon = "") {
 	$abstract = "";
-	$abstracts = array();
+	$abstracts = [];
 	$addon = strtolower($addon);
 
 	if (preg_match_all("/\[abstract=(.*?)\](.*?)\[\/abstract\]/ism",$text, $results, PREG_SET_ORDER))