missing year on profile birthday input, some optimisations to stats

3 files changed, 17 insertions, 39 deletions

diff --git a/include/datetime.php b/include/datetime.php
index 766c90d16..3a07f1ccf 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -125,10 +125,16 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
  */
 function dob($dob) {
 
+	$y = substr($dob,0,4);
+	if((! ctype_digit($y)) || ($y < 1900))
+		$ignore_year = true;
+	else
+		$ignore_year = false;
+
 	if ($dob === '0000-00-00' || $dob === '')
 		$value = '';
 	else
-		$value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d'));
+		$value = (($ignore_year) ? datetime_convert('UTC','UTC',$dob,'m-d') : datetime_convert('UTC','UTC',$dob,'Y-m-d'));
 
 	$o = replace_macros(get_markup_template("field_input.tpl"), [
 		'$field' => [ 'dob', t('Birthday'), $value, ((intval($value)) ? t('Age: ') . age($value,App::$user['timezone'],App::$user['timezone']) : ''), '', 'placeholder="' . t('YYYY-MM-DD or MM-DD') .'"' ]
diff --git a/include/items.php b/include/items.php
index d1625e944..e232a0200 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2551,9 +2551,7 @@ function tag_deliver($uid, $item_id) {
 					$j_obj = json_decode($item['obj'],true);
 					logger('tag_deliver: tag object: ' . print_r($j_obj,true), LOGGER_DATA);
 					if($j_obj && $j_obj['id'] && $j_obj['title']) {
-						if(is_array($j_obj['link']))
-							$taglink = get_rel_link($j_obj['link'],'alternate');
-
+						//COMMUNITYTAG
 						store_item_tag($u[0]['channel_id'],$p[0]['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$j_obj['title'],$j_obj['id']);
 						$x = q("update item set edited = '%s', received = '%s', changed = '%s' where mid = '%s' and uid = %d",
 							dbesc(datetime_convert()),
diff --git a/include/statistics_fns.php b/include/statistics_fns.php
index d213485bf..98b0efd41 100644
--- a/include/statistics_fns.php
+++ b/include/statistics_fns.php
@@ -17,23 +17,10 @@ function update_channels_active_halfyear_stat() {
 		db_utcnow(), db_quoteinterval('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_wall = 1 and created > %s - INTERVAL %s group by uid",
-			db_utcnow(), db_quoteinterval('6 MONTH')
-		);
-		if($x) {
-			$channels_active_halfyear_stat = count($x);
-			set_config('system','channels_active_halfyear_stat',$channels_active_halfyear_stat);
-		} else {
-			set_config('system','channels_active_halfyear_stat',0);
-		}
-	} else {
-		set_config('system','channels_active_halfyear_stat',0);
+		set_config('system','channels_active_halfyear_stat',count($r));
+	}
+	else {
+		set_config('system','channels_active_halfyear_stat','0');
 	}
 }
 
@@ -43,28 +30,15 @@ function update_channels_active_monthly_stat() {
 		db_utcnow(), db_quoteinterval('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_wall = 1 and created > %s - INTERVAL %s group by uid",
-			db_utcnow(), db_quoteinterval('1 MONTH')
-		);
-		if($x) {
-			$channels_active_monthly_stat = count($x);
-			set_config('system','channels_active_monthly_stat',$channels_active_monthly_stat);
-		} else {
-			set_config('system','channels_active_monthly_stat',0);
-		}
-	} else {
-		set_config('system','channels_active_monthly_stat',0);
+		set_config('system','channels_active_monthly_stat',count($r));
+	}
+	else {
+		set_config('system','channels_active_monthly_stat','0');
 	}
 }
 
 function update_local_posts_stat() {
-	$posts = q("SELECT COUNT(*) AS local_posts FROM item WHERE item_wall = 1 ");
+	$posts = q("SELECT COUNT(*) AS local_posts FROM item WHERE item_wall = 1 and id = parent");
 	if (is_array($posts)) {
 		$local_posts_stat = intval($posts[0]["local_posts"]);
 		set_config('system','local_posts_stat',$local_posts_stat);