X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FEvent.php;h=d8657c1e9a61a2c706fde9c89131150ba8f0fa58;hb=8adc761da0e6012aa0176047812df15adb15c33a;hp=4392686a592955a22251648b15b503b23ed1cda3;hpb=0ec44f3e8a73229c3aadea86f61b5571a701c6b7;p=friendica.git
diff --git a/src/Model/Event.php b/src/Model/Event.php
index 4392686a59..d8657c1e9a 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -7,17 +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\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
@@ -33,20 +33,30 @@ 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['adjust'] ?
+ $event_start = L10n::getDay(
+ !empty($event['adjust']) ?
DateTimeFormat::local($event['start'], $bd_format) : DateTimeFormat::utc($event['start'], $bd_format)
);
- $event_end = day_translate(
- $event['adjust'] ?
- DateTimeFormat::local($event['finish'], $bd_format) : DateTimeFormat::utc($event['finish'], $bd_format)
- );
+ if (!empty($event['finish'])) {
+ $event_end = L10n::getDay(
+ !empty($event['adjust']) ?
+ DateTimeFormat::local($event['finish'], $bd_format) : DateTimeFormat::utc($event['finish'], $bd_format)
+ );
+ } else {
+ $event_end = '';
+ }
if ($simple) {
- $o = "
" . BBCode::convert($event['desc'], false, $simple) . "
";
+ if (!empty($event['summary'])) {
+ $o .= "" . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . "
";
+ }
$o .= "" . $event_start . "
";
@@ -54,8 +64,8 @@ class Event extends BaseObject
$o .= "" . $event_end . "
";
}
- if (strlen($event['location'])) {
- $o .= "" . BBCode::convert($event['location'], false, $simple) . "
";
+ if (!empty($event['location'])) {
+ $o .= "" . BBCode::convert(Strings::escapeHtml($event['location']), false, $simple) . "
";
}
return $o;
@@ -63,25 +73,27 @@ 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:') . ' ' . $event_start
. '
' . "\r\n";
if (!$event['nofinish']) {
$o .= '
' . L10n::t('Finishes:') . ' ' . $event_end
. '
' . "\r\n";
}
- $o .= '
' . BBCode::convert($event['desc'], false, $simple) . '
' . "\r\n";
+ if (!empty($event['desc'])) {
+ $o .= '
' . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . '
' . "\r\n";
+ }
- if (strlen($event['location'])) {
+ 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.
@@ -138,6 +150,7 @@ class Event extends BaseObject
* @brief Extract bbcode formatted event data from a string.
*
* @params: string $s The string which should be parsed for event data.
+ * @param $text
* @return array The array with the event information.
*/
public static function fromBBCode($text)
@@ -205,6 +218,7 @@ class Event extends BaseObject
*
* @param int $event_id Event ID.
* @return void
+ * @throws \Exception
*/
public static function delete($event_id)
{
@@ -213,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);
}
/**
@@ -223,16 +237,16 @@ class Event extends BaseObject
*
* @param array $arr Array with event data.
* @return int The new event id.
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function store($arr)
{
- $a = self::getApp();
-
$event = [];
$event['id'] = intval(defaults($arr, 'id' , 0));
$event['uid'] = intval(defaults($arr, 'uid' , 0));
$event['cid'] = intval(defaults($arr, 'cid' , 0));
- $event['uri'] = defaults($arr, 'uri' , Item::newURI($event['uid']));
+ $event['guid'] = defaults($arr, 'guid' , System::createUUID());
+ $event['uri'] = defaults($arr, 'uri' , Item::newURI($event['uid'], $event['guid']));
$event['type'] = defaults($arr, 'type' , 'event');
$event['summary'] = defaults($arr, 'summary' , '');
$event['desc'] = defaults($arr, 'desc' , '');
@@ -246,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));
@@ -266,11 +280,11 @@ class Event extends BaseObject
if ($event['id']) {
// has the event actually changed?
$existing_event = DBA::selectFirst('event', ['edited'], ['id' => $event['id'], 'uid' => $event['uid']]);
- if (!DBA::is_result($existing_event) || ($existing_event['edited'] === $event['edited'])) {
+ if (!DBA::isResult($existing_event) || ($existing_event['edited'] === $event['edited'])) {
$item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
- return DBA::is_result($item) ? $item['id'] : 0;
+ return DBA::isResult($item) ? $item['id'] : 0;
}
$updated_fields = [
@@ -288,9 +302,9 @@ class Event extends BaseObject
DBA::update('event', $updated_fields, ['id' => $event['id'], 'uid' => $event['uid']]);
$item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
- if (DBA::is_result($item)) {
- $object = '