Removed commented code

[friendica.git] / mod / nodeinfo.php

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index 585659e5cb4ebd3cb86c7e2988ea2a47af18e95f..334dcb055d6c3868c43016e6c864d60ef3ce2222 100644 (file)
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -174,7 +174,7 @@ function nodeinfo_cron() {
                return;
 
        $last = get_config('nodeinfo','last_calucation');
-
+/*
        if($last) {
                // Calculate every 24 hours
                $next = $last + (24 * 60 * 60);
@@ -183,12 +183,12 @@ function nodeinfo_cron() {
                        return;
                }
        }
-        logger("cron_start");
+*/        logger("cron_start");
 
-       $users = q("SELECT `user`.`uid`, `user`.`login_date`,
-                       (SELECT MAX(`changed`) FROM `item` FORCE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date`
+       $users = qu("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
                        FROM `user`
                        INNER JOIN `profile` ON `profile`.`uid` = `user`.`uid` AND `profile`.`is-default`
+                       INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
                        WHERE (`profile`.`publish` OR `profile`.`net-publish`) AND `user`.`verified`
                                AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
                                AND NOT `user`.`account_expired`");
@@ -202,11 +202,11 @@ function nodeinfo_cron() {
 
                        foreach ($users AS $user) {
                                if ((strtotime($user['login_date']) > $halfyear) OR
-                                       (strtotime($user['lastitem_date']) > $halfyear))
+                                       (strtotime($user['last-item']) > $halfyear))
                                        ++$active_users_halfyear;
 
                                if ((strtotime($user['login_date']) > $month) OR
-                                       (strtotime($user['lastitem_date']) > $month))
+                                       (strtotime($user['last-item']) > $month))
                                        ++$active_users_monthly;
 
                        }
@@ -217,12 +217,13 @@ function nodeinfo_cron() {
                        set_config('nodeinfo','active_users_monthly', $active_users_monthly);
        }
 
-       //$posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE `wall` AND `uid` != 0 AND `id` = `parent` AND left(body, 6) != '[share'");
-       $posts = q("SELECT COUNT(*) AS `local_posts` FROM `item`
+       $posts = qu("SELECT COUNT(*) AS local_posts FROM `thread` WHERE `thread`.`wall`");
+/*
+       $posts = qu("SELECT COUNT(*) AS `local_posts` FROM `item`
                        INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                        WHERE `contact`.`self` and `item`.`id` = `item`.`parent` AND left(body, 6) != '[share' AND `item`.`network` IN ('%s', '%s', '%s')",
                        dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
-
+*/
        if (!is_array($posts))
                $local_posts = -1;
        else
@@ -232,7 +233,7 @@ function nodeinfo_cron() {
 
         logger("local_posts: ".$local_posts, LOGGER_DEBUG);
 
-       $posts = q("SELECT COUNT(*) AS `local_comments` FROM `item`
+       $posts = qu("SELECT COUNT(*) AS `local_comments` FROM `item`
                        INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                        WHERE `contact`.`self` and `item`.`id` != `item`.`parent` AND `item`.`network` IN ('%s', '%s', '%s')",
                        dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));