Merge branch 'master' of https://github.com/friendica/red

3 files changed, 55 insertions, 5 deletions

diff --git a/mod/photos.php b/mod/photos.php
index c2d90184e..0ff0e29c9 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -654,7 +654,7 @@ function photos_content(&$a) {
 		);
 		
 		$o .= '<div class="section-title-wrapper">';
-		$o .= '<h3>' . $album . '</h3>';
+		$o .= '<h2>' . $album . '</h2>';
 		$o .= '<div class="section-title-submenu">';
 		if($cmd === 'edit') {		
 			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
@@ -1238,7 +1238,7 @@ function photos_content(&$a) {
 		$o .= replace_macros($tpl, array(
 			'$title' => t('Recent Photos'),
 			'$can_post' => $can_post,
-			'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
+			'$upload' => array(t('Upload'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
 			'$photos' => $photos,
 		));
 
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index c587b9606..aad9c9d16 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -364,7 +364,9 @@ function profile_photo_content(&$a) {
 // FIXME - yuk  
 			'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . $a->get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. $a->get_baseurl() . '/photos/' . $a->channel['channel_address'] . '">' . t('select a photo from your photo albums') . '</a>')
 		));
-
+		
+		call_hooks('profile_photo_content_end', $o);
+		
 		return $o;
 	}
 	else {
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 01355a51d..4568906f3 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -48,6 +48,51 @@ function siteinfo_init(&$a) {
 
 		$site_info = get_config('system','info');
 		$site_name = get_config('system','sitename');
+		
+		// Statistics (from statistics.json plugin)
+		
+		$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,
@@ -61,9 +106,12 @@ function siteinfo_init(&$a) {
 			'admin' => $admin,
 			'site_name' => (($site_name) ? $site_name : ''),
 			'platform' => RED_PLATFORM,
-			'info' => (($site_info) ? $site_info : '')
+			'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
 		);
-
 		json_return_and_die($data);
 	}
 }