Merge pull request #610 from tuscanhobbit/dev

site language wasn't included in siteinfo/json

1 files changed, 9 insertions, 48 deletions

diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index eab52e41e..3071e52fb 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -50,51 +50,12 @@ function siteinfo_init(&$a) {
 		$site_info = get_config('system','info');
 		$site_name = get_config('system','sitename');
 		
-		// Statistics (from statistics.json plugin)
+		//Statistics
+		$channels_total_stat = intval(get_config('system','channels_total_stat'));
+		$channels_active_halfyear_stat = intval(get_config('system','channels_active_halfyear_stat'));
+		$channels_active_monthly_stat = intval(get_config('system','channels_active_monthly_stat'));
+		$local_posts_stat = intval(get_config('system','local_posts_stat'));
 		
-		$r = q("select count(channel_id) as channels_total from channel left join account on account_id = channel_account_id
-			where account_flags = 0 ");
-		if($r)
-			$channels_total = intval($r[0]['channels_total']);
-		
-		$r = q("select channel_id from channel left join account on account_id = channel_account_id
-			where account_flags = 0 and account_lastlog > UTC_TIMESTAMP - INTERVAL 6 MONTH");
-		if($r) {
-			$s = '';
-			foreach($r as $rr) {
-				if($s)
-					$s .= ',';
-				$s .= intval($rr['channel_id']);
-			}
-			$x = q("select uid from item where uid in ( $s ) and (item_flags & %d) and created > UTC_TIMESTAMP - INTERVAL 6 MONTH group by uid",
-				intval(ITEM_WALL)
-			);
-			if($x)
-				$channels_active_halfyear = count($x);
-		}
-
-		$r = q("select channel_id from channel left join account on account_id = channel_account_id
-			where account_flags = 0 and account_lastlog > UTC_TIMESTAMP - INTERVAL 1 MONTH");
-		if($r) {
-			$s = '';
-			foreach($r as $rr) {
-				if($s)
-					$s .= ',';
-				$s .= intval($rr['channel_id']);
-			}
-			$x = q("select uid from item where uid in ( $s ) and ( item_flags & %d ) and created > UTC_TIMESTAMP - INTERVAL 1 MONTH group by uid",
-				intval(ITEM_WALL)
-			);
-			if($x)
-				$channels_active_monthly = count($x);
-		}
-
-		$posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE (item_flags & %d) ",
-			intval(ITEM_WALL)
-		);
-		if (is_array($posts))
-			$local_posts = intval($posts[0]["local_posts"]);
-
 		$data = Array(
 			'version' => RED_VERSION,
 			'commit' => $commit,
@@ -109,10 +70,10 @@ function siteinfo_init(&$a) {
 			'site_name' => (($site_name) ? $site_name : ''),
 			'platform' => RED_PLATFORM,
 			'info' => (($site_info) ? $site_info : ''),
-			'channels_total' => $channels_total,
-			'channels_active_halfyear' => $channels_active_halfyear,
-			'channels_active_monthly' => $channels_active_monthly,
-			'local_posts' => $local_posts
+			'channels_total' => $channels_total_stat,
+			'channels_active_halfyear' => $channels_active_halfyear_stat,
+			'channels_active_monthly' => $channels_active_monthly_stat,
+			'local_posts' => $local_posts_stat
 		);
 		json_return_and_die($data);
 	}