X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FEvent.php;h=5f0238aad26635b97908a902fe4fb28a1a0c9269;hb=55e54bb9500f54bb075dcbc2054018de0969d9e7;hp=016d1f8d9e3974a47ec0197223a1ec4fda5ece83;hpb=a6996601d5260e4dde621f4d04b35adbbc3c10e0;p=friendica.git
diff --git a/src/Model/Event.php b/src/Model/Event.php
index 016d1f8d9e..5f0238aad2 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -7,18 +7,17 @@ namespace Friendica\Model;
use Friendica\BaseObject;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
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;
-
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/items.php';
+use Friendica\Util\Strings;
+use Friendica\Util\XML;
/**
* @brief functions for interacting with the event database table
@@ -34,13 +33,13 @@ class Event extends BaseObject
$bd_format = L10n::t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8 AM.
- $event_start = day_translate(
+ $event_start = L10n::getDay(
!empty($event['adjust']) ?
DateTimeFormat::local($event['start'], $bd_format) : DateTimeFormat::utc($event['start'], $bd_format)
);
if (!empty($event['finish'])) {
- $event_end = day_translate(
+ $event_end = L10n::getDay(
!empty($event['adjust']) ?
DateTimeFormat::local($event['finish'], $bd_format) : DateTimeFormat::utc($event['finish'], $bd_format)
);
@@ -50,11 +49,11 @@ class Event extends BaseObject
if ($simple) {
if (!empty($event['summary'])) {
- $o = "
" . BBCode::convert($event['summary'], false, $simple) . "
";
+ $o = "" . BBCode::convert(Strings::escapeHtml($event['summary']), false, $simple) . "
";
}
if (!empty($event['desc'])) {
- $o .= "" . BBCode::convert($event['desc'], false, $simple) . "
";
+ $o .= "" . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . "
";
}
$o .= "" . L10n::t('Starts:') . "
" . $event_start . "
";
@@ -64,7 +63,7 @@ class Event extends BaseObject
}
if (!empty($event['location'])) {
- $o .= "" . L10n::t('Location:') . "
" . BBCode::convert($event['location'], false, $simple) . "
";
+ $o .= "" . L10n::t('Location:') . "
" . BBCode::convert(Strings::escapeHtml($event['location']), false, $simple) . "
";
}
return $o;
@@ -72,7 +71,7 @@ class Event extends BaseObject
$o = '' . "\r\n";
- $o .= '
' . BBCode::convert($event['summary'], false, $simple) . '
' . "\r\n";
+ $o .= '
' . BBCode::convert(Strings::escapeHtml($event['summary']), false, $simple) . '
' . "\r\n";
$o .= '
' . L10n::t('Starts:') . ' ' . BBCode::convert($event['desc'], false, $simple) . '
' . "\r\n";
+ $o .= '
' . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . '
' . "\r\n";
}
if (!empty($event['location'])) {
$o .= '
' . L10n::t('Location:') . ' '
- . BBCode::convert($event['location'], false, $simple)
+ . BBCode::convert(Strings::escapeHtml($event['location']), false, $simple)
. '
' . "\r\n";
// Include a map of the location if the [map] BBCode is used.
@@ -224,7 +223,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);
}
/**
@@ -257,10 +256,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));
@@ -300,8 +299,8 @@ class Event extends BaseObject
$item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
if (DBA::isResult($item)) {
- $object = '