Issue 6603: Events are now fetchable via AP

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

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 576f47ba832d6fa95b94beea42cf798fefe78af8..d9fbb27dd6822eb3da9af833aa9bbbb7bf3ee4c6 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -48,8 +48,10 @@ class Event extends BaseObject
                }
 
                if ($simple) {
+                       $o = '';
+
                        if (!empty($event['summary'])) {
-                               $o = "<h3>" . BBCode::convert(Strings::escapeHtml($event['summary']), false, $simple) . "</h3>";
+                               $o .= "<h3>" . BBCode::convert(Strings::escapeHtml($event['summary']), false, $simple) . "</h3>";
                        }
 
                        if (!empty($event['desc'])) {
@@ -243,7 +245,8 @@ class Event extends BaseObject
                $event['id']        = intval(defaults($arr, 'id'       , 0));
                $event['uid']       = intval(defaults($arr, 'uid'      , 0));
                $event['cid']       = intval(defaults($arr, 'cid'      , 0));
-               $event['uri']       =        defaults($arr, 'uri'      , Item::newURI($event['uid']));
+               $event['guid']      = defaults($arr, 'guid', System::createUUID());
+               $event['uri']       =        defaults($arr, 'uri'      , Item::newURI($event['uid'], $event['guid']));
                $event['type']      =        defaults($arr, 'type'     , 'event');
                $event['summary']   =        defaults($arr, 'summary'  , '');
                $event['desc']      =        defaults($arr, 'desc'     , '');
@@ -314,8 +317,6 @@ class Event extends BaseObject
 
                        Hook::callAll('event_updated', $event['id']);
                } else {
-                       $event['guid']  = defaults($arr, 'guid', System::createUUID());
-
                        // New event. Store it.
                        DBA::insert('event', $event);
 
@@ -642,15 +643,17 @@ class Event extends BaseObject
         */
        private static function formatListForExport(array $events, $format)
        {
+               $o = '';
+
                if (!count($events)) {
-                       return '';
+                       return $o;
                }
 
                switch ($format) {
                        // Format the exported data as a CSV file.
                        case "csv":
                                header("Content-type: text/csv");
-                               $o = '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL;
+                               $o .= '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL;
 
                                foreach ($events as $event) {
                                        /// @todo The time / date entries don't include any information about the