X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=695dbb290fa7cab17129f676d9133d391059427b;hb=f58d8f410885bb1895821cd0767bdf981629f0cd;hp=9462b36b0c8e81a50e5dfb3d4fde2c63f7deac47;hpb=35d06bd9ebee5bad76d81a1d434090f3e255e20f;p=friendica.git

diff --git a/mod/events.php b/mod/events.php
index 9462b36b0c..695dbb290f 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -12,10 +12,9 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 
-require_once 'include/bbcode.php';
-require_once 'include/datetime.php';
 require_once 'include/event.php';
 require_once 'include/items.php';
 
@@ -76,14 +75,14 @@ function events_post(App $a) {
 	}
 
 	if ($adjust) {
-		$start = Temporal::convert($start, 'UTC', date_default_timezone_get());
+		$start = DateTimeFormat::convert($start, 'UTC', date_default_timezone_get());
 		if (! $nofinish) {
-			$finish = Temporal::convert($finish, 'UTC', date_default_timezone_get());
+			$finish = DateTimeFormat::convert($finish, 'UTC', date_default_timezone_get());
 		}
 	} else {
-		$start = Temporal::utc($start);
+		$start = DateTimeFormat::utc($start);
 		if (! $nofinish) {
-			$finish = Temporal::utc($finish);
+			$finish = DateTimeFormat::utc($finish);
 		}
 	}
 
@@ -276,8 +275,8 @@ function events_content(App $a) {
 	// The view mode part is similiar to /mod/cal.php
 	if ($mode == 'view') {
 
-		$thisyear  = Temporal::convert('now', date_default_timezone_get(), 'UTC', 'Y');
-		$thismonth = Temporal::convert('now', date_default_timezone_get(), 'UTC', 'm');
+		$thisyear  = DateTimeFormat::localNow('Y');
+		$thismonth = DateTimeFormat::localNow('m');
 		if (! $y) {
 			$y = intval($thisyear);
 		}
@@ -310,7 +309,7 @@ function events_content(App $a) {
 			$prevyear --;
 		}
 
-		$dim    = get_dim($y, $m);
+		$dim    = Temporal::getDaysInMonth($y, $m);
 		$start  = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
 		$finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
 
@@ -323,11 +322,11 @@ function events_content(App $a) {
 			}
 		}
 
-		$start  = Temporal::utc($start);
-		$finish = Temporal::utc($finish);
+		$start  = DateTimeFormat::utc($start);
+		$finish = DateTimeFormat::utc($finish);
 
-		$adjust_start  = Temporal::convert($start, date_default_timezone_get());
-		$adjust_finish = Temporal::convert($finish, date_default_timezone_get());
+		$adjust_start  = DateTimeFormat::local($start);
+		$adjust_finish = DateTimeFormat::local($finish);
 
 		// put the event parametes in an array so we can better transmit them
 		$event_params = [
@@ -351,7 +350,7 @@ function events_content(App $a) {
 		if (DBM::is_result($r)) {
 			$r = sort_by_date($r);
 			foreach ($r as $rr) {
-				$j = $rr['adjust'] ? Temporal::convert($rr['start'], date_default_timezone_get(), 'UTC', 'j') : Temporal::utc($rr['start'], 'j');
+				$j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
 				if (! x($links,$j)) {
 					$links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
 				}
@@ -395,7 +394,7 @@ function events_content(App $a) {
 			'$new_event' => [System::baseUrl() . '/events/new', L10n::t('Create New Event'), '', ''],
 			'$previous'  => [System::baseUrl() . '/events/$prevyear/$prevmonth', L10n::t('Previous'), '', ''],
 			'$next'      => [System::baseUrl() . '/events/$nextyear/$nextmonth', L10n::t('Next'), '', ''],
-			'$calendar'  => cal($y, $m, $links, ' eventcal'),
+			'$calendar'  => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
 
 			'$events'    => $events,
 
@@ -465,19 +464,19 @@ function events_content(App $a) {
 			$tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
 		}
 
-		$syear  = Temporal::convert($sdt, $tz, 'UTC', 'Y');
-		$smonth = Temporal::convert($sdt, $tz, 'UTC', 'm');
-		$sday   = Temporal::convert($sdt, $tz, 'UTC', 'd');
+		$syear  = DateTimeFormat::convert($sdt, $tz, 'UTC', 'Y');
+		$smonth = DateTimeFormat::convert($sdt, $tz, 'UTC', 'm');
+		$sday   = DateTimeFormat::convert($sdt, $tz, 'UTC', 'd');
 
-		$shour   = ((x($orig_event)) ? Temporal::convert($sdt, $tz, 'UTC', 'H') : 0);
-		$sminute = ((x($orig_event)) ? Temporal::convert($sdt, $tz, 'UTC', 'i') : 0);
+		$shour   = ((x($orig_event)) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00');
+		$sminute = ((x($orig_event)) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00');
 
-		$fyear  = Temporal::convert($fdt, $tz, 'UTC', 'Y');
-		$fmonth = Temporal::convert($fdt, $tz, 'UTC', 'm');
-		$fday   = Temporal::convert($fdt, $tz, 'UTC', 'd');
+		$fyear  = DateTimeFormat::convert($fdt, $tz, 'UTC', 'Y');
+		$fmonth = DateTimeFormat::convert($fdt, $tz, 'UTC', 'm');
+		$fday   = DateTimeFormat::convert($fdt, $tz, 'UTC', 'd');
 
-		$fhour   = ((x($orig_event)) ? Temporal::convert($fdt, $tz, 'UTC', 'H') : 0);
-		$fminute = ((x($orig_event)) ? Temporal::convert($fdt, $tz, 'UTC', 'i') : 0);
+		$fhour   = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00');
+		$fminute = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00');
 
 		require_once 'include/acl_selectors.php' ;
 
@@ -510,11 +509,11 @@ function events_content(App $a) {
 			'$title' => L10n::t('Event details'),
 			'$desc' => L10n::t('Starting date and Title are required.'),
 			'$s_text' => L10n::t('Event Starts:') . ' <span class="required" title="' . L10n::t('Required') . '">*</span>',
-			'$s_dsel' => datetimesel(new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), L10n::t('Event Starts:'), 'start_text', true, true, '', '', true),
+			'$s_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), L10n::t('Event Starts:'), 'start_text', true, true, '', '', true),
 			'$n_text' => L10n::t('Finish date/time is not known or not relevant'),
 			'$n_checked' => $n_checked,
 			'$f_text' => L10n::t('Event Finishes:'),
-			'$f_dsel' => datetimesel(new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), L10n::t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
+			'$f_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), L10n::t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
 			'$a_text' => L10n::t('Adjust for viewer timezone'),
 			'$a_checked' => $a_checked,
 			'$d_text' => L10n::t('Description:'),
@@ -550,7 +549,7 @@ function events_content(App $a) {
 
 		// Delete only real events (no birthdays)
 		if (DBM::is_result($ev) && $ev[0]['type'] == 'event') {
-			$del = Item::delete($ev[0]['itemid']);
+			$del = Item::deleteById($ev[0]['itemid']);
 		}
 
 		if ($del == 0) {