X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FText%2FBBCode.php;h=a8b5ec2025546e7ffa0e694597d2f38524ccd8b1;hb=5e2cbce9b6efce2baaed69b6aad1537a51bdae9d;hp=e304f47637eeaf1b0b2d9cb10a0734d35340685c;hpb=57695d48b41b5dba9a4ec1e97b531ff6590d8845;p=friendica.git

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index e304f47637..a8b5ec2025 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -11,9 +11,9 @@ use Exception;
 use Friendica\BaseObject;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Smilies;
-use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -37,13 +37,14 @@ class BBCode extends BaseObject
 	 *
 	 * @param string $body Message body
 	 * @return array
-	 * 'type' -> Message type ("link", "video", "photo")
-	 * 'text' -> Text before the shared message
-	 * 'after' -> Text after the shared message
-	 * 'image' -> Preview image of the message
-	 * 'url' -> Url to the attached message
-	 * 'title' -> Title of the attachment
-	 * 'description' -> Description of the attachment
+	 *                     'type' -> Message type ("link", "video", "photo")
+	 *                     'text' -> Text before the shared message
+	 *                     'after' -> Text after the shared message
+	 *                     'image' -> Preview image of the message
+	 *                     'url' -> Url to the attached message
+	 *                     'title' -> Title of the attachment
+	 *                     'description' -> Description of the attachment
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function getOldAttachmentData($body)
 	{
@@ -108,13 +109,14 @@ class BBCode extends BaseObject
 	 *
 	 * @param string $body Message body
 	 * @return array
-	 * 'type' -> Message type ("link", "video", "photo")
-	 * 'text' -> Text before the shared message
-	 * 'after' -> Text after the shared message
-	 * 'image' -> Preview image of the message
-	 * 'url' -> Url to the attached message
-	 * 'title' -> Title of the attachment
-	 * 'description' -> Description of the attachment
+	 *                     'type' -> Message type ("link", "video", "photo")
+	 *                     'text' -> Text before the shared message
+	 *                     'after' -> Text after the shared message
+	 *                     'image' -> Preview image of the message
+	 *                     'url' -> Url to the attached message
+	 *                     'title' -> Title of the attachment
+	 *                     'description' -> Description of the attachment
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getAttachmentData($body)
 	{
@@ -345,6 +347,7 @@ class BBCode extends BaseObject
 	/**
 	 * @brief Converts a BBCode text into plaintext
 	 *
+	 * @param      $text
 	 * @param bool $keep_urls Whether to keep URLs in the resulting plaintext
 	 *
 	 * @return string
@@ -446,6 +449,7 @@ class BBCode extends BaseObject
 	 * @brief Truncates imported message body string length to max_import_size
 	 * @param string $body
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function limitBodySize($body)
 	{
@@ -532,10 +536,11 @@ class BBCode extends BaseObject
 	 * Note: Can produce a [bookmark] tag in the returned string
 	 *
 	 * @brief Processes [attachment] tags
-	 * @param string $return
+	 * @param string   $return
 	 * @param bool|int $simplehtml
-	 * @param bool $tryoembed
+	 * @param bool     $tryoembed
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function convertAttachment($return, $simplehtml = false, $tryoembed = true)
 	{
@@ -626,7 +631,7 @@ class BBCode extends BaseObject
 			$data["title"] = $data["url"];
 		}
 
-		if (($data["text"] == "") && ($data["title"] != "") && ($data["url"] == "")) {
+		if (empty($data["text"]) && !empty($data["title"]) && empty($data["url"])) {
 			return $data["title"] . $data["after"];
 		}
 
@@ -777,10 +782,10 @@ class BBCode extends BaseObject
 	/**
 	 * Performs a preg_replace within the boundaries of all named BBCode tags in a text
 	 *
-	 * @param type $pattern Preg pattern string
-	 * @param type $replace Preg replace string
-	 * @param type $name    BBCode tag name
-	 * @param type $text    Text to search
+	 * @param string $pattern Preg pattern string
+	 * @param string $replace Preg replace string
+	 * @param string $name    BBCode tag name
+	 * @param string $text    Text to search
 	 * @return string
 	 */
 	public static function pregReplaceInTag($pattern, $replace, $name, $text)
@@ -930,6 +935,7 @@ class BBCode extends BaseObject
 	 * @param boolean $is_quote_share Whether there is content before the [share] block
 	 * @param integer $simplehtml     Mysterious integer value depending on the target network/formatting style
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function convertShareCallback(array $attributes, array $author_contact, $content, $is_quote_share, $simplehtml)
 	{
@@ -1142,8 +1148,9 @@ class BBCode extends BaseObject
 	 * @param int    $simple_html
 	 * @param bool   $for_plaintext
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function convert($text, $try_oembed = true, $simple_html = false, $for_plaintext = false)
+	public static function convert($text, $try_oembed = true, $simple_html = 0, $for_plaintext = false)
 	{
 		$a = self::getApp();
 
@@ -1171,7 +1178,7 @@ class BBCode extends BaseObject
 		// Extracting multi-line code blocks before the whitespace processing
 		$codeblocks = [];
 
-		$text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#is",
+		$text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#ism",
 			function ($matches) use (&$codeblocks) {
 				$return = $matches[0];
 				if (strpos($matches[2], "\n") !== false) {
@@ -1286,7 +1293,7 @@ class BBCode extends BaseObject
 				$text);
 		} elseif ($simple_html == 7) {
 			$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>',
+				'$1<span class="vcard"><a href="$2" class="url u-url mention" title="$3"><span class="fn nickname mention">$3</span></a></span>',
 				$text);
 		} elseif (!$simple_html) {
 			$text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
@@ -1354,6 +1361,12 @@ class BBCode extends BaseObject
 				. '</a>';
 		}, $text);
 
+		// We need no target="_blank" for local links
+		// convert links start with System::baseUrl() as local link without the target="_blank" attribute
+		$escapedBaseUrl = preg_quote(System::baseUrl(), '/');
+		$text = preg_replace("/\[url\](".$escapedBaseUrl."[$URLSearchString]*)\[\/url\]/ism", '<a href="$1">$1</a>', $text);
+		$text = preg_replace("/\[url\=(".$escapedBaseUrl."[$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1">$2</a>', $text);		
+
 		$text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$1</a>', $text);
 		$text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $text);
 
@@ -1676,7 +1689,7 @@ class BBCode extends BaseObject
 
 		// Replace non graphical smilies for external posts
 		if ($simple_html) {
-			$text = Smilies::replace($text, false, true);
+			$text = Smilies::replace($text);
 		}
 
 		// Unhide all [noparse] contained bbtags unspacefying them
@@ -1730,7 +1743,7 @@ class BBCode extends BaseObject
 
 		// 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.
+		// For performance reasons do it only with activated item cache or at export.
 		if (!$try_oembed || (get_itemcachepath() != "")) {
 			$doc = new DOMDocument();
 			$doc->preserveWhiteSpace = false;
@@ -1756,7 +1769,7 @@ class BBCode extends BaseObject
 		//$Text = str_replace('<br /><li>', '<li>', $Text);
 		//$Text = str_replace('<br /><ul', '<ul ', $Text);
 
-		Addon::callHooks('bbcode', $text);
+		Hook::callAll('bbcode', $text);
 
 		return trim($text);
 	}
@@ -1809,7 +1822,12 @@ class BBCode extends BaseObject
 	 * @brief Callback function to replace a Friendica style mention in a mention for Diaspora
 	 *
 	 * @param array $match Matching values for the callback
+	 *                     [1] = Mention type (! or @)
+	 *                     [2] = Name
+	 *                     [3] = Address
 	 * @return string Replaced mention
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function bbCodeMention2DiasporaCallback($match)
 	{
@@ -1823,7 +1841,7 @@ class BBCode extends BaseObject
 			return $match[0];
 		}
 
-		$mention = '@{' . $match[2] . '; ' . $contact['addr'] . '}';
+		$mention = $match[1] . '{' . $match[2] . '; ' . $contact['addr'] . '}';
 		return $mention;
 	}
 
@@ -1836,6 +1854,7 @@ class BBCode extends BaseObject
 	 * @param string $text
 	 * @param bool   $for_diaspora Diaspora requires more changes than Libertree
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function toMarkdown($text, $for_diaspora = true)
 	{
@@ -1908,13 +1927,13 @@ class BBCode extends BaseObject
 		if ($for_diaspora) {
 			$url_search_string = "^\[\]";
 			$text = preg_replace_callback(
-				"/([@]\[(.*?)\])\(([$url_search_string]*?)\)/ism",
+				"/([@!])\[(.*?)\]\(([$url_search_string]*?)\)/ism",
 				['self', 'bbCodeMention2DiasporaCallback'],
 				$text
 			);
 		}
 
-		Addon::callHooks('bb2diaspora', $text);
+		Hook::callAll('bb2diaspora', $text);
 
 		return $text;
 	}
@@ -1940,7 +1959,7 @@ class BBCode extends BaseObject
         $string = preg_replace('/#\[url\=([^\[\]]*)\](.*?)\[\/url\]/ism', '#$2', $string);
 
         // ignore anything in a code block
-        $string = preg_replace('/\[code\](.*?)\[\/code\]/sm', '', $string);
+        $string = preg_replace('/\[code.*?\].*?\[\/code\]/sm', '', $string);
 
         // Force line feeds at bbtags
         $string = str_replace(['[', ']'], ["\n[", "]\n"], $string);