rework show/hide comments

[friendica.git] / include / event.php

diff --git a/include/event.php b/include/event.php
index 31df86e2c595599641ddca6bf9525a59203cf120..c7669b381c7305441d427cf9dba291f778c2247a 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -8,11 +8,11 @@ function format_event_html($ev) {
        if(! ((is_array($ev)) && count($ev)))
                return '';
 
-       $bd_format = t('l F d, Y \@ g A') ; // Friday January 18, 2011 @ 8 AM
+       $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
 
-       $o = '<div class="vevent">';
+       $o = '<div class="vevent">' . "\r\n";
 
-       $o .= '<p class="description event-description">' . bbcode($ev['desc']) .  '</p>';
+       $o .= '<p class="description event-description">' . bbcode($ev['desc']) .  '</p>' . "\r\n";
 
        $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' ))
@@ -21,7 +21,7 @@ function format_event_html($ev) {
                        $ev['start'] , $bd_format ))
                        :  day_translate(datetime_convert('UTC', 'UTC', 
                        $ev['start'] , $bd_format)))
-               . '</abbr></p>';
+               . '</abbr></p>' . "\r\n";
 
        if(! $ev['nofinish'])
                $o .= '<p class="event-end" >' . t('Finishes:') . ' <abbr class="dtend" title="'
@@ -31,14 +31,14 @@ function format_event_html($ev) {
                                $ev['finish'] , $bd_format ))
                                :  day_translate(datetime_convert('UTC', 'UTC', 
                                $ev['finish'] , $bd_format )))
-                       . '</abbr></p>';
+                       . '</abbr></p>'  . "\r\n";
 
        if(strlen($ev['location']))
                $o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">' 
                        . bbcode($ev['location']) 
-                       . '</span></p>';
+                       . '</span></p>' . "\r\n";
 
-       $o .= '</div>';
+       $o .= '</div>' . "\r\n";
        return $o;
 }
 
@@ -53,7 +53,12 @@ function parse_event($h) {
 
        $ret = array();
 
-       $dom = HTML5_Parser::parse($h);
+
+       try {
+               $dom = HTML5_Parser::parse($h);
+       } catch (DOMException $e) {
+               logger('parse_event: parse error: ' . $e);
+       }
 
        if(! $dom)
                return $ret;
@@ -175,6 +180,9 @@ function ev_compare($a,$b) {
 
        $date_a = (($a['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$a['start']) : $a['start']);
        $date_b = (($b['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$b['start']) : $b['start']);
+
+       if($date_a === $date_b)
+               return strcasecmp($a['desc'],$b['desc']);
        
        return strcmp($date_a,$date_b);
 }
@@ -194,6 +202,7 @@ function event_store($arr) {
        $arr['type']    = (($arr['type']) ? $arr['type'] : 'event' );   
        $arr['cid']     = ((intval($arr['cid'])) ? intval($arr['cid']) : 0);
        $arr['uri']     = (x($arr,'uri') ? $arr['uri'] : item_new_uri($a->get_hostname(),$arr['uid']));
+       $arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0);
 
        if($arr['cid'])
                $c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -209,7 +218,29 @@ function event_store($arr) {
                $contact = $c[0];
 
 
+       // Existing event being modified
+
        if($arr['id']) {
+
+               // has the event actually changed?
+
+               $r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       intval($arr['id']),
+                       intval($arr['uid'])
+               );
+               if((! count($r)) || ($r[0]['edited'] === $arr['edited'])) {
+
+                       // Nothing has changed. Grab the item id to return.
+
+                       $r = q("SELECT * FROM `item` WHERE `event-id` = %d AND `uid` = %d LIMIT 1",
+                               intval($arr['id']),
+                               intval($arr['uid'])
+                       );
+                       return((count($r)) ? $r[0]['id'] : 0);
+               }
+
+               // The event changed. Update it.
+
                $r = q("UPDATE `event` SET
                        `edited` = '%s',
                        `start` = '%s',
@@ -250,14 +281,15 @@ function event_store($arr) {
                        $object .= '</object>' . "\n";
 
 
-                       q("UPDATE `item` SET `body` = '%s', `object` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       q("UPDATE `item` SET `body` = '%s', `object` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `edited` = '%s', `private` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                dbesc(format_event_bbcode($arr)),
                                dbesc($object),
                                dbesc($arr['allow_cid']),
                                dbesc($arr['allow_gid']),
                                dbesc($arr['deny_cid']),
                                dbesc($arr['deny_gid']),
-                               dbesc(datetime_convert()),
+                               dbesc($arr['edited']),
+                               intval($arr['private']),
                                intval($r[0]['id']),
                                intval($arr['uid'])
                        );
@@ -269,6 +301,8 @@ function event_store($arr) {
        }
        else {
 
+               // New event. Store it. 
+
                $r = q("INSERT INTO `event` ( `uid`,`cid`,`uri`,`created`,`edited`,`start`,`finish`,`desc`,`location`,`type`,
                        `adjust`,`nofinish`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`)
                        VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
@@ -305,7 +339,7 @@ function event_store($arr) {
                $item_arr['uri']           = $arr['uri'];
                $item_arr['parent-uri']    = $arr['uri'];
                $item_arr['type']          = 'activity';
-               $item_arr['wall']          = 1;
+               $item_arr['wall']          = (($arr['cid']) ? 0 : 1);
                $item_arr['contact-id']    = $contact['id'];
                $item_arr['owner-name']    = $contact['name'];
                $item_arr['owner-link']    = $contact['url'];
@@ -314,15 +348,16 @@ function event_store($arr) {
                $item_arr['author-link']   = $contact['url'];
                $item_arr['author-avatar'] = $contact['thumb'];
                $item_arr['title']         = '';
-               $item_arr['allow_cid']     = $str_contact_allow;
-               $item_arr['allow_gid']     = $str_group_allow;
-               $item_arr['deny_cid']      = $str_contact_deny;
-               $item_arr['deny_gid']      = $str_group_deny;
+               $item_arr['allow_cid']     = $arr['allow_cid'];
+               $item_arr['allow_gid']     = $arr['allow_gid'];
+               $item_arr['deny_cid']      = $arr['deny_cid'];
+               $item_arr['deny_gid']      = $arr['deny_gid'];
+               $item_arr['private']       = $arr['private'];
                $item_arr['last-child']    = 1;
                $item_arr['visible']       = 1;
                $item_arr['verb']          = ACTIVITY_POST;
                $item_arr['object-type']   = ACTIVITY_OBJ_EVENT;
-
+               $item_arr['origin']        = ((intval($arr['cid']) == 0) ? 1 : 0);
                $item_arr['body']          = format_event_bbcode($event);