Merge pull request #5575 from annando/issue-5541

[friendica.git] / src / Model / Event.php

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 2805a83f26ab852dd08674940d51ef27fad3a590..1bc922b4653ab73144d0ecc52f95a73ab0468841 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -34,19 +34,27 @@ class Event extends BaseObject
                $bd_format = L10n::t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8 AM.
 
                $event_start = day_translate(
-                       $event['adjust'] ?
+                       !empty($event['adjust']) ?
                        DateTimeFormat::local($event['start'], $bd_format) : DateTimeFormat::utc($event['start'], $bd_format)
                );
 
-               $event_end = day_translate(
-                       $event['adjust'] ?
-                       DateTimeFormat::local($event['finish'], $bd_format) : DateTimeFormat::utc($event['finish'], $bd_format)
-               );
+               if (!empty($event['finish'])) {
+                       $event_end = day_translate(
+                               !empty($event['adjust']) ?
+                               DateTimeFormat::local($event['finish'], $bd_format) : DateTimeFormat::utc($event['finish'], $bd_format)
+                       );
+               } else {
+                       $event_end = '';
+               }
 
                if ($simple) {
-                       $o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
+                       if (!empty($event['summary'])) {
+                               $o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
+                       }
 
-                       $o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
+                       if (!empty($event['desc'])) {
+                               $o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
+                       }
 
                        $o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
 
@@ -66,20 +74,22 @@ class Event extends BaseObject
                $o .= '<div class="summary event-summary">' . BBCode::convert($event['summary'], false, $simple) . '</div>' . "\r\n";
 
                $o .= '<div class="event-start"><span class="event-label">' . L10n::t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
-                       . DateTimeFormat::utc($event['start'], (($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
+                       . DateTimeFormat::utc($event['start'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
                        . '" >' . $event_start
                        . '</span></div>' . "\r\n";
 
                if (!$event['nofinish']) {
                        $o .= '<div class="event-end" ><span class="event-label">' . L10n::t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
-                               . DateTimeFormat::utc($event['finish'], (($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
+                               . DateTimeFormat::utc($event['finish'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
                                . '" >' . $event_end
                                . '</span></div>' . "\r\n";
                }
 
-               $o .= '<div class="description event-description">' . BBCode::convert($event['desc'], false, $simple) . '</div>' . "\r\n";
+               if (!empty($event['desc'])) {
+                       $o .= '<div class="description event-description">' . BBCode::convert($event['desc'], false, $simple) . '</div>' . "\r\n";
+               }
 
-               if (strlen($event['location'])) {
+               if (!empty($event['location'])) {
                        $o .= '<div class="event-location"><span class="event-label">' . L10n::t('Location:') . '</span>&nbsp;<span class="location">'
                                . BBCode::convert($event['location'], false, $simple)
                                . '</span></div>' . "\r\n";
@@ -303,7 +313,7 @@ class Event extends BaseObject
 
                        Addon::callHooks('event_updated', $event['id']);
                } else {
-                       $event['guid'] = System::createGUID(32);
+                       $event['guid']  = defaults($arr, 'guid', System::createGUID(32));
 
                        // New event. Store it.
                        DBA::insert('event', $event);
@@ -317,6 +327,7 @@ class Event extends BaseObject
                        $item_arr['uri']           = $event['uri'];
                        $item_arr['parent-uri']    = $event['uri'];
                        $item_arr['guid']          = $event['guid'];
+                       $item_arr['plink']         = defaults($arr, 'plink', '');
                        $item_arr['post-type']     = Item::PT_EVENT;
                        $item_arr['wall']          = $event['cid'] ? 0 : 1;
                        $item_arr['contact-id']    = $contact['id'];
@@ -863,6 +874,11 @@ class Event extends BaseObject
                        if (substr($dtstart_title, 0, 10) === substr($dtend_title, 0, 10)) {
                                $same_date = true;
                        }
+               } else {
+                       $dtend_title = '';
+                       $dtend_dt = '';
+                       $end_time = '';
+                       $end_short = '';
                }
 
                // Format the event location.