diff options
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 44 |
1 files changed, 35 insertions, 9 deletions
diff --git a/mod/network.php b/mod/network.php index 3c8125303..145caa173 100644 --- a/mod/network.php +++ b/mod/network.php @@ -14,6 +14,9 @@ function network_init(&$a) { $a->page['aside'] = ''; $search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : ''); + + // We need a better way of managing a growing argument list + $srchurl = '/network' . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') @@ -44,8 +47,9 @@ function network_init(&$a) { $a->page['aside'] .= '<div id="network-view-link">'; - if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search')) + if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search')) { $a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('View Conversations') . '</a></div>'; + } else { $a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . $a->cmd . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' . t('View New Items') . '</a></div>'; @@ -65,6 +69,14 @@ function network_init(&$a) { . '<span class="network-star icon starred"></span>' . '<div class="clear"></div></div>'; + if(! $_GET['bmark']) + $a->page['aside'] .= '<div id="network-bmark-link">' + . '<a class="network-bmark" href="' . $a->get_baseurl() . '/' . $a->cmd + . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1" >' + . t('View Bookmarks') . '</a>' + . '<div class="clear"></div></div>'; + + } $a->page['aside'] .= '</div>'; @@ -299,21 +311,29 @@ function network_content(&$a, $update = 0) { else { // Normal conversation view + // Show conversation by activity date + + // First fetch a known number of parent items $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + , (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` + FROM `item` AS `_com` + WHERE `_com`.`uid`=%d AND + (`_com`.`parent`!=`_com`.`id` OR `_com`.`id` NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`)) + GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` + WHERE `item`.`id`=`com`.`parent` AND + `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` = `item`.`id` + $sql_extra - ORDER BY `item`.`created` DESC LIMIT %d ,%d ", + ORDER BY `com`.`created` DESC LIMIT %d ,%d ", + intval(local_user()), intval(local_user()), intval($a->pager['start']), intval($a->pager['itemspage']) ); - - // Then fetch all the children of the parents that are on this page $parents_arr = array(); @@ -328,13 +348,19 @@ function network_content(&$a, $update = 0) { `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact` + FROM `item`, `contact`, + (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` + FROM `item` AS `_com` + WHERE `_com`.`uid`=%d AND + (`_com`.`parent`!=`_com`.`id` OR `_com`.`id` NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`)) + GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s ) + AND `item`.`parent` = `com`.`parent` AND `item`.`parent` IN ( %s ) $sql_extra - ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + ORDER BY `com`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + intval(local_user()), intval(local_user()), dbesc($parents_str) ); |