diff options
| author | Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net> | 2012-06-23 23:51:08 +0300 |
|---|---|---|
| committer | Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net> | 2012-06-23 23:51:08 +0300 |
| commit | 00668aaa71336f48b141c443749a66c58a555503 (patch) | |
| tree | bd8a9d029ddaebbd1d8385dfd522f689e5d3891c /mod | |
| parent | 5e3e3915e347e4c298498ce0a8c493b9cd03201b (diff) | |
| parent | 381d0912672cda6575368d242565310a93e202d4 (diff) | |
| download | volse-hubzilla-00668aaa71336f48b141c443749a66c58a555503.tar.gz volse-hubzilla-00668aaa71336f48b141c443749a66c58a555503.tar.bz2 volse-hubzilla-00668aaa71336f48b141c443749a66c58a555503.zip | |
Merge git://github.com/friendica/friendica
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_request.php | 2 | ||||
| -rwxr-xr-x | mod/like.php | 3 | ||||
| -rw-r--r-- | mod/share.php | 27 |
3 files changed, 15 insertions, 17 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 3c76034c3..cec2d7f8b 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -170,7 +170,7 @@ function dfrn_request_post(&$a) { info( t("Introduction complete.") . EOL); } - $r = q("select id from contact where uid = %d and url = '%s' and `site-pubkey` = '%s limit 1", + $r = q("select id from contact where uid = %d and url = '%s' and `site-pubkey` = '%s' limit 1", intval(local_user()), dbesc($dfrn_url), $parms['key'] // this was already escaped diff --git a/mod/like.php b/mod/like.php index 942a04fe7..642e948fd 100755 --- a/mod/like.php +++ b/mod/like.php @@ -37,7 +37,7 @@ function like_content(&$a) { logger('like: verb ' . $verb . ' item ' . $item_id); - $r = q("SELECT * FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s') AND `id` = `parent` LIMIT 1", + $r = q("SELECT * FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1", dbesc($item_id), dbesc($item_id) ); @@ -217,6 +217,7 @@ EOT; $arr['gravity'] = GRAVITY_LIKE; $arr['parent'] = $item['id']; $arr['parent-uri'] = $item['uri']; + $arr['thr-parent'] = $item['uri']; $arr['owner-name'] = $remote_owner['name']; $arr['owner-link'] = $remote_owner['url']; $arr['owner-avatar'] = $remote_owner['thumb']; diff --git a/mod/share.php b/mod/share.php index 6c6098c83..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 * FROM `item` WHERE `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']) + 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 .= '♲ <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 .= "\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(); } |