Issue 2122: Make sure to always return the correct number of entries

[friendica.git] / include / event.php

diff --git a/include/event.php b/include/event.php
index fedbe24468ab67a4085422375974013e279bd77e..c4111dc0b174869be3fff15d6b58599a10d06bcd 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -3,7 +3,7 @@
 require_once('include/bbcode.php');
 require_once('include/map.php');
 
-function format_event_html($ev) {
+function format_event_html($ev, $simple = false) {
 
 
 
@@ -12,6 +12,32 @@ function format_event_html($ev) {
 
        $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
 
+       $event_start = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
+                       $ev['start'] , $bd_format ))
+                       :  day_translate(datetime_convert('UTC', 'UTC',
+                       $ev['start'] , $bd_format)));
+
+       $event_end = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
+                               $ev['finish'] , $bd_format ))
+                               :  day_translate(datetime_convert('UTC', 'UTC',
+                               $ev['finish'] , $bd_format )));
+
+       if ($simple) {
+               $o = "<h3>".bbcode($ev['summary'])."</h3>";
+
+               $o .= "<p>".bbcode($ev['desc'])."</p>";
+
+               $o .= "<h4>".t('Starts:')."</h4><p>".$event_start."</p>";
+
+               if(! $ev['nofinish'])
+                       $o .= "<h4>".t('Finishes:')."</h4><p>".$event_end."</p>";
+
+               if(strlen($ev['location']))
+                       $o .= "<h4>".t('Location:')."</h4><p>".$ev['location']."</p>";
+
+               return $o;
+       }
+
        $o = '<div class="vevent">' . "\r\n";
 
 
@@ -21,33 +47,25 @@ function format_event_html($ev) {
 
        $o .= '<p class="event-start">' . t('Starts:') . ' <abbr class="dtstart" title="'
                . datetime_convert('UTC','UTC',$ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
-               . '" >' 
-               . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), 
-                       $ev['start'] , $bd_format ))
-                       :  day_translate(datetime_convert('UTC', 'UTC', 
-                       $ev['start'] , $bd_format)))
+               . '" >'.$event_start
                . '</abbr></p>' . "\r\n";
 
        if(! $ev['nofinish'])
                $o .= '<p class="event-end" >' . t('Finishes:') . ' <abbr class="dtend" title="'
                        . datetime_convert('UTC','UTC',$ev['finish'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
-                       . '" >' 
-                       . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), 
-                               $ev['finish'] , $bd_format ))
-                               :  day_translate(datetime_convert('UTC', 'UTC', 
-                               $ev['finish'] , $bd_format )))
+                       . '" >'.$event_end
                        . '</abbr></p>'  . "\r\n";
 
        if(strlen($ev['location'])){
-               $o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">' 
-                       . bbcode($ev['location']) 
+               $o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">'
+                       . bbcode($ev['location'])
                        . '</span></p>' . "\r\n";
-               
+
                if (strpos($ev['location'], "[map")===False) {
                        $map = generate_named_map($ev['location']);
                        if ($map!==$ev['location']) $o.=$map;
                }
-               
+
        }
 
        $o .= '</div>' . "\r\n";
@@ -137,7 +155,7 @@ function format_event_bbcode($ev) {
 
        if(($ev['finish']) && (! $ev['nofinish']))
                $o .= '[event-finish]' . $ev['finish'] . '[/event-finish]';
- 
+
        if($ev['location'])
                $o .= '[event-location]' . $ev['location'] . '[/event-location]';
 
@@ -200,11 +218,17 @@ function ev_compare($a,$b) {
 
        if($date_a === $date_b)
                return strcasecmp($a['desc'],$b['desc']);
-       
+
        return strcmp($date_a,$date_b);
 }
 
+function event_delete($event_id) {
+       if ($event_id == 0)
+               return;
 
+       q("DELETE FROM `event` WHERE `id` = %d", intval($event_id));
+       logger("Deleted event ".$event_id, LOGGER_DEBUG);
+}
 
 function event_store($arr) {
 
@@ -324,7 +348,7 @@ function event_store($arr) {
        }
        else {
 
-               // New event. Store it. 
+               // New event. Store it.
 
                $r = q("INSERT INTO `event` ( `uid`,`cid`,`uri`,`created`,`edited`,`start`,`finish`,`summary`, `desc`,`location`,`type`,
                        `adjust`,`nofinish`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`)
@@ -362,6 +386,7 @@ function event_store($arr) {
                $item_arr['contact-id']    = $arr['cid'];
                $item_arr['uri']           = $arr['uri'];
                $item_arr['parent-uri']    = $arr['uri'];
+               $item_arr['guid']          = $arr['guid'];
                $item_arr['type']          = 'activity';
                $item_arr['wall']          = (($arr['cid']) ? 0 : 1);
                $item_arr['contact-id']    = $contact['id'];