X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fevent.php;h=1c34e03cc686e7f0e2e8e15d9a58adf57aa8413a;hb=2f463dfb17ac1ca554bd935c2a6529c577a1c21f;hp=647697e5a0f66c1762b80775ca119aca58ee29c7;hpb=e5a5a7dc7bd8888897e8959a89cc21922580e5e4;p=friendica.git

diff --git a/include/event.php b/include/event.php
index 647697e5a0..1c34e03cc6 100644
--- a/include/event.php
+++ b/include/event.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\Content\Feature;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -15,8 +16,6 @@ use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 
-require_once 'include/bbcode.php';
-require_once 'include/datetime.php';
 require_once 'include/conversation.php';
 
 function format_event_html($ev, $simple = false) {
@@ -39,9 +38,9 @@ function format_event_html($ev, $simple = false) {
 	);
 
 	if ($simple) {
-		$o = "<h3>" . bbcode($ev['summary']) . "</h3>";
+		$o = "<h3>" . BBCode::convert($ev['summary']) . "</h3>";
 
-		$o .= "<div>" . bbcode($ev['desc']) . "</div>";
+		$o .= "<div>" . BBCode::convert($ev['desc']) . "</div>";
 
 		$o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
 
@@ -58,7 +57,7 @@ function format_event_html($ev, $simple = false) {
 
 	$o = '<div class="vevent">' . "\r\n";
 
-	$o .= '<div class="summary event-summary">' . bbcode($ev['summary']) . '</div>' . "\r\n";
+	$o .= '<div class="summary event-summary">' . BBCode::convert($ev['summary']) . '</div>' . "\r\n";
 
 	$o .= '<div class="event-start"><span class="event-label">' . L10n::t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
 		. DateTimeFormat::utc($ev['start'], (($ev['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s' ))
@@ -72,11 +71,11 @@ function format_event_html($ev, $simple = false) {
 			. '</span></div>' . "\r\n";
 	}
 
-	$o .= '<div class="description event-description">' . bbcode($ev['desc']) . '</div>' . "\r\n";
+	$o .= '<div class="description event-description">' . BBCode::convert($ev['desc']) . '</div>' . "\r\n";
 
 	if (strlen($ev['location'])) {
 		$o .= '<div class="event-location"><span class="event-label">' . L10n::t('Location:') . '</span>&nbsp;<span class="location">'
-			. bbcode($ev['location'])
+			. BBCode::convert($ev['location'])
 			. '</span></div>' . "\r\n";
 
 		// Include a map of the location if the [map] BBCode is used.
@@ -238,9 +237,7 @@ function event_delete($event_id) {
  */
 function event_store($arr) {
 
-	require_once 'include/datetime.php';
 	require_once 'include/items.php';
-	require_once 'include/bbcode.php';
 
 	$a = get_app();
 
@@ -320,13 +317,8 @@ function event_store($arr) {
 			$object .= '<content>' . xmlify(format_event_bbcode($arr)) . '</content>';
 			$object .= '</object>' . "\n";
 
-			q("UPDATE `item` SET `body` = '%s', `object` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d",
-				dbesc(format_event_bbcode($arr)),
-				dbesc($object),
-				dbesc($arr['edited']),
-				intval($r[0]['id']),
-				intval($arr['uid'])
-			);
+			$fields = ['body' => format_event_bbcode($arr), 'object' => $object, 'edited' => $arr['edited']];
+			Item::update($fields, ['id' => $r[0]['id']]);
 
 			$item_id = $r[0]['id'];
 		} else {
@@ -404,11 +396,7 @@ function event_store($arr) {
 
 		$item_id = Item::insert($item_arr);
 		if ($item_id) {
-			q("UPDATE `item` SET `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
-				intval($event['id']),
-				intval($arr['uid']),
-				intval($item_id)
-			);
+			Item::update(['event-id' => $event['id']], ['id' => $item_id]);
 		}
 
 		Addon::callHooks("event_created", $event['id']);
@@ -621,15 +609,15 @@ function process_events($arr) {
 				$drop = [System::baseUrl() . '/events/drop/' . $rr['id'], L10n::t('Delete event'), '', ''];
 			}
 
-			$title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
+			$title = strip_tags(html_entity_decode(BBCode::convert($rr['summary']), ENT_QUOTES, 'UTF-8'));
 			if (! $title) {
-				list($title, $_trash) = explode("<br", bbcode($rr['desc']), 2);
+				list($title, $_trash) = explode("<br", BBCode::convert($rr['desc']), 2);
 				$title = strip_tags(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
 			}
 
 			$html = format_event_html($rr);
-			$rr['desc'] = bbcode($rr['desc']);
-			$rr['location'] = bbcode($rr['location']);
+			$rr['desc'] = BBCode::convert($rr['desc']);
+			$rr['location'] = BBCode::convert($rr['location']);
 			$events[] = [
 				'id'     => $rr['id'],
 				'start'  => $start,