comment collapsing, pagination wasn't advancing past 16

diff --git a/boot.php b/boot.php
index 54b34416f6bc4e2ed998c9d865309913110214b1..ba9e2b6e44081b274fb5b855531777911c0857fa 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1068,6 +1068,7 @@ function paginate(&$a) {
        $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
        $stripped = str_replace('q=','',$stripped);
        $stripped = trim($stripped,'/');
+       $pagenum = $a->pager['page'];
        $url = $a->get_baseurl() . '/' . $stripped;
 
 
@@ -1080,7 +1081,7 @@ function paginate(&$a) {
 
                $numpages = $a->pager['total'] / $a->pager['itemspage'];
 
-               $numstart = 1;
+                       $numstart = 1;
                $numstop = $numpages;
 
                if($numpages > 14) {

diff --git a/mod/network.php b/mod/network.php
index 97bc0713d18f569b9d078a5c4b018244a12a439e..08bc5af4c8a3b136aa312ea74d288ec62b097b4c 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -183,8 +183,11 @@ function network_content(&$a, $update = 0) {
                intval($_SESSION['uid'])
        );
 
-       if(count($r))
+       if(count($r)) {
                $a->set_pager_total($r[0]['total']);
+               $a->set_pager_itemspage(40);
+       }
+
 
        if($nouveau) {
                $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
@@ -203,21 +206,41 @@ function network_content(&$a, $update = 0) {
                );
        }
        else {
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-                       `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-                       `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` 
+               $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`.`id` = `item`.`contact-id`
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-                       AND `item`.`parent` = `parentitem`.`id`
+                       AND `item`.`parent` = `item`.`id`
                        $sql_extra
-                       ORDER BY `parentitem`.`created`  DESC, `item`.`gravity` ASC, `item`.`created` ASC LIMIT %d ,%d ",
+                       ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
                        intval(local_user()),
                        intval($a->pager['start']),
                        intval($a->pager['itemspage'])
                );
+
+               $parents_arr = array();
+               $parents_str = '';
+
+               if(count($r)) {
+                       foreach($r as $rr)
+                               $parents_arr[] = $rr['item_id'];
+                       $parents_str = implode(', ', $parents_arr);
+
+                       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+                               `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+                               `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)
+                       );
+               }
        }
 
        $author_contacts = extract_item_authors($r,local_user());
@@ -302,15 +325,25 @@ function network_content(&$a, $update = 0) {
 
                }
 
-
+               $comments = array();
+               foreach($r as $rr) {
+                       if(intval($rr['gravity']) == 6) {
+                               if(! x($comments,$rr['parent']))
+                                       $comments[$rr['parent']] = 1;
+                               else
+                                       $comments[$rr['parent']] += 1;
+                       }
+               }
 
                foreach($r as $item) {
                        like_puller($a,$item,$alike,'like');
                        like_puller($a,$item,$dlike,'dislike');
                }
 
+               $comments_collapsed = false;
                foreach($r as $item) {
 
+                       
                        $comment = '';
                        $template = $tpl;
                        $commentww = '';
@@ -320,9 +353,26 @@ function network_content(&$a, $update = 0) {
                        if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
                                continue;
 
-                       $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+                       if($item['id'] == $item['parent']) {
+                               $comments_seen = 0;
+                               $comments_collapsed = false;
+                       }
+                       else
+                               $comments_seen ++;
+
 
+                       if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
+                               if(! $comments_collapsed) {
+                                       $o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
+                                       $o .= '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
+                                       $comments_collapsed = true;
+                               }
+                       }
+                       if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+                               $o .= '</div></div>';
+                       }
 
+                       $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
                        $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
                                || strlen($item['deny_cid']) || strlen($item['deny_gid']))))

diff --git a/mod/profile.php b/mod/profile.php
index d33c9aeb24dc6c10a77d8c039ec2ffd6e3a27d86..9544512bab422bc6b4cb338ccfd8b085ab3e4401 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -243,31 +243,52 @@ function profile_content(&$a, $update = 0) {
                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` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `wall` = 1 )
+               AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
                $sql_extra ",
                intval($a->profile['profile_uid'])
 
        );
 
-       if(count($r))
+       if(count($r)) {
                $a->set_pager_total($r[0]['total']);
+               $a->set_pager_itemspage(40);
+       }
 
-       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-               `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, 
-               `contact`.`thumb`, `contact`.`self`, 
-               `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+       $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` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `wall` = 1 )
+               AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
                $sql_extra
-               ORDER BY `parent` DESC, `gravity` ASC, `id` ASC LIMIT %d ,%d ",
+               LIMIT %d ,%d ",
                intval($a->profile['profile_uid']),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
 
        );
 
+       $parents_arr = array();
+       $parents_str = '';
+
+       if(count($r)) {
+               foreach($r as $rr)
+                       $parents_arr[] = $rr['item_id'];
+               $parents_str = implode(', ', $parents_arr);
+ 
+               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+                       `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, 
+                       `contact`.`thumb`, `contact`.`self`, 
+                       `contact`.`id` AS `cid`, `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` IN ( %s )
+                       $sql_extra
+                       ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
+                       intval($a->profile['profile_uid']),
+                       dbesc($parents_str)
+               );
+       }
 
        if($is_owner && ! $update)
                $o .= get_birthdays();
@@ -292,6 +313,16 @@ function profile_content(&$a, $update = 0) {
 
        if($r !== false && count($r)) {
 
+               $comments = array();
+               foreach($r as $rr) {
+                       if(intval($rr['gravity']) == 6) {
+                               if(! x($comments,$rr['parent']))
+                                       $comments[$rr['parent']] = 1;
+                               else
+                                       $comments[$rr['parent']] += 1;
+                       }
+               }
+
                foreach($r as $item) {
                        like_puller($a,$item,$alike,'like');
                        like_puller($a,$item,$dlike,'dislike');
@@ -311,6 +342,25 @@ function profile_content(&$a, $update = 0) {
                                && ($item['id'] != $item['parent']))
                                continue;
 
+                       if($item['id'] == $item['parent']) {
+                               $comments_seen = 0;
+                               $comments_collapsed = false;
+                       }
+                       else
+                               $comments_seen ++;
+
+
+                       if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
+                               if(! $comments_collapsed) {
+                                       $o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
+                                       $o .= '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
+                                       $comments_collapsed = true;
+                               }
+                       }
+                       if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+                               $o .= '</div></div>';
+                       }
+
                        $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
                                || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
                                ? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'