From 181a17bd0575874da23497f913c5fc4bdb0f1e54 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 22 Jun 2012 15:27:06 -0700 Subject: share RSS items --- mod/share.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod/share.php') diff --git a/mod/share.php b/mod/share.php index 6c6098c83..c7525113e 100644 --- a/mod/share.php +++ b/mod/share.php @@ -8,10 +8,10 @@ function share_init(&$a) { if((! $post_id) || (! local_user())) killme(); - $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", + $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) ); - if(! count($r) || $r[0]['private']) + if(! count($r) || ($r[0]['private'] && ($r[0]['network'] != NETWORK_FEED))) killme(); $o = ''; -- cgit v1.2.3 From bf47bf5ba015a844919362a56903eb82c064bee9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 23 Jun 2012 03:25:11 -0700 Subject: cleanup mod/share --- mod/share.php | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'mod/share.php') diff --git a/mod/share.php b/mod/share.php index c7525113e..08c63105e 100644 --- a/mod/share.php +++ b/mod/share.php @@ -8,26 +8,23 @@ 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))) killme(); $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 .= '♲ ' . $r[0]['author-name'] . '
'; -// if($r[0]['title']) -// $o .= '' . $r[0]['title'] . '
'; -// $o .= $r[0]['body'] . "\n"; -// } + $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"; + echo $o; killme(); } -- cgit v1.2.3