Update function calls

[friendica.git] / src / Model / Event.php

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 992b77badabaf8042907aae3df0b7d5af4eb0353..f4df6ac9f64496aa0f103f98db5ab5812efd3684 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -9,11 +9,15 @@ use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
+use Friendica\Util\XML;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -223,7 +227,7 @@ class Event extends BaseObject
                }
 
                DBA::delete('event', ['id' => $event_id]);
-               logger("Deleted event ".$event_id, LOGGER_DEBUG);
+               Logger::log("Deleted event ".$event_id, Logger::DEBUG);
        }
 
        /**
@@ -256,10 +260,10 @@ class Event extends BaseObject
 
                $event['created']   = DateTimeFormat::utc(defaults($arr, 'created'  , 'now'));
                $event['edited']    = DateTimeFormat::utc(defaults($arr, 'edited'   , 'now'));
-               $event['start']     = DateTimeFormat::utc(defaults($arr, 'start'    , NULL_DATE));
-               $event['finish']    = DateTimeFormat::utc(defaults($arr, 'finish'   , NULL_DATE));
-               if ($event['finish'] < NULL_DATE) {
-                       $event['finish'] = NULL_DATE;
+               $event['start']     = DateTimeFormat::utc(defaults($arr, 'start'    , DBA::NULL_DATETIME));
+               $event['finish']    = DateTimeFormat::utc(defaults($arr, 'finish'   , DBA::NULL_DATETIME));
+               if ($event['finish'] < DBA::NULL_DATETIME) {
+                       $event['finish'] = DBA::NULL_DATETIME;
                }
                $private = intval(defaults($arr, 'private', 0));
 
@@ -299,8 +303,8 @@ class Event extends BaseObject
 
                        $item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
                        if (DBA::isResult($item)) {
-                               $object = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($event['uri']) . '</id>';
-                               $object .= '<content>' . xmlify(self::getBBCode($event)) . '</content>';
+                               $object = '<object><type>' . XML::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
+                               $object .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
                                $object .= '</object>' . "\n";
 
                                $fields = ['body' => self::getBBCode($event), 'object' => $object, 'edited' => $event['edited']];
@@ -313,7 +317,7 @@ class Event extends BaseObject
 
                        Addon::callHooks('event_updated', $event['id']);
                } else {
-                       $event['guid']  = defaults($arr, 'guid', System::createGUID(32));
+                       $event['guid']  = defaults($arr, 'guid', System::createUUID());
 
                        // New event. Store it.
                        DBA::insert('event', $event);
@@ -350,8 +354,8 @@ class Event extends BaseObject
                        $item_arr['body']          = self::getBBCode($event);
                        $item_arr['event-id']      = $event['id'];
 
-                       $item_arr['object']  = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($event['uri']) . '</id>';
-                       $item_arr['object'] .= '<content>' . xmlify(self::getBBCode($event)) . '</content>';
+                       $item_arr['object']  = '<object><type>' . XML::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
+                       $item_arr['object'] .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
                        $item_arr['object'] .= '</object>' . "\n";
 
                        $item_id = Item::insert($item_arr);
@@ -589,6 +593,12 @@ class Event extends BaseObject
                                $title = strip_tags(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
                        }
 
+                       $author_link = $event['author-link'];
+                       $plink       = $event['plink'];
+
+                       $event['author-link'] = Contact::magicLink($author_link);
+                       $event['plink']       = Contact::magicLink($author_link, $plink);
+
                        $html = self::getHTML($event);
                        $event['desc']     = BBCode::convert($event['desc']);
                        $event['location'] = BBCode::convert($event['location']);
@@ -890,8 +900,8 @@ class Event extends BaseObject
                // Construct the profile link (magic-auth).
                $profile_link = Contact::magicLinkById($item['author-id']);
 
-               $tpl = get_markup_template('event_stream_item.tpl');
-               $return = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('event_stream_item.tpl');
+               $return = Renderer::replaceMacros($tpl, [
                        '$id'             => $item['event-id'],
                        '$title'          => prepare_text($item['event-summary']),
                        '$dtstart_label'  => L10n::t('Starts:'),