Merge pull request #5022 from Rudloff/feature/test_api

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

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 9387a25d6812686826204304f6b48621dea1b096..db9e2b93034127cc85e1036571a8a3caea20899a 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -29,7 +29,7 @@ class Event extends BaseObject
 
        public static function getHTML(array $event, $simple = false)
        {
-               if (!is_array($event) || !!count($event)) {
+               if (empty($event)) {
                        return '';
                }
 
@@ -230,6 +230,7 @@ class Event extends BaseObject
        {
                $a = self::getApp();
 
+               $event = [];
                $event['id']        = intval(defaults($arr, 'id'       , 0));
                $event['uid']       = intval(defaults($arr, 'uid'      , 0));
                $event['cid']       = intval(defaults($arr, 'cid'      , 0));
@@ -254,12 +255,14 @@ class Event extends BaseObject
                }
                $private = intval(defaults($arr, 'private', 0));
 
-               $condition = ['uid' => $event['uid']];
+               $conditions = ['uid' => $event['uid']];
                if ($event['cid']) {
-                       $condition['id'] = $event['cid'];
+                       $conditions['id'] = $event['cid'];
+               } else {
+                       $conditions['self'] = true;
                }
 
-               $contact = dba::selectFirst('contact', [], ['id' => $event['cid'], 'uid' => $event['uid']]);
+               $contact = dba::selectFirst('contact', [], $conditions);
 
                // Existing event being modified.
                if ($event['id']) {
@@ -284,7 +287,7 @@ class Event extends BaseObject
                                'nofinish' => $event['nofinish'],
                        ];
 
-                       dba::update('event', $updated_fields, ['id' => $event['cid'], 'uid' => $event['uid']]);
+                       dba::update('event', $updated_fields, ['id' => $event['id'], 'uid' => $event['uid']]);
 
                        $item = dba::selectFirst('item', ['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
                        if (DBM::is_result($item)) {
@@ -501,6 +504,7 @@ class Event extends BaseObject
                }
 
                // Query for the event by date.
+               // @todo Slow query (518 seconds to run), to be optimzed
                $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
                                        `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
                                LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
@@ -733,7 +737,7 @@ class Event extends BaseObject
 
                $events = dba::select('event', $fields, $conditions);
                if (DBM::is_result($events)) {
-                       $return = $events;
+                       $return = dba::inArray($events);
                }
 
                return $return;
@@ -799,10 +803,10 @@ class Event extends BaseObject
        /**
         * @brief Format an item array with event data to HTML.
         *
-        * @param arr $item Array with item and event data.
+        * @param array $item Array with item and event data.
         * @return string HTML output.
         */
-       public static function getItemHTML($item) {
+       public static function getItemHTML(array $item) {
                $same_date = false;
                $finish    = false;