look for DFRN contacts as well

[friendica.git] / include / datetime.php

diff --git a/include/datetime.php b/include/datetime.php
index f4dcfce62e9fb90952a65c1158781ca7ed8a339a..efcfa0a177eb8319e8feb6cd64033962efea333d 100644 (file)
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -87,7 +87,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
                $from = 'UTC';
        if($to === '')
                $to = 'UTC';
-       if($s === '')
+       if( ($s === '') || (! is_string($s)) )
                $s = 'now';
 
        // Slight hackish adjustment so that 'zero' datetime actually returns what is intended
@@ -100,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) {
@@ -244,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); 
 
@@ -274,7 +296,9 @@ function relative_date($posted_date) {
                if ($d >= 1) {
                        $r = round($d);
                        // translators - e.g. 22 hours ago, 1 minute ago
-                       return sprintf( t('%1$d %2$s ago'),$r, (($r == 1) ? $str[0] : $str[1]));
+                       if(! $format)
+                               $format = t('%1$d %2$s ago');
+                       return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1]));
         }
     }
 }}
@@ -445,11 +469,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()),
@@ -457,6 +483,7 @@ 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)
                        );