X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdatetime.php;h=f3236238fa0e0280dc276ab6d1d4f5a5b77c6d32;hb=33e572409d403966e18cf90e4af79e89e9b19be0;hp=d44e995cfaf5e7996ef532276dac15f5cfc43034;hpb=bbf491d52b73ff8152ecdf6700842eaa7a8d3bb8;p=friendica.git

diff --git a/include/datetime.php b/include/datetime.php
index d44e995cfa..f3236238fa 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -19,7 +19,7 @@ if(! function_exists('select_timezone')) {
 function select_timezone($current = 'America/Los_Angeles') {
 
 	$timezone_identifiers = DateTimeZone::listIdentifiers();
-	
+
 	$o ='<select id="timezone_select" name="timezone">';
 
 	usort($timezone_identifiers, 'timezone_cmp');
@@ -80,6 +80,16 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang
 if(! function_exists('datetime_convert')) {
 function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") {
 
+	// Defaults to UTC if nothing is set, but throws an exception if set to empty string.
+	// Provide some sane defaults regardless.
+
+	if($from === '')
+		$from = 'UTC';
+	if($to === '')
+		$to = 'UTC';
+	if( ($s === '') || (! is_string($s)) )
+		$s = 'now';
+
 	// Slight hackish adjustment so that 'zero' datetime actually returns what is intended
 	// otherwise we end up with -0001-11-30 ...
 	// add 32 days so that we at least get year 00, and then hack around the fact that 
@@ -90,11 +100,33 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
 		return str_replace('1','0',$d->format($fmt));
 	}
 
-	$d = new DateTime($s, new DateTimeZone($from));
-	$d->setTimeZone(new DateTimeZone($to));
+	try {
+		$from_obj = new DateTimeZone($from);
+	}
+	catch(Exception $e) {
+		$from_obj = new DateTimeZone('UTC');
+	}
+
+	try {
+		$d = new DateTime($s, $from_obj);
+	}
+	catch(Exception $e) {
+		logger('datetime_convert: exception: ' . $e->getMessage());
+		$d = new DateTime('now', $from_obj);
+	}
+
+	try {
+		$to_obj = new DateTimeZone($to);
+	}
+	catch(Exception $e) {
+		$to_obj = new DateTimeZone('UTC');
+	}
+
+	$d->setTimeZone($to_obj);
 	return($d->format($fmt));
 }}
 
+
 // wrapper for date selector, tailored for use in birthday fields
 
 function dob($dob) {
@@ -234,7 +266,7 @@ function timesel($pre,$h,$m) {
 // Limited to range of timestamps
 
 if(! function_exists('relative_date')) {
-function relative_date($posted_date) {
+function relative_date($posted_date,$format = null) {
 
 	$localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date); 
 
@@ -250,6 +282,11 @@ function relative_date($posted_date) {
 		return t('less than a second ago');
 	}
     
+	$time_append = '';
+	if ($etime >= 86400) {
+		$time_append = ' ('.$localtime.')';
+	}
+	
 	$a = array( 12 * 30 * 24 * 60 * 60  =>  array( t('year'),   t('years')),
 				30 * 24 * 60 * 60       =>  array( t('month'),  t('months')),
 				7  * 24 * 60 * 60       =>  array( t('week'),   t('weeks')),
@@ -260,10 +297,13 @@ function relative_date($posted_date) {
 	);
     
 	foreach ($a as $secs => $str) {
-	$d = $etime / $secs;
-	if ($d >= 1) {
-		$r = round($d);
-		return $r . ' ' . (($r == 1) ? $str[0] : $str[1]) . t(' ago');
+		$d = $etime / $secs;
+		if ($d >= 1) {
+			$r = round($d);
+			// translators - e.g. 22 hours ago, 1 minute ago
+			if(! $format)
+				$format = t('%1$d %2$s ago');
+			return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1])).$time_append;
         }
     }
 }}
@@ -434,11 +474,13 @@ function update_contact_birthdays() {
 			 *
 			 */
 			 
-			$bdtext = t('Birthday:') . ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]' ;
+			$bdtext = sprintf( t('%s\'s birthday'), $rr['name']);
+			$bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ;
 
 
-			$r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`desc`,`type`,`adjust`)
-				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ",
+
+			$r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
+				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ",
 				intval($rr['uid']),
 			 	intval($rr['id']),
 				dbesc(datetime_convert()),
@@ -446,14 +488,15 @@ function update_contact_birthdays() {
 				dbesc(datetime_convert('UTC','UTC', $nextbd)),
 				dbesc(datetime_convert('UTC','UTC', $nextbd . ' + 1 day ')),
 				dbesc($bdtext),
+				dbesc($bdtext2),
 				dbesc('birthday'),
 				intval(0)
 			);
-			
+
 
 			// update bdyear
 
-			q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d",
 				dbesc(substr($nextbd,0,4)),
 				dbesc($nextbd),
 				intval($rr['uid']),