From c666c98559d6e3a06eb220e870c5f9e08dfee394 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 10 Dec 2016 12:28:49 +0000
Subject: [PATCH] Code bautification

---
 include/Contact.php | 19 +++++--------------
 mod/nodeinfo.php    | 13 ++++---------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/include/Contact.php b/include/Contact.php
index e1fd29685..6b969de1f 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -683,10 +683,11 @@ function posts_from_contact_url($a, $contact_url) {
 	$r = q("SELECT `network`, `id` AS `author-id` FROM `contact`
 		WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
 		dbesc(normalise_link($contact_url)));
-	if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")))
-		$sql = "(`item`.`uid` = 0 OR  (`item`.`uid` = %d AND `item`.`private`))";
-	else
+	if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+		$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND `item`.`private`))";
+	} else {
 		$sql = "`item`.`uid` = %d";
+	}
 
 	$author_id = intval($r[0]["author-id"]);
 
@@ -699,16 +700,6 @@ function posts_from_contact_url($a, $contact_url) {
 		$a->set_pager_total($r[0]['total']);
 	}
 
-/*
-"SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
-			`author-name` AS `name`, `owner-avatar` AS `photo`,
-			`owner-link` AS `url`, `owner-avatar` AS `thumb`
-		FROM `item` FORCE INDEX (`authorid_created`)
-		WHERE `item`.`author-id` = %d AND $sql
-		AND NOT `deleted` AND NOT `moderated` AND `visible`
-
-*/
-
 	$r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
 		" ORDER BY `item`.`created` DESC LIMIT %d, %d",
 		intval($author_id),
@@ -719,7 +710,7 @@ function posts_from_contact_url($a, $contact_url) {
 
 	$o = conversation($a,$r,'community',false);
 
-	if(!get_config('system', 'old_pager')) {
+	if (!get_config('system', 'old_pager')) {
 		$o .= alt_pager($a,count($r));
 	} else {
 		$o .= paginate($a);
diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index 334dcb055..5c7060346 100644
--- 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,7 +183,7 @@ function nodeinfo_cron() {
 			return;
 		}
 	}
-*/        logger("cron_start");
+        logger("cron_start");
 
 	$users = qu("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
 			FROM `user`
@@ -217,13 +217,8 @@ function nodeinfo_cron() {
 			set_config('nodeinfo','active_users_monthly', $active_users_monthly);
 	}
 
-	$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));
-*/
+	$posts = qu("SELECT COUNT(*) AS local_posts FROM `thread` WHERE `thread`.`wall` AND `thread`.`uid` != 0");
+
 	if (!is_array($posts))
 		$local_posts = -1;
 	else