More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / include / event.php

diff --git a/include/event.php b/include/event.php
index 7c305767e449e4f76cbcb6a80fcb8f7ebc68ca20..1f08da5fbed0614f249a9204be725ba327839321 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -271,7 +271,7 @@ function event_store($arr) {
                        intval($arr['id']),
                        intval($arr['uid'])
                );
-               if((! count($r)) || ($r[0]['edited'] === $arr['edited'])) {
+               if((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
 
                        // Nothing has changed. Grab the item id to return.
 
@@ -279,7 +279,7 @@ function event_store($arr) {
                                intval($arr['id']),
                                intval($arr['uid'])
                        );
-                       return((count($r)) ? $r[0]['id'] : 0);
+                       return((dbm::is_result($r)) ? $r[0]['id'] : 0);
                }
 
                // The event changed. Update it.
@@ -312,7 +312,7 @@ function event_store($arr) {
                        intval($arr['id']),
                        intval($arr['uid'])
                );
-               if(count($r)) {
+               if(dbm::is_result($r)) {
                        $object = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
                        $object .= '<content>' . xmlify(format_event_bbcode($arr)) . '</content>';
                        $object .= '</object>' . "\n";
@@ -365,7 +365,7 @@ function event_store($arr) {
                        dbesc($arr['uri']),
                        intval($arr['uid'])
                );
-               if(count($r))
+               if(dbm::is_result($r))
                        $event = $r[0];
 
                $item_arr = array();
@@ -407,7 +407,7 @@ function event_store($arr) {
                $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($arr['uid'])
                );
-               //if(count($r))
+               //if(dbm::is_result($r))
                //      $plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
 
 
@@ -509,13 +509,13 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
        // query for the event by event id
        $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`
+               STRAIGHT_JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
                WHERE `event`.`uid` = %d AND `event`.`id` = %d $sql_extra",
                intval($owner_uid),
                intval($event_params["event_id"])
        );
 
-       if(count($r))
+       if(dbm::is_result($r))
                return $r;
 
 }
@@ -542,7 +542,7 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
        // query for the event by date
        $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`
+                       STRAIGHT_JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
                        WHERE `event`.`uid` = %d AND event.ignore = %d
                        AND ((`adjust` = 0 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s')
                        OR  (`adjust` = 1 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s'))
@@ -557,7 +557,7 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
                        dbesc($event_params["adjust_finish"])
        );
 
-       if(count($r))
+       if(dbm::is_result($r))
                return $r;
 }
 
@@ -590,7 +590,7 @@ function process_events ($arr) {
                        $is_first = ($d !== $last_date);
 
                        $last_date = $d;
-                       $edit = ((! $rr['cid']) ? array(App::get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
+                       $edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
                        $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
                        if(! $title) {
                                list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);
@@ -750,7 +750,7 @@ function events_by_uid($uid = 0, $sql_extra = '') {
                );
        }
 
-       if(count($r))
+       if(dbm::is_result($r))
                return $r;
 }
 
@@ -773,7 +773,7 @@ function event_export($uid, $format = 'ical') {
        // we are allowed to show events
        // get the timezone the user is in
        $r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
-       if (count($r))
+       if (dbm::is_result($r))
                $timezone = $r[0]['timezone'];
 
        // get all events which are owned by a uid (respects permissions);