This was bloody hard to sort out.... but now it's sorted and we can move forward again. Put back xtag for efficient keyword searching, use it in conjunction with xprof['keywords'] to avoid a SQL triple join and group_concat (which simply won't scale on a directory server), figured out how best to work timezone corrected birthdays into the protocol. The directory can even provide an age if one was provided to it. Both of these things need some more work, but we have the mechanisms and a plan how to do it right instead of "how the !@#$ are we going to do pull this off?"

1 files changed, 23 insertions, 2 deletions

diff --git a/boot.php b/boot.php
index 01e518535..019cd760b 100644
--- a/boot.php
+++ b/boot.php
@@ -16,7 +16,7 @@ require_once('include/features.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica Red');
 define ( 'FRIENDICA_VERSION',      trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',               1     ); 
-define ( 'DB_UPDATE_VERSION',       1010     );
+define ( 'DB_UPDATE_VERSION',       1011     );
 
 define ( 'EOL',                    '<br />' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -1722,6 +1722,27 @@ if(! function_exists('current_theme_url')) {
 	}
 }
 
+function z_birthday($dob,$tz,$format="Y-m-d H:i:s") {
+
+	if(! strlen($tz))
+		$tz = 'UTC';
+
+	$tmp_dob = substr($dob,5);
+	if(intval($tmp_dob)) {
+		$y = datetime_convert($tz,$tz,'now','Y');
+		$bd = $y . '-' . $tmp_dob . ' 00:00';
+		$t_dob = strtotime($bd);
+		$now = strtotime(datetime_convert($tz,$tz,'now'));
+		if($t_dob < $now)
+			$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+		$birthday = datetime_convert($tz,'UTC',$bd,$format);
+	}
+
+	return $birthday;
+
+}
+
+
 if(! function_exists('feed_birthday')) {
 	function feed_birthday($uid,$tz) {
 
@@ -1763,7 +1784,7 @@ if(! function_exists('feed_birthday')) {
 				$now = strtotime(datetime_convert($tz,$tz,'now'));
 				if($t_dob < $now)
 					$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
-				$birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME);
+				$birthday = datetime_convert($tz,'UTC',$bd,$format);
 			}
 		}