diff options
| -rwxr-xr-x | include/items.php | 32 | ||||
| -rwxr-xr-x | mod/subthread.php | 170 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 |
4 files changed, 155 insertions, 53 deletions
diff --git a/include/items.php b/include/items.php index 487666e36..bbb90f742 100755 --- a/include/items.php +++ b/include/items.php @@ -9,13 +9,6 @@ require_once('include/permissions.php'); function collect_recipients($item,&$private) { -// FIXME - this needs a revision to handle public scope (this site, this network, etc.) -// We'll be changing this to return an array of -// - recipients -// - private -// - scope if message is public ('global', 'network: red', 'site: $sitename', 'connections') -// The receiving site will need to check the scope before creating a list of local recipients - require_once('include/group.php'); $private = ((intval($item['item_private'])) ? true : false); @@ -113,6 +106,7 @@ function collect_recipients($item,&$private) { * If it is, you should be able to use perm_is_allowed( ... 'post_comments'), and if it isn't you need to call * can_comment_on_post() */ + function can_comment_on_post($observer_xchan,$item) { // logger('can_comment_on_post: comment_policy: ' . $item['comment_policy'], LOGGER_DEBUG); @@ -153,6 +147,21 @@ function can_comment_on_post($observer_xchan,$item) { return false; } +/** + * @function add_source_route($iid,$hash) + * Adds $hash to the item source route specified by $iid + * @param integer $iid + * item['id'] of target item + * @param string $hash + * xchan_hash of the channel that sent the item + * Modifies item pointed to by $iid + * + * $item['route'] contains a comma-separated list of xchans that sent the current message, + * somewhat analogous to the * Received: header line in email. We can use this to perform + * loop detection and to avoid sending a particular item to any "upstream" sender (they + * already have a copy because they sent it to us). + * + */ function add_source_route($iid,$hash) { // logger('add_source_route ' . $iid . ' ' . $hash, LOGGER_DEBUG); @@ -352,6 +361,10 @@ function post_activity_item($arr) { } +/** + * @function get_public_feed($channel,$params) + * generate an Atom feed + */ function get_public_feed($channel,$params) { @@ -388,6 +401,9 @@ function get_public_feed($channel,$params) { return get_feed_for($channel,get_observer_hash(),$params); } + + + function get_feed_for($channel, $observer_hash, $params) { if(! channel) @@ -2100,7 +2116,7 @@ function item_store_update($arr,$allow_exec = false) { // $arr['item_flags'] = ((x($arr,'item_flags')) ? intval($arr['item_flags']) : $orig[0]['item_flags'] ); $arr['sig'] = ((x($arr,'sig')) ? $arr['sig'] : ''); - $arr['layout_mid'] = ((x($arr,'layout_mid')) ? dbesc($arr['layout_mid']) : $orig[0]['layout_mid'] ); + $arr['layout_mid'] = ((array_key_exists('layout_mid',$arr)) ? dbesc($arr['layout_mid']) : $orig[0]['layout_mid'] ); call_hooks('post_remote_update',$arr); diff --git a/mod/subthread.php b/mod/subthread.php index a9d18621c..5ef0615b1 100755 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -20,7 +20,7 @@ function subthread_content(&$a) { dbesc($item_id) ); - if(! $item_id || (! count($r))) { + if((! $item_id) || (! $r)) { logger('subthread: no item ' . $item_id); return; } @@ -34,60 +34,146 @@ function subthread_content(&$a) { if(! perm_is_allowed($owner_uid,$ob_hash,'post_comments')) return; + $sys = get_sys_channel(); - $remote_owner = null; + $owner_uid = $item['uid']; + $owner_aid = $item['aid']; - if(! ($item['item_flags'] & ITEM_WALL)) { - // The top level post may have been written by somebody on another system - $r = q("SELECT * FROM abook WHERE abook_xchan = '%s' AND uid = %d LIMIT 1", - intval($item['author_xchan']), - intval($item['uid']) - ); - if(! $r) - return; - if(! ($r[0]['abook_flags'] & ABOOK_FLAG_SELF)) - $remote_owner = $r[0]; + // if this is a "discover" item, (item['uid'] is the sys channel), + // fallback to the item comment policy, which should've been + // respected when generating the conversation thread. + // Even if the activity is rejected by the item owner, it should still get attached + // to the local discover conversation on this site. + + if(($owner_uid != $sys['channel_id']) && (! perm_is_allowed($owner_uid,$observer['xchan_hash'],'post_comments'))) { + notice( t('Permission denied') . EOL); + killme(); } - // this represents the post owner on this system. + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['owner_xchan']) + ); + if($r) + $thread_owner = $r[0]; + else + killme(); - $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` - WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1", - intval($owner_uid) + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['author_xchan']) ); - if(count($r)) - $owner = $r[0]; + if($r) + $item_author = $r[0]; + else + killme(); + + + $mid = item_message_id(); + + $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status')); + + $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink'])); + $objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); + + $body = $item['body']; + + $obj = json_encode(array( + 'type' => $objtype, + 'id' => $item['mid'], + 'parent' => (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']), + 'link' => $links, + 'title' => $item['title'], + 'content' => $item['body'], + 'created' => $item['created'], + 'edited' => $item['edited'], + 'author' => array( + 'name' => $item_author['xchan_name'], + 'address' => $item_author['xchan_addr'], + 'guid' => $item_author['xchan_guid'], + 'guid_sig' => $item_author['xchan_guid_sig'], + 'link' => array( + array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item_author['xchan_url']), + array('rel' => 'photo', 'type' => $item_author['xchan_photo_mimetype'], 'href' => $item_author['xchan_photo_m'])), + ), + )); + + if(! ($item['item_flags'] & ITEM_THREAD_TOP)) + $post_type = 'comment'; + + + $bodyverb = t('%1$s is following %2$s\'s %3$s'); + + $item_flags = ITEM_ORIGIN | ITEM_NOTSHOWN; + if($item['item_flags'] & ITEM_WALL) + $item_flags |= ITEM_WALL; + + + $arr = array(); + + $arr['mid'] = $mid; + $arr['aid'] = $owner_aid; + $arr['uid'] = $owner_uid; + $arr['item_flags'] = $item_flags; + $arr['parent'] = $item['id']; + $arr['parent_mid'] = $item['mid']; + $arr['thr_parent'] = $item['mid']; + $arr['owner_xchan'] = $thread_owner['xchan_hash']; + $arr['author_xchan'] = $observer['xchan_hash']; + + + $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]'; + $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; + $plink = '[zrl=' . $a->get_baseurl() . '/display/' . $item['mid'] . ']' . $post_type . '[/zrl]'; + + $arr['body'] = sprintf( $bodyverb, $alink, $ulink, $plink ); + + $arr['verb'] = $activity; + $arr['obj_type'] = $objtype; + $arr['object'] = $obj; + + $arr['allow_cid'] = $item['allow_cid']; + $arr['allow_gid'] = $item['allow_gid']; + $arr['deny_cid'] = $item['deny_cid']; + $arr['deny_gid'] = $item['deny_gid']; + + + $post = item_store($arr); + $post_id = $post['item_id']; + + $arr['id'] = $post_id; + + call_hooks('post_local_end', $arr); + + killme(); + + + + + + + + + + + + + + + + + + + + - if(! $owner) { - logger('like: no owner'); - return; - } - if(! $remote_owner) - $remote_owner = $owner; - // This represents the person posting - if((local_user()) && (local_user() == $owner_uid)) { - $contact = $owner; - } - else { - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($_SESSION['visitor_id']), - intval($owner_uid) - ); - if(count($r)) - $contact = $r[0]; - } - if(! $contact) { - return; - } - $mid = item_message_id(); $post_type = (($item['resource_id']) ? t('photo') : t('status')); $objtype = (($item['resource_id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); + $link = xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ; $body = $item['body']; @@ -102,10 +188,6 @@ function subthread_content(&$a) { <content>$body</content> </object> EOT; - $bodyverb = t('%1$s is following %2$s\'s %3$s'); - - if(! isset($bodyverb)) - return; $arr = array(); diff --git a/version.inc b/version.inc index 8b6f8c940..526e91957 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-04-21.652 +2014-04-23.654 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1bd3eb137..7e4923e7c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1919,6 +1919,10 @@ img.mail-list-sender-photo { border-bottom: 1px solid $item_bordercolour; } +.wall-item-content-wrapper:hover{ + z-index:99; +} + .wall-item-comment-wrapper { margin-top: 10px; border-left: 2px solid $item_bordercolour; |