Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / include / event.php
diff --git a/include/event.php b/include/event.php

index d56388a77a0e407212b7572b8680b8b16e855ec9..c5e5ff18d75bfe2b0d44ed792def8f1b5fdbb050 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,21 +47,13 @@ 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'])){
@@ -43,7 +61,7 @@ function format_event_html($ev) {
                         . bbcode($ev['location'])
                         . '</span></p>' . "\r\n";
  
-               if (strpos($ev['location'], "[map")===False) {
+               if (strpos($ev['location'], "[map") !== False) {
                         $map = generate_named_map($ev['location']);
                         if ($map!==$ev['location']) $o.=$map;
                 }
@@ -58,7 +76,6 @@ function format_event_html($ev) {
  function parse_event($h) {
  
         require_once('include/Scrape.php');
-       require_once('library/HTMLPurifier.auto.php');
         require_once('include/html2bbcode');
  
         $h = '<html><body>' . $h . '</body></html>';
@@ -274,10 +291,6 @@ function event_store($arr) {
                         `type` = '%s',
                         `adjust` = %d,
                         `nofinish` = %d,
-                       `allow_cid` = '%s',
-                       `allow_gid` = '%s',
-                       `deny_cid` = '%s',
-                       `deny_gid` = '%s'
                         WHERE `id` = %d AND `uid` = %d",
  
                         dbesc($arr['edited']),
@@ -289,10 +302,6 @@ function event_store($arr) {
                         dbesc($arr['type']),
                         intval($arr['adjust']),
                         intval($arr['nofinish']),
-                       dbesc($arr['allow_cid']),
-                       dbesc($arr['allow_gid']),
-                       dbesc($arr['deny_cid']),
-                       dbesc($arr['deny_gid']),
                         intval($arr['id']),
                         intval($arr['uid'])
                 );
@@ -306,22 +315,16 @@ 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",
+                       q("UPDATE `item` SET `body` = '%s', `object` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d",
                                 dbesc(format_event_bbcode($arr)),
                                 dbesc($object),
-                               dbesc($arr['allow_cid']),
-                               dbesc($arr['allow_gid']),
-                               dbesc($arr['deny_cid']),
-                               dbesc($arr['deny_gid']),
                                 dbesc($arr['edited']),
-                               intval($arr['private']),
                                 intval($r[0]['id']),
                                 intval($arr['uid'])
                         );
  
                         $item_id = $r[0]['id'];
-               }
-               else
+               } else
                         $item_id = 0;
  
                 call_hooks("event_updated", $arr['id']);