X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fshare.php;h=74de1967b44782542d7c081a654d59c90e159593;hb=5a802bc474abca945240f6a9a2730213e88b30af;hp=928ccdef263efc45b7f24f66c6c8c123f945888a;hpb=5eaa5951a1b19b985017b5db20f3b1abf464a1ef;p=friendica.git

diff --git a/mod/share.php b/mod/share.php
index 928ccdef26..74de1967b4 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,58 +1,57 @@
 <?php
-function share_init(App $a) {
 
+use Friendica\App;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
+
+function share_init(App $a) {
 	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
-	if((! $post_id) || (! local_user()))
+
+	if (!$post_id || !local_user()) {
 		killme();
+	}
 
-	$r = q("SELECT item.*, contact.network FROM `item`
-		inner join contact on `item`.`contact-id` = `contact`.`id`
-		WHERE `item`.`id` = %d AND `item`.`uid` = %d LIMIT 1",
+	$fields = ['private', 'body', 'author-name', 'author-link', 'author-avatar',
+		'guid', 'created', 'plink', 'title'];
+	$item = Item::selectFirst($fields, ['id' => $post_id]);
 
-		intval($post_id),
-		intval(local_user())
-	);
-	if(! dbm::is_result($r) || ($r[0]['private'] == 1))
+	if (!DBA::isResult($item) || $item['private'] == 1) {
 		killme();
+	}
 
-	if (!intval(get_config('system','old_share'))) {
-		if (strpos($r[0]['body'], "[/share]") !== false) {
-			$pos = strpos($r[0]['body'], "[share");
-			$o = substr($r[0]['body'], $pos);
-		} else {
-			$o = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
-
-			if($r[0]['title'])
-				$o .= '[b]'.$r[0]['title'].'[/b]'."\n";
-			$o .= $r[0]['body'];
-			$o.= "[/share]";
-		}
+	if (strpos($item['body'], "[/share]") !== false) {
+		$pos = strpos($item['body'], "[share");
+		$o = substr($item['body'], $pos);
 	} else {
-		$o = '';
+		$o = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
 
-		$o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n";
-		if($r[0]['title'])
-			$o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
-		$o .= $r[0]['body'] . "\n" ;
+		if ($item['title']) {
+			$o .= '[b]'.$item['title'].'[/b]'."\n";
+		}
 
-		$o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : '');
+		$o .= $item['body'];
+		$o .= "[/share]";
 	}
+
 	echo $o;
 	killme();
 }
 
+/// @TODO Rewrite to handle over whole record array
 function share_header($author, $profile, $avatar, $guid, $posted, $link) {
-	$header = "[share author='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$author).
-		"' profile='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$profile).
-		"' avatar='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$avatar);
+	$header = "[share author='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $author).
+		"' profile='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $profile).
+		"' avatar='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $avatar);
 
-	if ($guid)
-		$header .= "' guid='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$guid);
+	if ($guid) {
+		$header .= "' guid='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $guid);
+	}
 
-	if ($posted)
-		$header .= "' posted='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$posted);
+	if ($posted) {
+		$header .= "' posted='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $posted);
+	}
 
-	$header .= "' link='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$link)."']";
+	$header .= "' link='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $link)."']";
 
 	return $header;
 }