Implement functions

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

diff --git a/src/Model/Event.php b/src/Model/Event.php
index e9a4d4b3fd7d1792f5f44e3bb1c1208dc3f6a85e..1f0b44693faca304ddbd27af4725acc950332052 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -9,12 +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';
@@ -224,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);
        }
 
        /**
@@ -300,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::xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::xmlify($event['uri']) . '</id>';
+                               $object .= '<content>' . XML::xmlify(self::getBBCode($event)) . '</content>';
                                $object .= '</object>' . "\n";
 
                                $fields = ['body' => self::getBBCode($event), 'object' => $object, 'edited' => $event['edited']];
@@ -351,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::xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::xmlify($event['uri']) . '</id>';
+                       $item_arr['object'] .= '<content>' . XML::xmlify(self::getBBCode($event)) . '</content>';
                        $item_arr['object'] .= '</object>' . "\n";
 
                        $item_id = Item::insert($item_arr);
@@ -897,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:'),