Remove deprecated App::is_mobile/is_tablet - replace with DI::mode()->isMobile()...

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

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 91521808447ad472b8d3935474673685ff65d56c..0374c6bb7caf89af9647066c28bcb4c7f850a042 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -5,7 +5,6 @@
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -14,6 +13,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 use Friendica\Util\Strings;
@@ -22,7 +22,7 @@ use Friendica\Util\XML;
 /**
  * @brief functions for interacting with the event database table
  */
-class Event extends BaseObject
+class Event
 {
 
        public static function getHTML(array $event, $simple = false)
@@ -256,7 +256,7 @@ class Event extends BaseObject
                $event['deny_cid']  =        $arr['deny_cid']  ?? '';
                $event['deny_gid']  =        $arr['deny_gid']  ?? '';
                $event['adjust']    = intval($arr['adjust']    ?? 0);
-               $event['nofinish']  = intval(!empty($arr['nofinish'] || !empty($event['start']) && empty($event['finish'])));
+               $event['nofinish']  = intval($arr['nofinish'] ?? (!empty($event['start']) && empty($event['finish'])));
 
                $event['created']   = DateTimeFormat::utc(($arr['created'] ?? '') ?: 'now');
                $event['edited']    = DateTimeFormat::utc(($arr['edited']  ?? '') ?: 'now');
@@ -303,7 +303,7 @@ class Event extends BaseObject
 
                        $item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
                        if (DBA::isResult($item)) {
-                               $object = '<object><type>' . XML::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
+                               $object = '<object><type>' . XML::escape(Activity\ObjectType::EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
                                $object .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
                                $object .= '</object>' . "\n";
 
@@ -350,13 +350,13 @@ class Event extends BaseObject
                                $item_arr['deny_gid']      = $event['deny_gid'];
                                $item_arr['private']       = $private;
                                $item_arr['visible']       = 1;
-                               $item_arr['verb']          = ACTIVITY_POST;
-                               $item_arr['object-type']   = ACTIVITY_OBJ_EVENT;
+                               $item_arr['verb']          = Activity::POST;
+                               $item_arr['object-type']   = Activity\ObjectType::EVENT;
                                $item_arr['origin']        = $event['cid'] === 0 ? 1 : 0;
                                $item_arr['body']          = self::getBBCode($event);
                                $item_arr['event-id']      = $event['id'];
 
-                               $item_arr['object']  = '<object><type>' . XML::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
+                               $item_arr['object']  = '<object><type>' . XML::escape(Activity\ObjectType::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";
 
@@ -911,7 +911,7 @@ class Event extends BaseObject
                $tpl = Renderer::getMarkupTemplate('event_stream_item.tpl');
                $return = Renderer::replaceMacros($tpl, [
                        '$id'             => $item['event-id'],
-                       '$title'          => prepare_text($item['event-summary']),
+                       '$title'          => BBCode::convert($item['event-summary']),
                        '$dtstart_label'  => L10n::t('Starts:'),
                        '$dtstart_title'  => $dtstart_title,
                        '$dtstart_dt'     => $dtstart_dt,
@@ -929,7 +929,7 @@ class Event extends BaseObject
                        '$author_name'    => $item['author-name'],
                        '$author_link'    => $profile_link,
                        '$author_avatar'  => $item['author-avatar'],
-                       '$description'    => prepare_text($item['event-desc']),
+                       '$description'    => BBCode::convert($item['event-desc']),
                        '$location_label' => L10n::t('Location:'),
                        '$show_map_label' => L10n::t('Show map'),
                        '$hide_map_label' => L10n::t('Hide map'),
@@ -979,7 +979,7 @@ class Event extends BaseObject
                        }
                }
 
-               $location['name'] = prepare_text($location['name']);
+               $location['name'] = BBCode::convert($location['name']);
 
                // Construct the map HTML.
                if (isset($location['address'])) {