X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fshare.php;h=085da4e30d8a8b6f15e343a480d6743f733def15;hb=4680d105594e83f283726317571a91ab33137473;hp=4ec27d6bf4e2bc7322dceb3c136bbda2bf33f4df;hpb=6621de63d99b65cc748992f84f8145a93adcce57;p=friendica.git

diff --git a/mod/share.php b/mod/share.php
index 4ec27d6bf4..085da4e30d 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,7 +1,4 @@
 <?php
-
-require_once('bbcode.php');
-
 function share_init(&$a) {
 
 	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
@@ -9,7 +6,7 @@ function share_init(&$a) {
 		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),
@@ -18,16 +15,44 @@ function share_init(&$a) {
 	if(! count($r) || ($r[0]['private'] == 1))
 		killme();
 
-	$o = '';
-
-	$o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n";
-	if($r[0]['title'])
-		$o .= '[b]' . ' [url=' . $r[0]['plink'] . ']' . $r[0]['title'] . '[/url]' . '[/b]' . "\n";
-        else
-                $o .= '[b]' . ' [url=' . $r[0]['plink'] . ']' . 'View Source' . '[/url]' . '[/b]' . "\n";
-	$o .= $r[0]['body'] . "\n";
-        
-        echo $o;
-
-	killme();  
-}
\ No newline at end of file
+	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]";
+		}
+	} else {
+		$o = '';
+
+		$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" ;
+
+		$o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : '');
+	}
+	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;
+}