X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=60e7b9f39076bf40c7b361afc05ebe9e987b7d5b;hb=c6277806005dac31cab8c1427ab292f2f67e1a34;hp=ac0c444cb5068c1b6923e91edfd5bb7d176259b1;hpb=45ebeba643a6d600e8778475f70f827f32bf3146;p=friendica.git

diff --git a/mod/events.php b/mod/events.php
index ac0c444cb5..60e7b9f390 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @fiel mod/events.php
+ * @file mod/events.php
  * @brief The events module
  */
-require_once('include/bbcode.php');
-require_once('include/datetime.php');
-require_once('include/event.php');
-require_once('include/items.php');
+require_once 'include/bbcode.php';
+require_once 'include/datetime.php';
+require_once 'include/event.php';
+require_once 'include/items.php';
 
 function events_init(App $a) {
 	if (! local_user()) {
@@ -14,10 +14,11 @@ function events_init(App $a) {
 	}
 
 	if ($a->argc == 1) {
-		// if it's a json request abort here becaus we don't
+		// If it's a json request abort here because we don't
 		// need the widget data
-		if ($a->argv[1] === 'json')
+		if ($a->argv[1] === 'json') {
 			return;
+		}
 
 		$cal_widget = widget_events();
 
@@ -33,17 +34,17 @@ function events_init(App $a) {
 
 function events_post(App $a) {
 
-	logger('post: ' . print_r($_REQUEST,true));
+	logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
 
 	if (! local_user()) {
 		return;
 	}
 
-	$event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0);
-	$cid = ((x($_POST,'cid')) ? intval($_POST['cid']) : 0);
-	$uid      = local_user();
+	$event_id = ((x($_POST, 'event_id')) ? intval($_POST['event_id']) : 0);
+	$cid = ((x($_POST, 'cid')) ? intval($_POST['cid']) : 0);
+	$uid = local_user();
 
-	$start_text = escape_tags($_REQUEST['start_text']);
+	$start_text  = escape_tags($_REQUEST['start_text']);
 	$finish_text = escape_tags($_REQUEST['finish_text']);
 
 	$adjust   = intval($_POST['adjust']);
@@ -52,34 +53,26 @@ function events_post(App $a) {
 	// The default setting for the `private` field in event_store() is false, so mirror that
 	$private_event = false;
 
+	$start  = NULL_DATE;
+	$finish = NULL_DATE;
+
 	if ($start_text) {
 		$start = $start_text;
 	}
-	else {
-		$start    = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
-	}
-
-	if ($nofinish) {
-		$finish = '0000-00-00 00:00:00';
-	}
 
 	if ($finish_text) {
 		$finish = $finish_text;
 	}
-	else {
-		$finish    = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
-	}
 
 	if ($adjust) {
-		$start = datetime_convert(date_default_timezone_get(),'UTC',$start);
+		$start = datetime_convert(date_default_timezone_get(), 'UTC', $start);
 		if (! $nofinish) {
-			$finish = datetime_convert(date_default_timezone_get(),'UTC',$finish);
+			$finish = datetime_convert(date_default_timezone_get(), 'UTC', $finish);
 		}
-	}
-	else {
-		$start = datetime_convert('UTC','UTC',$start);
+	} else {
+		$start = datetime_convert('UTC', 'UTC', $start);
 		if (! $nofinish) {
-			$finish = datetime_convert('UTC','UTC',$finish);
+			$finish = datetime_convert('UTC', 'UTC', $finish);
 		}
 	}
 
@@ -96,19 +89,19 @@ function events_post(App $a) {
 	$action = ($event_id == '') ? 'new' : "event/" . $event_id;
 	$onerror_url = App::get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
 
-	if (strcmp($finish,$start) < 0 && !$nofinish) {
-		notice( t('Event can not end before it has started.') . EOL);
+	if (strcmp($finish, $start) < 0 && !$nofinish) {
+		notice(t('Event can not end before it has started.') . EOL);
 		if (intval($_REQUEST['preview'])) {
-			echo( t('Event can not end before it has started.'));
+			echo t('Event can not end before it has started.');
 			killme();
 		}
 		goaway($onerror_url);
 	}
 
-	if((! $summary) || (! $start)) {
-		notice( t('Event title and start time are required.') . EOL);
-		if(intval($_REQUEST['preview'])) {
-			echo( t('Event title and start time are required.'));
+	if ((! $summary) || ($start === NULL_DATE)) {
+		notice(t('Event title and start time are required.') . EOL);
+		if (intval($_REQUEST['preview'])) {
+			echo t('Event title and start time are required.');
 			killme();
 		}
 		goaway($onerror_url);
@@ -116,35 +109,33 @@ function events_post(App $a) {
 
 	$share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0);
 
-	$c = q("select id from contact where uid = %d and self = 1 limit 1",
+	$c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
 		intval(local_user())
 	);
-	if(count($c))
+	if (count($c)) {
 		$self = $c[0]['id'];
-	else
+	} else {
 		$self = 0;
+	}
 
 
-	if($share) {
+	if ($share) {
 		$str_group_allow   = perms2str($_POST['group_allow']);
 		$str_contact_allow = perms2str($_POST['contact_allow']);
 		$str_group_deny    = perms2str($_POST['group_deny']);
 		$str_contact_deny  = perms2str($_POST['contact_deny']);
 
 		// Undo the pseudo-contact of self, since there are real contacts now
-		if( strpos($str_contact_allow, '<' . $self . '>') !== false )
-		{
+		if (strpos($str_contact_allow, '<' . $self . '>') !== false ) {
 			$str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow);
 		}
 		// Make sure to set the `private` field as true. This is necessary to
 		// have the posts show up correctly in Diaspora if an event is created
 		// as visible only to self at first, but then edited to display to others.
-		if( strlen($str_group_allow) or strlen($str_contact_allow) or strlen($str_group_deny) or strlen($str_contact_deny) )
-		{
+		if (strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) {
 			$private_event = true;
 		}
-	}
-	else {
+	} else {
 		// Note: do not set `private` field for self-only events. It will
 		// keep even you from seeing them!
 		$str_contact_allow = '<' . $self . '>';
@@ -153,46 +144,45 @@ function events_post(App $a) {
 
 
 	$datarray = array();
-	$datarray['guid'] = get_guid(32);
-	$datarray['start'] = $start;
-	$datarray['finish'] = $finish;
-	$datarray['summary'] = $summary;
-	$datarray['desc'] = $desc;
-	$datarray['location'] = $location;
-	$datarray['type'] = $type;
-	$datarray['adjust'] = $adjust;
-	$datarray['nofinish'] = $nofinish;
-	$datarray['uid'] = $uid;
-	$datarray['cid'] = $cid;
+	$datarray['guid']      = get_guid(32);
+	$datarray['start']     = $start;
+	$datarray['finish']    = $finish;
+	$datarray['summary']   = $summary;
+	$datarray['desc']      = $desc;
+	$datarray['location']  = $location;
+	$datarray['type']      = $type;
+	$datarray['adjust']    = $adjust;
+	$datarray['nofinish']  = $nofinish;
+	$datarray['uid']       = $uid;
+	$datarray['cid']       = $cid;
 	$datarray['allow_cid'] = $str_contact_allow;
 	$datarray['allow_gid'] = $str_group_allow;
-	$datarray['deny_cid'] = $str_contact_deny;
-	$datarray['deny_gid'] = $str_group_deny;
-	$datarray['private'] = (($private_event) ? 1 : 0);
-	$datarray['id'] = $event_id;
-	$datarray['created'] = $created;
-	$datarray['edited'] = $edited;
-
-	if(intval($_REQUEST['preview'])) {
+	$datarray['deny_cid']  = $str_contact_deny;
+	$datarray['deny_gid']  = $str_group_deny;
+	$datarray['private']   = (($private_event) ? 1 : 0);
+	$datarray['id']        = $event_id;
+	$datarray['created']   = $created;
+	$datarray['edited']    = $edited;
+
+	if (intval($_REQUEST['preview'])) {
 		$html = format_event_html($datarray);
 		echo $html;
-			killme();
+		killme();
 	}
 
 	$item_id = event_store($datarray);
 
-	if(! $cid)
+	if (! $cid) {
 		proc_run(PRIORITY_HIGH, "include/notifier.php", "event", $item_id);
+	}
 
 	goaway($_SESSION['return_url']);
 }
 
-
-
 function events_content(App $a) {
 
 	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
+		notice(t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -201,14 +191,14 @@ function events_content(App $a) {
 	}
 
 	if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
-		$r = q("update event set ignore = 1 where id = %d and uid = %d",
+		$r = q("UPDATE `event` SET `ignore` = 1 WHERE `id` = %d AND `uid` = %d",
 			intval($a->argv[2]),
 			intval(local_user())
 		);
 	}
 
 	if (($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) {
-		$r = q("update event set ignore = 0 where id = %d and uid = %d",
+		$r = q("UPDATE `event` SET `ignore` = 0 WHERE `id` = %d AND `uid` = %d",
 			intval($a->argv[2]),
 			intval(local_user())
 		);
@@ -224,7 +214,7 @@ function events_content(App $a) {
 	$i18n = get_event_strings();
 
 	$htpl = get_markup_template('event_head.tpl');
-	$a->page['htmlhead'] .= replace_macros($htpl,array(
+	$a->page['htmlhead'] .= replace_macros($htpl, array(
 		'$baseurl' => App::get_baseurl(),
 		'$module_url' => '/events',
 		'$modparams' => 1,
@@ -232,27 +222,30 @@ function events_content(App $a) {
 	));
 
 	$etpl = get_markup_template('event_end.tpl');
-	$a->page['end'] .= replace_macros($etpl,array(
+	$a->page['end'] .= replace_macros($etpl, array(
 		'$baseurl' => App::get_baseurl(),
 	));
 
-	$o ="";
+	$o = '';
 	// tabs
-	if ($a->theme_events_in_profile)
-		$tabs = profile_tabs($a, True);
-
-
+	if ($a->theme_events_in_profile) {
+		$tabs = profile_tabs($a, true);
+	}
 
 	$mode = 'view';
 	$y = 0;
 	$m = 0;
-	$ignored = ((x($_REQUEST,'ignored')) ? intval($_REQUEST['ignored']) : 0);
+	$ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0);
 
-	if($a->argc > 1) {
+	if ($a->argc > 1) {
 		if ($a->argc > 2 && $a->argv[1] == 'event') {
 			$mode = 'edit';
 			$event_id = intval($a->argv[2]);
 		}
+		if ($a->argc > 2 && $a->argv[1] == 'drop') {
+			$mode = 'drop';
+			$event_id = intval($a->argv[2]);
+		}
 		if ($a->argv[1] === 'new') {
 			$mode = 'new';
 			$event_id = 0;
@@ -267,9 +260,8 @@ function events_content(App $a) {
 	// The view mode part is similiar to /mod/cal.php
 	if ($mode == 'view') {
 
-
-		$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
-		$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
+		$thisyear  = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
+		$thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
 		if (! $y) {
 			$y = intval($thisyear);
 		}
@@ -289,47 +281,47 @@ function events_content(App $a) {
 
 		$nextyear = $y;
 		$nextmonth = $m + 1;
-		if($nextmonth > 12) {
-				$nextmonth = 1;
+		if ($nextmonth > 12) {
+			$nextmonth = 1;
 			$nextyear ++;
 		}
 
 		$prevyear = $y;
-		if($m > 1)
+		if ($m > 1) {
 			$prevmonth = $m - 1;
-		else {
+		} else {
 			$prevmonth = 12;
 			$prevyear --;
 		}
 
-		$dim    = get_dim($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);
+		$dim    = get_dim($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);
 
 
-		if ($a->argv[1] === 'json'){
-			if (x($_GET,'start'))	$start = $_GET['start'];
-			if (x($_GET,'end'))	$finish = $_GET['end'];
+		if ($a->argv[1] === 'json') {
+			if (x($_GET, 'start')) {$start  = $_GET['start'];}
+			if (x($_GET, 'end'))   {$finish = $_GET['end'];}
 		}
 
-		$start  = datetime_convert('UTC','UTC',$start);
-		$finish = datetime_convert('UTC','UTC',$finish);
+		$start  = datetime_convert('UTC', 'UTC', $start);
+		$finish = datetime_convert('UTC', 'UTC', $finish);
 
-		$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
+		$adjust_start  = datetime_convert('UTC', date_default_timezone_get(), $start);
 		$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_id' => (x($_GET,'id') ? $_GET["id"] : 0),
-			'start' => $start,
-			'finish' => $finish,
-			'adjust_start' => $adjust_start,
+			'event_id'      => (x($_GET, 'id') ? $_GET['id'] : 0),
+			'start'         => $start,
+			'finish'        => $finish,
+			'adjust_start'  => $adjust_start,
 			'adjust_finish' => $adjust_finish,
-			'ignored' => $ignored,
+			'ignored'       => $ignored,
 		);
 
 		// get events by id or by date
-		if (x($_GET,'id')){
+		if (x($_GET, 'id')) {
 			$r = event_by_id(local_user(), $event_params);
 		} else {
 			$r = events_by_date(local_user(), $event_params);
@@ -340,7 +332,7 @@ function events_content(App $a) {
 		if (dbm::is_result($r)) {
 			$r = sort_by_date($r);
 			foreach ($r as $rr) {
-				$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
+				$j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j'));
 				if (! x($links,$j)) {
 					$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
 				}
@@ -356,127 +348,127 @@ function events_content(App $a) {
 		}
 
 		if ($a->argv[1] === 'json'){
-			echo json_encode($events); killme();
+			echo json_encode($events);
+			killme();
 		}
 
-		// links: array('href', 'text', 'extra css classes', 'title')
-		if (x($_GET,'id')){
+		if (x($_GET, 'id')) {
 			$tpl =  get_markup_template("event.tpl");
 		} else {
-//			if (get_config('experimentals','new_calendar')==1){
-				$tpl = get_markup_template("events_js.tpl");
-//			} else {
-//				$tpl = get_markup_template("events.tpl");
-//			}
+			$tpl = get_markup_template("events_js.tpl");
 		}
 
 		// Get rid of dashes in key names, Smarty3 can't handle them
-		foreach($events as $key => $event) {
+		foreach ($events as $key => $event) {
 			$event_item = array();
-			foreach($event['item'] as $k => $v) {
-				$k = str_replace('-','_',$k);
+			foreach ($event['item'] as $k => $v) {
+				$k = str_replace('-' ,'_', $k);
 				$event_item[$k] = $v;
 			}
 			$events[$key]['item'] = $event_item;
 		}
 
 		$o = replace_macros($tpl, array(
-			'$baseurl'	=> App::get_baseurl(),
-			'$tabs'		=> $tabs,
-			'$title'	=> t('Events'),
-			'$view'		=> t('View'),
-			'$new_event'	=> array(App::get_baseurl().'/events/new',t('Create New Event'),'',''),
-			'$previous'	=> array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
-			'$next'		=> array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
-			'$calendar'	=> cal($y,$m,$links, ' eventcal'),
-
-			'$events'	=> $events,
-
-			"today" => t("today"),
-			"month" => t("month"),
-			"week" => t("week"),
-			"day" => t("day"),
-			"list" => t("list"),
+			'$baseurl'   => App::get_baseurl(),
+			'$tabs'      => $tabs,
+			'$title'     => t('Events'),
+			'$view'      => t('View'),
+			'$new_event' => array(App::get_baseurl() . '/events/new', t('Create New Event'), '', ''),
+			'$previous'  => array(App::get_baseurl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
+			'$next'      => array(App::get_baseurl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
+			'$calendar'  => cal($y, $m, $links, ' eventcal'),
+
+			'$events'    => $events,
+
+			'$today' => t('today'),
+			'$month' => t('month'),
+			'$week'  => t('week'),
+			'$day'   => t('day'),
+			'$list'  => t('list'),
 		));
 
-		if (x($_GET,'id')){ echo $o; killme(); }
+		if (x($_GET, 'id')) {
+			echo $o;
+			killme();
+		}
 
 		return $o;
-
 	}
 
-	if($mode === 'edit' && $event_id) {
+	if ($mode === 'edit' && $event_id) {
 		$r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($event_id),
 			intval(local_user())
 		);
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
 			$orig_event = $r[0];
+		}
 	}
 
 	// Passed parameters overrides anything found in the DB
-	if($mode === 'edit' || $mode === 'new') {
-		if(!x($orig_event)) $orig_event = array();
+	if ($mode === 'edit' || $mode === 'new') {
+		if (!x($orig_event)) {$orig_event = array();}
 		// 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'];
-		if(x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary'];
-		if(x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description'];
-		if(x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location'];
-		if(x($_REQUEST,'start')) $orig_event['start'] = $_REQUEST['start'];
-		if(x($_REQUEST,'finish')) $orig_event['finish'] = $_REQUEST['finish'];
-	}
-
-	if($mode === 'edit' || $mode === 'new') {
+		if (x($_REQUEST, 'nofinish'))    {$orig_event['nofinish']    = $_REQUEST['nofinish'];}
+		if (x($_REQUEST, 'adjust'))      {$orig_event['adjust']      = $_REQUEST['adjust'];}
+		if (x($_REQUEST, 'summary'))     {$orig_event['summary']     = $_REQUEST['summary'];}
+		if (x($_REQUEST, 'description')) {$orig_event['description'] = $_REQUEST['description'];}
+		if (x($_REQUEST, 'location'))    {$orig_event['location']    = $_REQUEST['location'];}
+		if (x($_REQUEST, 'start'))       {$orig_event['start']       = $_REQUEST['start'];}
+		if (x($_REQUEST, 'finish'))      {$orig_event['finish']      = $_REQUEST['finish'];}
 
 		$n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
-		$a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : '');
-		$t_orig = ((x($orig_event)) ? $orig_event['summary'] : '');
-		$d_orig = ((x($orig_event)) ? $orig_event['desc'] : '');
-		$l_orig = ((x($orig_event)) ? $orig_event['location'] : '');
-		$eid = ((x($orig_event)) ? $orig_event['id'] : 0);
-		$cid = ((x($orig_event)) ? $orig_event['cid'] : 0);
-		$uri = ((x($orig_event)) ? $orig_event['uri'] : '');
+		$a_checked = ((x($orig_event) && $orig_event['adjust'])   ? ' checked="checked" ' : '');
 
+		$t_orig = ((x($orig_event)) ? $orig_event['summary']  : '');
+		$d_orig = ((x($orig_event)) ? $orig_event['desc']     : '');
+		$l_orig = ((x($orig_event)) ? $orig_event['location'] : '');
+		$eid    = ((x($orig_event)) ? $orig_event['id']       : 0);
+		$cid    = ((x($orig_event)) ? $orig_event['cid']      : 0);
+		$uri    = ((x($orig_event)) ? $orig_event['uri']      : '');
 
-		if(! x($orig_event))
+		if (! x($orig_event)) {
 			$sh_checked = '';
-		else
-			$sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ' );
+		} else {
+			$sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ');
+		}
 
-		if($cid OR ($mode !== 'new'))
+		if ($cid OR ($mode !== 'new')) {
 			$sh_checked .= ' disabled="disabled" ';
-
+		}
 
 		$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
 		$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
 
 		$tz = date_default_timezone_get();
-		if(x($orig_event))
+		if (x($orig_event)) {
 			$tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
+		}
 
-		$syear = datetime_convert('UTC', $tz, $sdt, 'Y');
+		$syear  = datetime_convert('UTC', $tz, $sdt, 'Y');
 		$smonth = datetime_convert('UTC', $tz, $sdt, 'm');
-		$sday = datetime_convert('UTC', $tz, $sdt, 'd');
+		$sday   = datetime_convert('UTC', $tz, $sdt, 'd');
 
-		$shour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : 0);
+		$shour   = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : 0);
 		$sminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'i') : 0);
 
-		$fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
+		$fyear  = datetime_convert('UTC', $tz, $fdt, 'Y');
 		$fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
-		$fday = datetime_convert('UTC', $tz, $fdt, 'd');
+		$fday   = datetime_convert('UTC', $tz, $fdt, 'd');
 
-		$fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
+		$fhour   = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
 		$fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
 
 		$f = get_config('system','event_input_format');
-		if(! $f)
+		if (! $f) {
 			$f = 'ymd';
+		}
 
-		require_once('include/acl_selectors.php');
+		require_once 'include/acl_selectors.php' ;
 
-		if ($mode === 'new')
+		if ($mode === 'new') {
 			$acl = (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user)));
+		}
 
 		$tpl = get_markup_template('event_form.tpl');
 
@@ -489,11 +481,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($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),
 			'$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($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'),
 			'$a_text' => t('Adjust for viewer timezone'),
 			'$a_checked' => $a_checked,
 			'$d_text' => t('Description:'),
@@ -511,12 +503,33 @@ function events_content(App $a) {
 			'$preview' => t('Preview'),
 			'$acl' => $acl,
 			'$submit' => t('Submit'),
-			'$basic' => t("Basic"),
-			'$advanced' => t("Advanced"),
+			'$basic' => t('Basic'),
+			'$advanced' => t('Advanced'),
 			'$permissions' => t('Permissions'),
 
 		));
 
 		return $o;
 	}
+
+	// Remove an event from the calendar and its related items
+	if ($mode === 'drop' && $event_id) {
+		$del = 0;
+
+		$params = array('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);
+		}
+
+		if ($del == 0) {
+			notice(t('Failed to remove event' ) . EOL);
+		} else {
+			info(t('Event removed') . EOL);
+		}
+
+		goaway(App::get_baseurl() . '/events');
+	}
 }