There was no check for duplicated GUIDs, so doubled posts could occur.

[friendica.git] / include / event.php

diff --git a/include/event.php b/include/event.php
index 866ae8c3f006370c7f0bae151995e47a5cad2934..f9f3b1320465c3b817a397329a12101b05395c13 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -12,6 +12,9 @@ function format_event_html($ev) {
 
        $o = '<div class="vevent">' . "\r\n";
 
+
+       $o .= '<p class="summary event-summary">' . bbcode($ev['summary']) .  '</p>' . "\r\n";
+
        $o .= '<p class="description event-description">' . bbcode($ev['desc']) .  '</p>' . "\r\n";
 
        $o .= '<p class="event-start">' . t('Starts:') . ' <abbr class="dtstart" title="'
@@ -114,6 +117,9 @@ function format_event_bbcode($ev) {
 
        $o = '';
 
+       if($ev['summary'])
+               $o .= '[event-summary]' . $ev['summary'] . '[/event-summary]';
+
        if($ev['desc'])
                $o .= '[event-description]' . $ev['desc'] . '[/event-description]';
 
@@ -147,6 +153,9 @@ function bbtoevent($s) {
 
        $ev = array();
 
+       $match = '';
+       if(preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is",$s,$match))
+               $ev['summary'] = $match[1];
        $match = '';
        if(preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is",$s,$match))
                $ev['desc'] = $match[1];
@@ -198,7 +207,7 @@ function event_store($arr) {
 
        $arr['created'] = (($arr['created']) ? $arr['created'] : datetime_convert());
        $arr['edited']  = (($arr['edited']) ? $arr['edited'] : datetime_convert());
-       $arr['type']    = (($arr['type']) ? $arr['type'] : 'event' );   
+       $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);
@@ -244,6 +253,7 @@ function event_store($arr) {
                        `edited` = '%s',
                        `start` = '%s',
                        `finish` = '%s',
+                       `summary` = '%s',
                        `desc` = '%s',
                        `location` = '%s',
                        `type` = '%s',
@@ -253,11 +263,12 @@ function event_store($arr) {
                        `allow_gid` = '%s',
                        `deny_cid` = '%s',
                        `deny_gid` = '%s'
-                       WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       WHERE `id` = %d AND `uid` = %d",
 
                        dbesc($arr['edited']),
                        dbesc($arr['start']),
                        dbesc($arr['finish']),
+                       dbesc($arr['summary']),
                        dbesc($arr['desc']),
                        dbesc($arr['location']),
                        dbesc($arr['type']),
@@ -280,7 +291,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', `private` = %d 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",
                                dbesc(format_event_bbcode($arr)),
                                dbesc($object),
                                dbesc($arr['allow_cid']),
@@ -306,9 +317,9 @@ function event_store($arr) {
 
                // New event. Store it. 
 
-               $r = q("INSERT INTO `event` ( `uid`,`cid`,`uri`,`created`,`edited`,`start`,`finish`,`desc`,`location`,`type`,
+               $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`)
-                       VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
+                       VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
                        intval($arr['uid']),
                        intval($arr['cid']),
                        dbesc($arr['uri']),
@@ -316,6 +327,7 @@ function event_store($arr) {
                        dbesc($arr['edited']),
                        dbesc($arr['start']),
                        dbesc($arr['finish']),
+                       dbesc($arr['summary']),
                        dbesc($arr['desc']),
                        dbesc($arr['location']),
                        dbesc($arr['type']),
@@ -373,13 +385,18 @@ function event_store($arr) {
                $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($arr['uid'])
                );
-               if(count($r))
-                       $plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
+               //if(count($r))
+               //      $plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
 
 
                if($item_id) {
-                       q("UPDATE `item` SET `plink` = '%s', `event-id` = %d  WHERE `uid` = %d AND `id` = %d LIMIT 1",
-                               dbesc($plink),
+                       //q("UPDATE `item` SET `plink` = '%s', `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
+                       //      dbesc($plink),
+                       //      intval($event['id']),
+                       //      intval($arr['uid']),
+                       //      intval($item_id)
+                       //);
+                       q("UPDATE `item` SET `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
                                intval($event['id']),
                                intval($arr['uid']),
                                intval($item_id)