X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=a1ffcfc1c6d61ff17eb56400c9d068b4e191fad6;hb=391c5913227c7f62f19b4f08906b0b1b0b618b33;hp=b72c8f1884e32f1fe87fd5f211e626952ee19b7b;hpb=2ad162f991fdd32122b029398b9ab9e8801c0462;p=friendica.git

diff --git a/mod/events.php b/mod/events.php
index b72c8f1884..a1ffcfc1c6 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -3,12 +3,14 @@
  * @file mod/events.php
  * @brief The events module
  */
-
 use Friendica\App;
+use Friendica\Content\Nav;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
+use Friendica\Model\Item;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
@@ -20,7 +22,7 @@ function events_init(App $a) {
 		return;
 	}
 
-	if ($a->argc == 1) {
+	if ($a->argc > 1) {
 		// If it's a json request abort here because we don't
 		// need the widget data
 		if ($a->argv[1] === 'json') {
@@ -150,7 +152,7 @@ function events_post(App $a) {
 	}
 
 
-	$datarray = array();
+	$datarray = [];
 	$datarray['guid']      = get_guid(32);
 	$datarray['start']     = $start;
 	$datarray['finish']    = $finish;
@@ -180,7 +182,7 @@ function events_post(App $a) {
 	$item_id = event_store($datarray);
 
 	if (! $cid) {
-		Worker::add(PRIORITY_HIGH, "notifier", "event", $item_id);
+		Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
 	}
 
 	goaway($_SESSION['return_url']);
@@ -212,31 +214,32 @@ function events_content(App $a) {
 	}
 
 	if ($a->theme_events_in_profile) {
-		nav_set_selected('home');
+		Nav::setSelected('home');
 	} else {
-		nav_set_selected('events');
+		Nav::setSelected('events');
 	}
 
 	// get the translation strings for the callendar
 	$i18n = get_event_strings();
 
 	$htpl = get_markup_template('event_head.tpl');
-	$a->page['htmlhead'] .= replace_macros($htpl, array(
+	$a->page['htmlhead'] .= replace_macros($htpl, [
 		'$baseurl' => System::baseUrl(),
 		'$module_url' => '/events',
 		'$modparams' => 1,
 		'$i18n' => $i18n,
-	));
+	]);
 
 	$etpl = get_markup_template('event_end.tpl');
-	$a->page['end'] .= replace_macros($etpl, array(
+	$a->page['end'] .= replace_macros($etpl, [
 		'$baseurl' => System::baseUrl(),
-	));
+	]);
 
 	$o = '';
+	$tabs = '';
 	// tabs
 	if ($a->theme_events_in_profile) {
-		$tabs = profile_tabs($a, true);
+		$tabs = Profile::getTabs($a, true);
 	}
 
 	$mode = 'view';
@@ -309,10 +312,13 @@ function events_content(App $a) {
 		$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);
 
-
-		if ($a->argv[1] === 'json') {
-			if (x($_GET, 'start')) {$start  = $_GET['start'];}
-			if (x($_GET, 'end'))   {$finish = $_GET['end'];}
+		if ($a->argc > 1 && $a->argv[1] === 'json') {
+			if (x($_GET, 'start')) {
+				$start  = $_GET['start'];
+			}
+			if (x($_GET, 'end'))   {
+				$finish = $_GET['end'];
+			}
 		}
 
 		$start  = datetime_convert('UTC', 'UTC', $start);
@@ -322,14 +328,14 @@ function events_content(App $a) {
 		$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
 
 		// put the event parametes in an array so we can better transmit them
-		$event_params = array(
+		$event_params = [
 			'event_id'      => (x($_GET, 'id') ? $_GET['id'] : 0),
 			'start'         => $start,
 			'finish'        => $finish,
 			'adjust_start'  => $adjust_start,
 			'adjust_finish' => $adjust_finish,
 			'ignored'       => $ignored,
-		);
+		];
 
 		// get events by id or by date
 		if (x($_GET, 'id')) {
@@ -338,7 +344,7 @@ function events_content(App $a) {
 			$r = events_by_date(local_user(), $event_params);
 		}
 
-		$links = array();
+		$links = [];
 
 		if (DBM::is_result($r)) {
 			$r = sort_by_date($r);
@@ -350,7 +356,7 @@ function events_content(App $a) {
 			}
 		}
 
-		$events = array();
+		$events = [];
 
 		// transform the event in a usable array
 		if (DBM::is_result($r)) {
@@ -358,7 +364,7 @@ function events_content(App $a) {
 			$events = process_events($r);
 		}
 
-		if ($a->argv[1] === 'json'){
+		if ($a->argc > 1 && $a->argv[1] === 'json'){
 			echo json_encode($events);
 			killme();
 		}
@@ -371,7 +377,7 @@ function events_content(App $a) {
 
 		// Get rid of dashes in key names, Smarty3 can't handle them
 		foreach ($events as $key => $event) {
-			$event_item = array();
+			$event_item = [];
 			foreach ($event['item'] as $k => $v) {
 				$k = str_replace('-' ,'_', $k);
 				$event_item[$k] = $v;
@@ -379,14 +385,14 @@ function events_content(App $a) {
 			$events[$key]['item'] = $event_item;
 		}
 
-		$o = replace_macros($tpl, array(
+		$o = replace_macros($tpl, [
 			'$baseurl'   => System::baseUrl(),
 			'$tabs'      => $tabs,
 			'$title'     => t('Events'),
 			'$view'      => t('View'),
-			'$new_event' => array(System::baseUrl() . '/events/new', t('Create New Event'), '', ''),
-			'$previous'  => array(System::baseUrl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
-			'$next'      => array(System::baseUrl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
+			'$new_event' => [System::baseUrl() . '/events/new', t('Create New Event'), '', ''],
+			'$previous'  => [System::baseUrl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''],
+			'$next'      => [System::baseUrl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''],
 			'$calendar'  => cal($y, $m, $links, ' eventcal'),
 
 			'$events'    => $events,
@@ -396,7 +402,7 @@ function events_content(App $a) {
 			'$week'  => t('week'),
 			'$day'   => t('day'),
 			'$list'  => t('list'),
-		));
+		]);
 
 		if (x($_GET, 'id')) {
 			echo $o;
@@ -417,8 +423,8 @@ function events_content(App $a) {
 	}
 
 	// Passed parameters overrides anything found in the DB
-	if (in_array($mode, array('edit', 'new', 'copy'))) {
-		if (!x($orig_event)) {$orig_event = array();}
+	if (in_array($mode, ['edit', 'new', 'copy'])) {
+		if (!x($orig_event)) {$orig_event = [];}
 		// In case of an error the browser is redirected back here, with these parameters filled in with the previous values
 		if (x($_REQUEST, 'nofinish'))    {$orig_event['nofinish']    = $_REQUEST['nofinish'];}
 		if (x($_REQUEST, 'adjust'))      {$orig_event['adjust']      = $_REQUEST['adjust'];}
@@ -471,11 +477,6 @@ function events_content(App $a) {
 		$fhour   = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
 		$fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
 
-		$f = Config::get('system','event_input_format');
-		if (! $f) {
-			$f = 'ymd';
-		}
-
 		require_once 'include/acl_selectors.php' ;
 
 		$perms = get_acl_permissions($orig_event);
@@ -493,7 +494,7 @@ function events_content(App $a) {
 
 		$tpl = get_markup_template('event_form.tpl');
 
-		$o .= replace_macros($tpl,array(
+		$o .= replace_macros($tpl,[
 			'$post' => System::baseUrl() . '/events',
 			'$eid'  => $eid,
 			'$cid'  => $cid,
@@ -507,11 +508,11 @@ function events_content(App $a) {
 			'$title' => t('Event details'),
 			'$desc' => t('Starting date and Title are required.'),
 			'$s_text' => t('Event Starts:') . ' <span class="required" title="' . t('Required') . '">*</span>',
-			'$s_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), t('Event Starts:'), 'start_text', true, true, '', '', true),
+			'$s_dsel' => datetimesel(new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), t('Event Starts:'), 'start_text', true, true, '', '', true),
 			'$n_text' => t('Finish date/time is not known or not relevant'),
 			'$n_checked' => $n_checked,
 			'$f_text' => t('Event Finishes:'),
-			'$f_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
+			'$f_dsel' => datetimesel(new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
 			'$a_text' => t('Adjust for viewer timezone'),
 			'$a_checked' => $a_checked,
 			'$d_text' => t('Description:'),
@@ -520,12 +521,12 @@ function events_content(App $a) {
 			'$l_orig' => $l_orig,
 			'$t_text' => t('Title:') . ' <span class="required" title="' . t('Required') . '">*</span>',
 			'$t_orig' => $t_orig,
-			'$summary' => array('summary', t('Title:'), $t_orig, '', '*'),
+			'$summary' => ['summary', t('Title:'), $t_orig, '', '*'],
 			'$sh_text' => t('Share this event'),
-			'$share' => array('share', t('Share this event'), $sh_checked, '', $sh_disabled),
+			'$share' => ['share', t('Share this event'), $sh_checked, '', $sh_disabled],
 			'$sh_checked' => $sh_checked,
-			'$nofinish' => array('nofinish', t('Finish date/time is not known or not relevant'), $n_checked),
-			'$adjust' => array('adjust', t('Adjust for viewer timezone'), $a_checked),
+			'$nofinish' => ['nofinish', t('Finish date/time is not known or not relevant'), $n_checked],
+			'$adjust' => ['adjust', t('Adjust for viewer timezone'), $a_checked],
 			'$preview' => t('Preview'),
 			'$acl' => $acl,
 			'$submit' => t('Submit'),
@@ -533,7 +534,7 @@ function events_content(App $a) {
 			'$advanced' => t('Advanced'),
 			'$permissions' => t('Permissions'),
 
-		));
+		]);
 
 		return $o;
 	}
@@ -542,12 +543,12 @@ function events_content(App $a) {
 	if ($mode === 'drop' && $event_id) {
 		$del = 0;
 
-		$params = array('event_id' => ($event_id));
+		$params = ['event_id' => ($event_id)];
 		$ev = event_by_id(local_user(), $params);
 
 		// Delete only real events (no birthdays)
 		if (DBM::is_result($ev) && $ev[0]['type'] == 'event') {
-			$del = drop_item($ev[0]['itemid'], false);
+			$del = Item::delete($ev[0]['itemid']);
 		}
 
 		if ($del == 0) {