diff --git a/include/event.php b/include/event.php
index d9b89a7c63..82d5a1ec58 100644
--- a/include/event.php
+++ b/include/event.php
@@ -4,39 +4,42 @@
  * @brief functions specific to event handling
  */
 
-require_once('include/bbcode.php');
-require_once('include/map.php');
-require_once('include/datetime.php');
+require_once 'include/bbcode.php';
+require_once 'include/map.php';
+require_once 'include/datetime.php';
 
 function format_event_html($ev, $simple = false) {
 
-	if(! ((is_array($ev)) && count($ev)))
+	if(! ((is_array($ev)) && count($ev))) {
 		return '';
+	}
 
 	$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
 
 	$event_start = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
 			$ev['start'] , $bd_format ))
-			:  day_translate(datetime_convert('UTC', 'UTC',
+			: day_translate(datetime_convert('UTC', 'UTC',
 			$ev['start'] , $bd_format)));
 
 	$event_end = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
 				$ev['finish'] , $bd_format ))
-				:  day_translate(datetime_convert('UTC', 'UTC',
+				: day_translate(datetime_convert('UTC', 'UTC',
 				$ev['finish'] , $bd_format )));
 
 	if ($simple) {
-		$o = "<h3>".bbcode($ev['summary'])."</h3>";
+		$o = "<h3>" . bbcode($ev['summary']) . "</h3>";
 
-		$o .= "<p>".bbcode($ev['desc'])."</p>";
+		$o .= "<p>" . bbcode($ev['desc']) . "</p>";
 
-		$o .= "<h4>".t('Starts:')."</h4><p>".$event_start."</p>";
+		$o .= "<h4>" . t('Starts:') . "</h4><p>" . $event_start . "</p>";
 
-		if(! $ev['nofinish'])
-			$o .= "<h4>".t('Finishes:')."</h4><p>".$event_end."</p>";
+		if (! $ev['nofinish']) {
+			$o .= "<h4>" . t('Finishes:') . "</h4><p>" . $event_end  ."</p>";
+		}
 
-		if(strlen($ev['location']))
-			$o .= "<h4>".t('Location:')."</h4><p>".$ev['location']."</p>";
+		if (strlen($ev['location'])) {
+			$o .= "<h4>" . t('Location:') . "</h4><p>" . $ev['location'] . "</p>";
+		}
 
 		return $o;
 	}
@@ -44,31 +47,34 @@ function format_event_html($ev, $simple = false) {
 	$o = '<div class="vevent">' . "\r\n";
 
 
-	$o .= '<p class="summary event-summary">' . bbcode($ev['summary']) .  '</p>' . "\r\n";
+	$o .= '<p class="summary event-summary">' . bbcode($ev['summary']) . '</p>' . "\r\n";
 
-	$o .= '<p class="description event-description">' . bbcode($ev['desc']) .  '</p>' . "\r\n";
+	$o .= '<p class="description event-description">' . bbcode($ev['desc']) . '</p>' . "\r\n";
 
 	$o .= '<p class="event-start">' . t('Starts:') . ' <abbr class="dtstart" title="'
-		. datetime_convert('UTC','UTC',$ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
+		. datetime_convert('UTC', 'UTC', $ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
 		. '" >'.$event_start
 		. '</abbr></p>' . "\r\n";
 
-	if(! $ev['nofinish'])
+	if (! $ev['nofinish']) {
 		$o .= '<p class="event-end" >' . t('Finishes:') . ' <abbr class="dtend" title="'
-			. datetime_convert('UTC','UTC',$ev['finish'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
+			. datetime_convert('UTC', 'UTC', $ev['finish'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
 			. '" >'.$event_end
-			. '</abbr></p>'  . "\r\n";
+			. '</abbr></p>' . "\r\n";
+	}
 
-	if(strlen($ev['location'])){
+	if (strlen($ev['location'])) {
 		$o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">'
 			. bbcode($ev['location'])
 			. '</span></p>' . "\r\n";
 
-		if (strpos($ev['location'], "[map") !== False) {
+		// Include a map of the location if the [map] BBCode is used
+		if (strpos($ev['location'], "[map") !== false) {
 			$map = generate_named_map($ev['location']);
-			if ($map!==$ev['location']) $o.=$map;
+			if ($map !== $ev['location']) {
+				$o.= $map;
+			}
 		}
-
 	}
 
 	$o .= '</div>' . "\r\n";
@@ -146,63 +152,81 @@ function format_event_bbcode($ev) {
 
 	$o = '';
 
-	if($ev['summary'])
+	if ($ev['summary']) {
 		$o .= '[event-summary]' . $ev['summary'] . '[/event-summary]';
+	}
 
-	if($ev['desc'])
+	if ($ev['desc']) {
 		$o .= '[event-description]' . $ev['desc'] . '[/event-description]';
+	}
 
-	if($ev['start'])
+	if ($ev['start']) {
 		$o .= '[event-start]' . $ev['start'] . '[/event-start]';
+	}
 
-	if(($ev['finish']) && (! $ev['nofinish']))
+	if (($ev['finish']) && (! $ev['nofinish'])) {
 		$o .= '[event-finish]' . $ev['finish'] . '[/event-finish]';
+	}
 
-	if($ev['location'])
+	if ($ev['location']) {
 		$o .= '[event-location]' . $ev['location'] . '[/event-location]';
+	}
 
-	if($ev['adjust'])
+	if ($ev['adjust']) {
 		$o .= '[event-adjust]' . $ev['adjust'] . '[/event-adjust]';
-
+	}
 
 	return $o;
-
 }
 
 function bbtovcal($s) {
 	$o = '';
 	$ev = bbtoevent($s);
-	if($ev['desc'])
+
+	if ($ev['desc']) {
 		$o = format_event_html($ev);
+	}
+
 	return $o;
 }
 
-
 function bbtoevent($s) {
 
 	$ev = array();
 
 	$match = '';
-	if(preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is",$s,$match))
+	if (preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is",$s,$match)) {
 		$ev['summary'] = $match[1];
-	$match = '';
-	if(preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is",$s,$match))
-		$ev['desc'] = $match[1];
-	$match = '';
-	if(preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is",$s,$match))
-		$ev['start'] = $match[1];
-	$match = '';
-	if(preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is",$s,$match))
-		$ev['finish'] = $match[1];
-	$match = '';
-	if(preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is",$s,$match))
-		$ev['location'] = $match[1];
-	$match = '';
-	if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
-		$ev['adjust'] = $match[1];
-	$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
-	return $ev;
+	}
 
+	$match = '';
+	if (preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is",$s,$match)) {
+		$ev['desc'] = $match[1];
+	}
+
+	$match = '';
+	if (preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is",$s,$match)) {
+		$ev['start'] = $match[1];
+	}
+
+	$match = '';
+	if (preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is",$s,$match)) {
+		$ev['finish'] = $match[1];
+	}
+
+	$match = '';
+	if (preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is",$s,$match)) {
+		$ev['location'] = $match[1];
+	}
+
+	$match = '';
+	if (preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match)) {
+		$ev['adjust'] = $match[1];
+	}
+
+	$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
+
+	return $ev;
 }
 
 
@@ -212,21 +236,22 @@ function sort_by_date($a) {
 	return $a;
 }
 
-
 function ev_compare($a,$b) {
 
-	$date_a = (($a['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$a['start']) : $a['start']);
-	$date_b = (($b['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$b['start']) : $b['start']);
+	$date_a = (($a['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $a['start']) : $a['start']);
+	$date_b = (($b['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $b['start']) : $b['start']);
 
-	if($date_a === $date_b)
-		return strcasecmp($a['desc'],$b['desc']);
+	if ($date_a === $date_b) {
+		return strcasecmp($a['desc'], $b['desc']);
+	}
 
-	return strcmp($date_a,$date_b);
+	return strcmp($date_a, $date_b);
 }
 
 function event_delete($event_id) {
-	if ($event_id == 0)
+	if ($event_id == 0) {
 		return;
+	}
 
 	q("DELETE FROM `event` WHERE `id` = %d", intval($event_id));
 	logger("Deleted event ".$event_id, LOGGER_DEBUG);
@@ -234,37 +259,39 @@ function event_delete($event_id) {
 
 function event_store($arr) {
 
-	require_once('include/datetime.php');
-	require_once('include/items.php');
-	require_once('include/bbcode.php');
+	require_once 'include/datetime.php';
+	require_once 'include/items.php';
+	require_once 'include/bbcode.php';
 
 	$a = get_app();
 
-	$arr['created'] = (($arr['created']) ? $arr['created'] : datetime_convert());
-	$arr['edited']  = (($arr['edited']) ? $arr['edited'] : datetime_convert());
-	$arr['type']    = (($arr['type']) ? $arr['type'] : 'event' );
-	$arr['cid']     = ((intval($arr['cid'])) ? intval($arr['cid']) : 0);
-	$arr['uri']     = (x($arr,'uri') ? $arr['uri'] : item_new_uri($a->get_hostname(),$arr['uid']));
-	$arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0);
+	$arr['created'] = (($arr['created'])     ? $arr['created']         : datetime_convert());
+	$arr['edited']  = (($arr['edited'])      ? $arr['edited']          : datetime_convert());
+	$arr['type']    = (($arr['type'])        ? $arr['type']            : 'event' );
+	$arr['cid']     = ((intval($arr['cid'])) ? intval($arr['cid'])     : 0);
+	$arr['uri']     = (x($arr,'uri')         ? $arr['uri']             : item_new_uri($a->get_hostname(), $arr['uid']));
+	$arr['private'] = ((x($arr,'private'))   ? intval($arr['private']) : 0);
 	$arr['guid']    = get_guid(32);
 
-	if($arr['cid'])
+	if($arr['cid']) {
 		$c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($arr['cid']),
 			intval($arr['uid'])
 		);
-	else
+	} else {
 		$c = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 			intval($arr['uid'])
 		);
+	}
 
-	if(count($c))
+	if (dbm::is_result($c)) {
 		$contact = $c[0];
+	}
 
 
 	// Existing event being modified
 
-	if($arr['id']) {
+	if ($arr['id']) {
 
 		// has the event actually changed?
 
@@ -272,7 +299,7 @@ function event_store($arr) {
 			intval($arr['id']),
 			intval($arr['uid'])
 		);
-		if((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
+		if ((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
 
 			// Nothing has changed. Grab the item id to return.
 
@@ -280,7 +307,7 @@ function event_store($arr) {
 				intval($arr['id']),
 				intval($arr['uid'])
 			);
-			return((dbm::is_result($r)) ? $r[0]['id'] : 0);
+			return ((dbm::is_result($r)) ? $r[0]['id'] : 0);
 		}
 
 		// The event changed. Update it.
@@ -318,7 +345,6 @@ 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),
@@ -328,8 +354,9 @@ function event_store($arr) {
 			);
 
 			$item_id = $r[0]['id'];
-		} else
+		} else {
 			$item_id = 0;
+		}
 
 		call_hooks("event_updated", $arr['id']);
 
@@ -366,8 +393,9 @@ function event_store($arr) {
 			dbesc($arr['uri']),
 			intval($arr['uid'])
 		);
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
 			$event = $r[0];
+		}
 
 		$item_arr = array();
 
@@ -399,7 +427,7 @@ function event_store($arr) {
 		$item_arr['body']          = format_event_bbcode($event);
 
 
-		$item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
+		$item_arr['object']  = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
 		$item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
 		$item_arr['object'] .= '</object>' . "\n";
 
@@ -412,7 +440,7 @@ function event_store($arr) {
 		//	$plink = App::get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
 
 
-		if($item_id) {
+		if ($item_id) {
 			//q("UPDATE `item` SET `plink` = '%s', `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
 			//	dbesc($plink),
 			//	intval($event['id']),
@@ -433,12 +461,17 @@ function event_store($arr) {
 }
 
 function get_event_strings() {
+
 	// First day of the week (0 = Sunday)
-	$firstDay = get_pconfig(local_user(),'system','first_day_of_week');
-	if ($firstDay === false) $firstDay=0;
+	$firstDay = get_pconfig(local_user(),'system', 'first_day_of_week');
+	if ($firstDay === false) {
+		$firstDay = 0;
+	}
 
 	$i18n = array(
 			"firstDay" => $firstDay,
+			"allday"   => t("all-day"),
+
 			"Sun" => t("Sun"),
 			"Mon" => t("Mon"),
 			"Tue" => t("Tue"),
@@ -446,13 +479,15 @@ function get_event_strings() {
 			"Thu" => t("Thu"),
 			"Fri" => t("Fri"),
 			"Sat" => t("Sat"),
-			"Sunday" => t("Sunday"),
-			"Monday" => t("Monday"),
-			"Tuesday" => t("Tuesday"),
+
+			"Sunday"    => t("Sunday"),
+			"Monday"    => t("Monday"),
+			"Tuesday"   => t("Tuesday"),
 			"Wednesday" => t("Wednesday"),
-			"Thursday" => t("Thursday"),
-			"Friday" => t("Friday"),
-			"Saturday" => t("Saturday"),
+			"Thursday"  => t("Thursday"),
+			"Friday"    => t("Friday"),
+			"Saturday"  => t("Saturday"),
+
 			"Jan" => t("Jan"),
 			"Feb" => t("Feb"),
 			"Mar" => t("Mar"),
@@ -465,47 +500,49 @@ function get_event_strings() {
 			"Oct" => t("Oct"),
 			"Nov" => t("Nov"),
 			"Dec" => t("Dec"),
-			"January" => t("January"),
-			"February" => t("February"),
-			"March" => t("March"),
-			"April" => t("April"),
-			"May" => t("May"),
-			"June" => t("June"),
-			"July" => t("July"),
-			"August" => t("August"),
+
+			"January"   => t("January"),
+			"February"  => t("February"),
+			"March"     => t("March"),
+			"April"     => t("April"),
+			"May"       => t("May"),
+			"June"      => t("June"),
+			"July"      => t("July"),
+			"August"    => t("August"),
 			"September" => t("September"),
-			"October" => t("October"),
-			"November" => t("November"),
-			"December" => t("December"),
+			"October"   => t("October"),
+			"November"  => t("November"),
+			"December"  => t("December"),
+
 			"today" => t("today"),
 			"month" => t("month"),
-			"week" => t("week"),
-			"day" => t("day"),
-			"allday" => t("all-day"),
+			"week"  => t("week"),
+			"day"   => t("day"),
 
 			"noevent" => t("No events to display"),
 
-			"dtstart_label" => t("Starts:"),
-			"dtend_label" => t("Finishes:"),
+			"dtstart_label"  => t("Starts:"),
+			"dtend_label"    => t("Finishes:"),
 			"location_label" => t("Location:")
 		);
 
 	return $i18n;
 }
 
-/// @todo We should replace this with a separate update function if there is some time left
 /**
  * @brief Removes duplicated birthday events
  *
  * @param array $dates Array of possibly duplicated events
  * @return array Cleaned events
+ * 
+ * @todo We should replace this with a separate update function if there is some time left
  */
 function event_remove_duplicates($dates) {
 	$dates2 = array();
 
 	foreach ($dates AS $date) {
 		if ($date['type'] == 'birthday') {
-			$dates2[$date['uid']."-".$date['cid']."-".$date['start']] = $date;
+			$dates2[$date['uid'] . "-" . $date['cid'] . "-" . $date['start']] = $date;
 		} else {
 			$dates2[] = $date;
 		}
@@ -524,10 +561,11 @@ function event_remove_duplicates($dates) {
  */
 function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
 	// ownly allow events if there is a valid owner_id
-	if($owner_uid == 0)
+	if ($owner_uid == 0) {
 		return;
+	}
 
-	// query for the event by event id
+	// Query for the event by event id
 	$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 			`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
 		LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
@@ -556,11 +594,12 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
  * @return array Query results
  */
 function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
-	// ownly allow events if there is a valid owner_id
-	if($owner_uid == 0)
+	// Only allow events if there is a valid owner_id
+	if($owner_uid == 0) {
 		return;
+	}
 
-	// query for the event by date
+	// Query for the event by date
 	$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 				`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
 			LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
@@ -602,13 +641,12 @@ function process_events($arr) {
 			$d = day_translate($d);
 
 			$start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'c') : datetime_convert('UTC', 'UTC', $rr['start'], 'c'));
-			if ($rr['nofinish']){
+			if ($rr['nofinish']) {
 				$end = null;
 			} else {
 				$end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['finish'], 'c') : datetime_convert('UTC', 'UTC', $rr['finish'], 'c'));
 			}
 
-
 			$is_first = ($d !== $last_date);
 
 			$last_date = $d;
@@ -630,20 +668,20 @@ function process_events($arr) {
 			$rr['desc'] = bbcode($rr['desc']);
 			$rr['location'] = bbcode($rr['location']);
 			$events[] = array(
-				'id'=>$rr['id'],
-				'start'=> $start,
-				'end' => $end,
+				'id'     => $rr['id'],
+				'start'  => $start,
+				'end'    => $end,
 				'allDay' => false,
-				'title' => $title,
+				'title'  => $title,
 
-				'j' => $j,
-				'd' => $d,
-				'edit' => $edit,
-				'drop' => $drop,
-				'is_first'=>$is_first,
-				'item'=>$rr,
-				'html'=>$html,
-				'plink' => array($rr['plink'], t('link to source'), '', ''),
+				'j'        => $j,
+				'd'        => $d,
+				'edit'     => $edit,
+				'drop'     => $drop,
+				'is_first' => $is_first,
+				'item'     => $rr,
+				'html'     => $html,
+				'plink'    => array($rr['plink'], t('link to source'), '', ''),
 			);
 		}
 	}
@@ -661,34 +699,36 @@ function process_events($arr) {
  * @return string Content according to selected export format
  */
 function event_format_export ($events, $format = 'ical', $timezone) {
-	if(! ((is_array($events)) && count($events)))
+	if(! ((is_array($events)) && count($events))) {
 		return;
+	}
 
 	switch ($format) {
-		// format the exported data as a CSV file
+		// Format the exported data as a CSV file
 		case "csv":
 			header("Content-type: text/csv");
 			$o = '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL;
 
 			foreach ($events as $event) {
-			/// @todo the time / date entries don't include any information about the
-			// timezone the event is scheduled in :-/
+				/// @todo The time / date entries don't include any information about the
+				/// timezone the event is scheduled in :-/
 				$tmp1 = strtotime($event['start']);
 				$tmp2 = strtotime($event['finish']);
 				$time_format = "%H:%M:%S";
 				$date_format = "%Y-%m-%d";
-				$o .= '"'.$event['summary'].'", "'.strftime($date_format, $tmp1) .
-					'", "'.strftime($time_format, $tmp1).'", "'.$event['desc'] .
-					'", "'.strftime($date_format, $tmp2) .
-					'", "'.strftime($time_format, $tmp2) .
-					'", "'.$event['location'].'"' . PHP_EOL;
+
+				$o .= '"' . $event['summary'] . '", "' . strftime($date_format, $tmp1) .
+					'", "' . strftime($time_format, $tmp1) . '", "' . $event['desc'] .
+					'", "' . strftime($date_format, $tmp2) .
+					'", "' . strftime($time_format, $tmp2) .
+					'", "' . $event['location'] . '"' . PHP_EOL;
 			}
 			break;
 
-		// format the exported data as a ics file
+		// Format the exported data as a ics file
 		case "ical":
 			header("Content-type: text/ics");
-			$o = 'BEGIN:VCALENDAR'. PHP_EOL
+			$o = 'BEGIN:VCALENDAR' . PHP_EOL
 				. 'VERSION:2.0' . PHP_EOL
 				. 'PRODID:-//friendica calendar export//0.1//EN' . PHP_EOL;
 			///  @todo include timezone informations in cases were the time is not in UTC
@@ -700,35 +740,43 @@ function event_format_export ($events, $format = 'ical', $timezone) {
 			//       but test your solution against http://icalvalid.cloudapp.net/
 			//       also long lines SHOULD be split at 75 characters length
 			foreach ($events as $event) {
+
 				if ($event['adjust'] == 1) {
 					$UTC = 'Z';
 				} else {
 					$UTC = '';
 				}
 				$o .= 'BEGIN:VEVENT' . PHP_EOL;
-				if ($event[start]) {
+
+				if ($event['start']) {
 					$tmp = strtotime($event['start']);
-					$dtformat = "%Y%m%dT%H%M%S".$UTC;
-					$o .= 'DTSTART:'.strftime($dtformat, $tmp).PHP_EOL;
+					$dtformat = "%Y%m%dT%H%M%S" . $UTC;
+					$o .= 'DTSTART:' . strftime($dtformat, $tmp) . PHP_EOL;
 				}
+
 				if (!$event['nofinish']) {
 					$tmp = strtotime($event['finish']);
-					$dtformat = "%Y%m%dT%H%M%S".$UTC;
-					$o .= 'DTEND:'.strftime($dtformat, $tmp).PHP_EOL;
+					$dtformat = "%Y%m%dT%H%M%S" . $UTC;
+					$o .= 'DTEND:' . strftime($dtformat, $tmp) . PHP_EOL;
 				}
-				if ($event['summary'])
+
+				if ($event['summary']) {
 					$tmp = $event['summary'];
-					$tmp = str_replace(PHP_EOL, PHP_EOL.' ',$tmp);
+					$tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp);
 					$tmp = addcslashes($tmp, ',;');
 					$o .= 'SUMMARY:' . $tmp . PHP_EOL;
-				if ($event['desc'])
+				}
+
+				if ($event['desc']) {
 					$tmp = $event['desc'];
-					$tmp = str_replace(PHP_EOL, PHP_EOL.' ',$tmp);
+					$tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp);
 					$tmp = addcslashes($tmp, ',;');
 					$o .= 'DESCRIPTION:' . $tmp . PHP_EOL;
+				}
+
 				if ($event['location']) {
 					$tmp = $event['location'];
-					$tmp = str_replace(PHP_EOL, PHP_EOL.' ',$tmp);
+					$tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp);
 					$tmp = addcslashes($tmp, ',;');
 					$o .= 'LOCATION:' . $tmp . PHP_EOL;
 				}
@@ -759,16 +807,18 @@ function event_format_export ($events, $format = 'ical', $timezone) {
  * @return array Query results
  */
 function events_by_uid($uid = 0, $sql_extra = '') {
-	if($uid == 0)
+	if ($uid == 0) {
 		return;
+	}
 
 	// The permission condition if no condition was transmitted
-	if($sql_extra == '')
+	if($sql_extra == '') {
 		$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' ";
+	}
 
-	//  does the user who requests happen to be the owner of the events
-	//  requested? then show all of your events, otherwise only those that
-	//  don't have limitations set in allow_cid and allow_gid
+	// Does the user who requests happen to be the owner of the events
+	// requested? then show all of your events, otherwise only those that
+	// don't have limitations set in allow_cid and allow_gid
 	if (local_user() == $uid) {
 		$r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`, `nofinish`
 			FROM `event` WHERE `uid`= %d AND `cid` = 0 ",
@@ -781,8 +831,9 @@ function events_by_uid($uid = 0, $sql_extra = '') {
 		);
 	}
 
-	if (dbm::is_result($r))
+	if (dbm::is_result($r)) {
 		return $r;
+	}
 }
 
 /**
@@ -801,25 +852,28 @@ function event_export($uid, $format = 'ical') {
 
 	$process = false;
 
-	// we are allowed to show events
+	// We are allowed to show events
 	// get the timezone the user is in
 	$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
-	if (dbm::is_result($r))
+	if (dbm::is_result($r)) {
 		$timezone = $r[0]['timezone'];
+	}
 
-	// get all events which are owned by a uid (respects permissions);
+	// Get all events which are owned by a uid (respects permissions);
 	$events = events_by_uid($uid);
 
-	//  we have the events that are available for the requestor
-	//  now format the output according to the requested format
-	if(count($events))
+	// We have the events that are available for the requestor
+	// now format the output according to the requested format
+	if (count($events)) {
 		$res = event_format_export($events, $format, $timezone);
+	}
 
 	// If there are results the precess was successfull
-	if(x($res))
+	if (x($res)) {
 		$process = true;
+	}
 
-	// get the file extension for the format
+	// Get the file extension for the format
 	switch ($format) {
 		case "ical":
 			$file_ext = "ics";
@@ -834,10 +888,10 @@ function event_export($uid, $format = 'ical') {
 	}
 
 	$arr = array(
-		'success' => $process,
-		'format' => $format,
+		'success'   => $process,
+		'format'    => $format,
 		'extension' => $file_ext,
-		'content' => $res,
+		'content'   => $res,
 	);
 
 	return $arr;
@@ -860,8 +914,9 @@ function widget_events() {
 	// The permission testing is a little bit tricky because we have to respect many cases
 
 	// It's not the private events page (we don't get the $owner_uid for /events)
-	if(! local_user() && ! $owner_uid)
+	if (! local_user() && ! $owner_uid) {
 		return;
+	}
 
 	// Cal logged in user (test permission at foreign profile page)
 	// If the $owner uid is available we know it is part of one of the profile pages (like /cal)
@@ -869,13 +924,15 @@ function widget_events() {
 	// or a foreign one. For foreign profile pages we need to check if the feature
 	// for exporting the cal is enabled (otherwise the widget would appear for logged in users
 	// on foreigen profile pages even if the widget is disabled)
-	if(intval($owner_uid) && local_user() !== $owner_uid && ! feature_enabled($owner_uid, "export_calendar"))
+	if (intval($owner_uid) && local_user() !== $owner_uid && ! feature_enabled($owner_uid, "export_calendar")) {
 		return;
+	}
 
 	// If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and
 	// export feature isn't enabled
-	if(intval($owner_uid) && ! local_user() && ! feature_enabled($owner_uid, "export_calendar"))
+	if (intval($owner_uid) && ! local_user() && ! feature_enabled($owner_uid, "export_calendar")) {
 		return;
+	}
 
 	return replace_macros(get_markup_template("events_aside.tpl"), array(
 		'$etitle' => t("Export"),
diff --git a/mod/events.php b/mod/events.php
index 8e34b15681..bcf80dd1c7 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -237,12 +237,12 @@ function events_content(App $a) {
 	$m = 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') {
+		if ($a->argc > 2 && $a->argv[1] == 'drop') {
 			$mode = 'drop';
 			$event_id = intval($a->argv[2]);
 		}
@@ -321,7 +321,7 @@ function events_content(App $a) {
 		);
 
 		// 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);
@@ -352,7 +352,7 @@ function events_content(App $a) {
 			killme();
 		}
 
-		if (x($_GET, 'id')){
+		if (x($_GET, 'id')) {
 			$tpl =  get_markup_template("event.tpl");
 		} else {
 			$tpl = get_markup_template("events_js.tpl");