Debugged implementation of Diaspora relayable_retractions

[friendica.git] / include / event.php

diff --git a/include/event.php b/include/event.php
index aab195d245e2982c45b82738e9dac7013f98f967..866ae8c3f006370c7f0bae151995e47a5cad2934 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -42,7 +42,7 @@ function format_event_html($ev) {
        return $o;
 }
 
-
+/*
 function parse_event($h) {
 
        require_once('include/Scrape.php');
@@ -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;
@@ -103,7 +108,7 @@ function parse_event($h) {
 
        return $ret;
 }
-
+*/
 
 function format_event_bbcode($ev) {
 
@@ -157,8 +162,7 @@ function bbtoevent($s) {
        $match = '';
        if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
                $ev['adjust'] = $match[1];
-       $match = '';
-       $ev['nofinish'] = (($ev['start'] && (! $ev['finish'])) ? 1 : 0);
+       $ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
        return $ev;
 
 }
@@ -197,6 +201,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",
@@ -275,7 +280,7 @@ 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']),
@@ -283,14 +288,19 @@ function event_store($arr) {
                                dbesc($arr['deny_cid']),
                                dbesc($arr['deny_gid']),
                                dbesc($arr['edited']),
+                               intval($arr['private']),
                                intval($r[0]['id']),
                                intval($arr['uid'])
                        );
 
-                       return $r[0]['id'];
+                       $item_id = $r[0]['id'];
                }
                else
-                       return 0;
+                       $item_id = 0;
+
+               call_hooks("event_updated", $arr['id']);
+
+               return $item_id;
        }
        else {
 
@@ -341,19 +351,20 @@ 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);
 
 
-               $item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($uri) . '</id>';
+               $item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
                $item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
                $item_arr['object'] .= '</object>' . "\n";
 
@@ -375,6 +386,8 @@ function event_store($arr) {
                        );
                }
 
+               call_hooks("event_created", $event['id']);
+
                return $item_id;
        }
 }