sorting through key issue

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 7d2f48d0c5544915c969c084e68aa7ef178f0f9a..5faeee453b3947ee1412d4d6ff5da45b69ce60fa 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -20,6 +20,7 @@ function network_init(&$a) {
        $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')) {
@@ -127,9 +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);
-       $bmark = ((x($_GET['bmark'])) ? intval($_GET['bmark']) : 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;
@@ -190,6 +193,7 @@ 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";
 
@@ -311,24 +315,22 @@ function network_content(&$a, $update = 0) {
        else {
 
                // Normal conversation view
-               // Show conversation by activity date
-               
-               
-               // 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`
-                       , (SELECT `_com`.`parent`,max(`_com`.`created`) as `created`
-                               FROM `item` AS `_com` 
-                               WHERE `_com`.`uid`=%d AND `_com`.`parent`!=`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
+                       WHERE `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 `com`.`created` DESC LIMIT %d ,%d ",
-                       intval(local_user()),
+                       ORDER BY `item`.$ordering DESC LIMIT %d ,%d ",
                        intval(local_user()),
                        intval($a->pager['start']),
                        intval($a->pager['itemspage'])
@@ -344,26 +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`, `contact`,
-                                       (SELECT `_com`.`parent`,max(`_com`.`created`) as `created`
-                                       FROM `item` AS `_com` 
-                                       WHERE `_com`.`uid`=%d AND `_com`.`parent`!=`id` 
-                                       GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` 
+                               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` = `com`.`parent` AND `item`.`parent` IN ( %s )
+                               AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
                                $sql_extra
-                               ORDER BY `com`.`created`  DESC, `item`.`gravity` ASC, `item`.`created` ASC ",
-                               intval(local_user()),
+                               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