X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fshare.php;h=8358f67169ab84e88b37196e9d047d65570b2685;hb=ed6ca1d3845070decc732ce5df266b49b448b940;hp=c7525113ec1959f543f1c0090790a9648a310b16;hpb=4e7eb36dd1e65bf481ffe30614565674cbef4fe5;p=friendica.git

diff --git a/mod/share.php b/mod/share.php
index c7525113ec..8358f67169 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('bbcode.php');
+require_once('include/bbcode.php');
 
 function share_init(&$a) {
 
@@ -8,26 +8,41 @@ function share_init(&$a) {
 	if((! $post_id) || (! local_user()))
 		killme();
 
-	$r = q("SELECT item.*, contact.network FROM `item` left join contact on `item`.`contact-id` = `contact`.`id` WHERE `item`.`id` = %d LIMIT 1",
-		intval($post_id)
+	$r = q("SELECT item.*, contact.network FROM `item` 
+		left 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'] && ($r[0]['network'] != NETWORK_FEED)))
+	if(! count($r) || ($r[0]['private'] == 1))
 		killme();
 
-	$o = '';
+	if (intval(get_config('system','new_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'].
+				"' posted='".$r[0]['created']."']\n";
+			if($r[0]['title'])
+				$o .= '[b]'.$r[0]['title'].'[/b]'."\n";
+			$o .= $r[0]['body'];
+			$o.= "[/share]";
+		}
+	} else {
+		$o = '';
 
-//	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) {
 		$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";
-//	}
-//	else {
-//		$o .= '&#x2672; <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />';
-//		if($r[0]['title'])
-//			$o .= '<strong>' . $r[0]['title'] . '</strong><br />';
-//		$o .= $r[0]['body'] . "\n";
-//	}
+		$o .= $r[0]['body'] . "\n" ;
+
+		$o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : '');
+	}
 	echo $o;
-	killme();  
+	killme();
 }