Merge pull request #8787 from MrPetovan/task/move-share-header

Replace share_header calls with BBCode::getShareOpeningTag

include/api.php

@@ -2043,7 +2043,7 @@ function api_statuses_repeat($type)
 			$pos = strpos($item['body'], "[share");
 			$post = substr($item['body'], $pos);
 		} else {
-			$post = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
+			$post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
 
 			if (!empty($item['title'])) {
 				$post .= '[h3]' . $item['title'] . "[/h3]\n";

mod/share.php

@@ -20,6 +20,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
@@ -42,7 +43,7 @@ function share_init(App $a) {
 		$pos = strpos($item['body'], "[share");
 		$o = substr($item['body'], $pos);
 	} else {
-		$o = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
+		$o = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
 
 		if ($item['title']) {
 			$o .= '[h3]'.$item['title'].'[/h3]'."\n";
@@ -55,22 +56,3 @@ function share_init(App $a) {
 	echo $o;
 	exit();
 }
-
-/// @TODO Rewrite to handle over whole record array
-function share_header($author, $profile, $avatar, $guid, $posted, $link) {
-	$header = "[share author='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $author).
-		"' profile='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $profile).
-		"' avatar='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $avatar);
-
-	if ($guid) {
-		$header .= "' guid='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $guid);
-	}
-
-	if ($posted) {
-		$header .= "' posted='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $posted);
-	}
-
-	$header .= "' link='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $link)."']";
-
-	return $header;
-}

src/Content/Text/BBCode.php

@@ -2223,4 +2223,33 @@ class BBCode
 
 		return $body;
 	}
+
+	/**
+	 * @param $author
+	 * @param $profile
+	 * @param $avatar
+	 * @param $guid
+	 * @param $posted
+	 * @param $link
+	 * @return string
+	 * @TODO Rewrite to handle over whole record array
+	 */
+	public static function getShareOpeningTag($author, $profile, $avatar, $guid, $posted, $link)
+	{
+		$header = "[share author='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $author).
+			"' profile='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $profile).
+			"' avatar='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $avatar);
+
+		if ($guid) {
+			$header .= "' guid='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $guid);
+		}
+
+		if ($posted) {
+			$header .= "' posted='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $posted);
+		}
+
+		$header .= "' link='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $link)."']";
+
+		return $header;
+	}
 }

src/Protocol/ActivityPub/Transmitter.php

@@ -863,7 +863,7 @@ class Transmitter
 				$type = 'Announce';
 
 				// Disguise forum posts as reshares. Will later be converted to a real announce
-				$item['body'] = share_header($item['author-name'], $item['author-link'], $item['author-avatar'],
+				$item['body'] = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
 					$item['guid'], $item['created'], $item['plink']) . $item['body'] . '[/share]';
 			}
 		}

src/Protocol/Diaspora.php

@@ -2795,7 +2795,7 @@ class Diaspora
 
 		/// @todo Copy tag data from original post
 
-		$prefix = share_header(
+		$prefix = BBCode::getShareOpeningTag(
 			$original_item["author-name"],
 			$original_item["author-link"],
 			$original_item["author-avatar"],
@@ -3676,7 +3676,7 @@ class Diaspora
 
 			if ($item['author-link'] != $item['owner-link']) {
 				require_once 'mod/share.php';
-				$body = share_header($item['author-name'], $item['author-link'], $item['author-avatar'],
+				$body = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
 					"", $item['created'], $item['plink']) . $body . '[/share]';
 			}