There was no check for duplicated GUIDs, so doubled posts could occur.

[friendica.git] / include / datetime.php

diff --git a/include/datetime.php b/include/datetime.php
index 3b1491e4d839429d5fb95390df171be39bc5ad54..f3236238fa0e0280dc276ab6d1d4f5a5b77c6d32 100644 (file)
--- 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');
@@ -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) {
@@ -260,6 +282,11 @@ function relative_date($posted_date,$format = null) {
                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')),
@@ -276,7 +303,7 @@ function relative_date($posted_date,$format = null) {
                        // 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]));
+                       return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1])).$time_append;
         }
     }
 }}
@@ -447,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()),
@@ -459,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']),