X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fshare.php;h=f2e016708fef321a74937e3c8c9be93e5ba87401;hb=c99247ddabe7e8383aa86f94d4ffae73e382a710;hp=516ff98e73cd0bd7cbc76f496e2cc13985688ebd;hpb=f962ecdd6483679879d7608a47dbf8549a431a8f;p=friendica.git

diff --git a/mod/share.php b/mod/share.php
index 516ff98e73..f2e016708f 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,32 +1,27 @@
 <?php
-
-require_once('include/bbcode.php');
-
-function share_init(&$a) {
+function share_init(App &$a) {
 
 	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 	if((! $post_id) || (! local_user()))
 		killme();
 
 	$r = q("SELECT item.*, contact.network FROM `item` 
-		left join contact on `item`.`contact-id` = `contact`.`id` 
+		inner join contact on `item`.`contact-id` = `contact`.`id` 
 		WHERE `item`.`id` = %d AND `item`.`uid` = %d LIMIT 1",
 
 		intval($post_id),
 		intval(local_user())
 	);
-	if(! count($r) || ($r[0]['private'] == 1))
+	if(! dbm::is_result($r) || ($r[0]['private'] == 1))
 		killme();
 
-	if (intval(get_config('system','new_share'))) {
+	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 author='".str_replace("'", "&#039;",$r[0]['author-name']).
-				"' profile='".$r[0]['author-link'].
-				"' avatar='".$r[0]['author-avatar'].
-				"' link='".$r[0]['plink']."']\n";
+			$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'];
@@ -45,3 +40,19 @@ function share_init(&$a) {
 	echo $o;
 	killme();
 }
+
+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);
+
+	if ($guid)
+		$header .= "' guid='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$guid);
+
+	if ($posted)
+		$header .= "' posted='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$posted);
+
+	$header .= "' link='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$link)."']";
+
+	return $header;
+}