From 4f24494b0baca1d991cbc74bf3929631c657b676 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 12 Sep 2011 19:42:10 -0700 Subject: Dreamhost's unreliable process model is really getting irritating --- mod/network.php | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'mod/network.php') diff --git a/mod/network.php b/mod/network.php index 6684889e3..072b20b92 100644 --- a/mod/network.php +++ b/mod/network.php @@ -313,6 +313,23 @@ function network_content(&$a, $update = 0) { // Normal conversation view // Show conversation by activity date +/* created date order +$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 +AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 +AND `item`.`parent` = `item`.`id` +$sql_extra +ORDER BY `item`.`created` DESC LIMIT %d ,%d ", +intval(local_user()), +intval($a->pager['start']), +intval($a->pager['itemspage']) +); +*/ + + + + // First fetch a known number of parent items @@ -344,6 +361,24 @@ function network_content(&$a, $update = 0) { $parents_arr[] = $rr['item_id']; $parents_str = implode(', ', $parents_arr); +/* created order +$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` +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 ", +intval(local_user()), +dbesc($parents_str) +*/ + + + $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`, @@ -364,6 +399,9 @@ function network_content(&$a, $update = 0) { intval(local_user()), dbesc($parents_str) ); + + + } } -- cgit v1.2.3 From 21d35e52dd4a83635127e1a68f6a478cf3289b1b Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 13 Sep 2011 05:13:01 -0700 Subject: provide option for viewing by parent created order --- mod/network.php | 152 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 76 insertions(+), 76 deletions(-) (limited to 'mod/network.php') diff --git a/mod/network.php b/mod/network.php index 072b20b92..ef97fb895 100644 --- a/mod/network.php +++ b/mod/network.php @@ -131,6 +131,8 @@ function network_content(&$a, $update = 0) { $star = ((x($_GET['star'])) ? intval($_GET['star']) : 0); $bmark = ((x($_GET['bmark'])) ? intval($_GET['bmark']) : 0); + $order = 'comment'; + if(($a->argc > 2) && $a->argv[2] === 'new') $nouveau = true; @@ -312,96 +314,94 @@ function network_content(&$a, $update = 0) { // Normal conversation view // Show conversation by activity date - -/* created date order -$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 -AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 -AND `item`.`parent` = `item`.`id` -$sql_extra -ORDER BY `item`.`created` DESC LIMIT %d ,%d ", -intval(local_user()), -intval($a->pager['start']), -intval($a->pager['itemspage']) -); -*/ - + if($order === 'post') { + $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 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`parent` = `item`.`id` + $sql_extra + ORDER BY `item`.`created` DESC LIMIT %d ,%d ", + intval(local_user()), + intval($a->pager['start']), + intval($a->pager['itemspage']) + ); + } + else { + // $order === 'comment' + // First fetch a known number of parent items - - // 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` - , (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 - - $sql_extra - 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(); - $parents_str = ''; - - if(count($r)) { - foreach($r as $rr) - $parents_arr[] = $rr['item_id']; - $parents_str = implode(', ', $parents_arr); - -/* created order -$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` -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 ", -intval(local_user()), -dbesc($parents_str) -*/ - - - - $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` + $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`!=`_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` = `com`.`parent` AND `item`.`parent` IN ( %s ) + 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 $sql_extra - ORDER BY `com`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + ORDER BY `com`.`created` DESC LIMIT %d ,%d ", intval(local_user()), intval(local_user()), - dbesc($parents_str) + intval($a->pager['start']), + intval($a->pager['itemspage']) ); + } + // Then fetch all the children of the parents that are on this page + $parents_arr = array(); + $parents_str = ''; + if(count($r)) { + foreach($r as $rr) + $parents_arr[] = $rr['item_id']; + $parents_str = implode(', ', $parents_arr); + if($order === 'post') { + // parent created order + $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` + 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 ", + intval(local_user()), + dbesc($parents_str) + ); + } + else { + // $order === 'comment' + + $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`!=`_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` = `com`.`parent` AND `item`.`parent` IN ( %s ) + $sql_extra + ORDER BY `com`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + intval(local_user()), + intval(local_user()), + dbesc($parents_str) + ); + } } } -- cgit v1.2.3 From 12fec754892b29ab9c07b20b1d6b322f6724aae8 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 13 Sep 2011 18:40:15 -0700 Subject: ability to re-order network page (no UI yet) --- mod/network.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'mod/network.php') diff --git a/mod/network.php b/mod/network.php index ef97fb895..438b3417d 100644 --- 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,11 +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'); - $order = 'comment'; if(($a->argc > 2) && $a->argv[2] === 'new') $nouveau = true; @@ -192,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'] . "; \r\n"; -- cgit v1.2.3