sorting through key issue

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 663814ab7816da3af05e83ec8ac768b24445301e..5faeee453b3947ee1412d4d6ff5da45b69ce60fa 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -14,7 +14,14 @@ function network_init(&$a) {
                $a->page['aside'] = '';
 
        $search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
-       $srchurl = '/network' . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '');
+
+       // 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'] : '')
+               . ((x($_GET,'order')) ? '?order=' . $_GET['order'] : '')
+               . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '');
 
        if(x($_GET,'save')) {
                $r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1",
@@ -41,8 +48,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>';
 
@@ -62,6 +70,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>';
@@ -112,8 +128,11 @@ function network_content(&$a, $update = 0) {
        $nouveau = false;
        require_once('include/acl_selectors.php');
 
-       $cid = ((x($_GET['cid'])) ? intval($_GET['cid']) : 0);
-       $star = ((x($_GET['star'])) ? intval($_GET['star']) : 0);
+       $cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0);
+       $star = ((x($_GET,'star')) ? intval($_GET['star']) : 0);
+       $bmark = ((x($_GET,'bmark')) ? intval($_GET['bmark']) : 0);
+       $order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment');
+
 
        if(($a->argc > 2) && $a->argv[2] === 'new')
                $nouveau = true;
@@ -174,6 +193,8 @@ function network_content(&$a, $update = 0) {
                                . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '')
                                . ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') 
                                . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') 
+                               . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : '') 
+                               . ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '') 
                                . "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 
        }
@@ -195,6 +216,9 @@ function network_content(&$a, $update = 0) {
 
        $star_sql = (($star) ?  " AND `starred` = 1 " : '');
 
+       if($bmark)
+               $star_sql .= " AND `bookmark` = 1 ";
+
        $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql ) ";
 
        if($group) {
@@ -291,7 +315,14 @@ function network_content(&$a, $update = 0) {
        else {
 
                // Normal conversation view
-               // First fetch a known number of parent items
+
+
+               if($order === 'post')
+                               $ordering = "`created`";
+               else
+                               $ordering = "`commented`";
+
+               // Fetch a page full of parent items for this page
 
                $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
                        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -299,13 +330,12 @@ function network_content(&$a, $update = 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 `item`.$ordering DESC LIMIT %d ,%d ",
                        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();
@@ -316,21 +346,21 @@ function network_content(&$a, $update = 0) {
                                $parents_arr[] = $rr['item_id'];
                        $parents_str = implode(', ', $parents_arr);
 
-                       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+                       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                                `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`, (SELECT `p`.`id`,`p`.`created`,`p`.`commented` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact`
                                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 )
                                $sql_extra
-                               ORDER BY `parentitem`.`created`  DESC, `item`.`gravity` ASC, `item`.`created` ASC ",
+                               ORDER BY `parentitem`.$ordering DESC, `item`.`gravity` ASC, `item`.`created` ASC ",
                                intval(local_user()),
                                dbesc($parents_str)
                        );
-               }
+               }       
        }
 
        // Set this so that the conversation function can find out contact info for our wall-wall items