SimpleMachines / SMF2.1

Sources/CacheAPI-sqlite.php

Braces +3 added lines, -3 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * SQLite Cache API class
@@ -153,8 +154,7 @@ 
 		if (is_null($dir) || !is_writable($dir))
 		{
 			$this->cachedir = $cachedir_sqlite;
-		}
-		else
+		} else
 		{
 			$this->cachedir = $dir;
 		}

proxy.php

Braces +33 added lines, -22 removed lines

@@ -63,26 +63,31 @@ 
 	 */
 	public function checkRequest()
 	{
-		if (!$this->enabled)
-			return false;
+		if (!$this->enabled) {
+					return false;
+		}
 
 		// Try to create the image cache directory if it doesn't exist
-		if (!file_exists($this->cache))
-			if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php'))
+		if (!file_exists($this->cache)) {
+					if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php'))
 				return false;
+		}
 
-		if (empty($_GET['hash']) || empty($_GET['request']))
-			return false;
+		if (empty($_GET['hash']) || empty($_GET['request'])) {
+					return false;
+		}
 
 		$hash = $_GET['hash'];
 		$request = $_GET['request'];
 
-		if (md5($request . $this->secret) != $hash)
-			return false;
+		if (md5($request . $this->secret) != $hash) {
+					return false;
+		}
 
 		// Attempt to cache the request if it doesn't exist
-		if (!$this->isCached($request))
-			return $this->cacheImage($request);
+		if (!$this->isCached($request)) {
+					return $this->cacheImage($request);
+		}
 
 		return true;
 	}
@@ -103,19 +108,22 @@ 
 		if (!$cached || time() - $cached['time'] > (5 * 86400))
 		{
 			@unlink($cached_file);
-			if ($this->checkRequest())
-				$this->serve();
+			if ($this->checkRequest()) {
+							$this->serve();
+			}
 			redirectexit($request);
 		}
 
 		// Right, image not cached? Simply redirect, then.
-		if (!$this->checkRequest())
-		    redirectexit($request);
+		if (!$this->checkRequest()) {
+				    redirectexit($request);
+		}
 
 		// Make sure we're serving an image
 		$contentParts = explode('/', !empty($cached['content_type']) ? $cached['content_type'] : '');
-		if ($contentParts[0] != 'image')
-			exit;
+		if ($contentParts[0] != 'image') {
+					exit;
+		}
 
 		header('Content-type: ' . $cached['content_type']);
 		header('Content-length: ' . $cached['size']);
@@ -161,19 +169,22 @@ 
 		$request = $curl->get_url_data($request);
 		$response = $request->result();
 
-		if (empty($response))
-			return false;
+		if (empty($response)) {
+					return false;
+		}
 
 		$headers = $response['headers'];
 
 		// Make sure the url is returning an image
 		$contentParts = explode('/', !empty($headers['content-type']) ? $headers['content-type'] : '');
-		if ($contentParts[0] != 'image')
-			return false;
+		if ($contentParts[0] != 'image') {
+					return false;
+		}
 
 		// Validate the filesize
-		if ($response['size'] > ($this->maxSize * 1024))
-			return false;
+		if ($response['size'] > ($this->maxSize * 1024)) {
+					return false;
+		}
 
 		return file_put_contents($dest, json_encode(array(
 			'content_type' => $headers['content-type'],

Sources/Subs-Calendar.php

Braces +217 added lines, -157 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get all birthdays within the given time range.
@@ -61,10 +62,11 @@ 
 	$bday = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if ($year_low != $year_high)
-			$age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low;
-		else
-			$age_year = $year_low;
+		if ($year_low != $year_high) {
+					$age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low;
+		} else {
+					$age_year = $year_low;
+		}
 
 		$bday[$age_year . substr($row['birthdate'], 4)][] = array(
 			'id' => $row['id_member'],
@@ -78,8 +80,9 @@ 
 	ksort($bday);
 
 	// Set is_last, so the themes know when to stop placing separators.
-	foreach ($bday as $mday => $array)
-		$bday[$mday][count($array) - 1]['is_last'] = true;
+	foreach ($bday as $mday => $array) {
+			$bday[$mday][count($array) - 1]['is_last'] = true;
+	}
 
 	return $bday;
 }
@@ -127,8 +130,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// If the attached topic is not approved then for the moment pretend it doesn't exist
-		if (!empty($row['id_first_msg']) && $modSettings['postmod_active'] && !$row['approved'])
-			continue;
+		if (!empty($row['id_first_msg']) && $modSettings['postmod_active'] && !$row['approved']) {
+					continue;
+		}
 
 		// Force a censor of the title - as often these are used by others.
 		censorText($row['title'], $use_permissions ? false : true);
@@ -137,8 +141,9 @@ 
 		list($start, $end, $allday, $span, $tz, $tz_abbrev) = buildEventDatetimes($row);
 
 		// Sanity check
-		if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count']))
-			continue;
+		if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) {
+					continue;
+		}
 
 		// Get set up for the loop
 		$start_object = date_create($row['start_date'] . (!$allday ? ' ' . $row['start_time'] : ''), timezone_open($tz));
@@ -202,8 +207,8 @@ 
 			);
 
 			// If we're using permissions (calendar pages?) then just ouput normal contextual style information.
-			if ($use_permissions)
-				$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
+			if ($use_permissions) {
+							$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
 					'href' => $row['id_board'] == 0 ? '' : $scripturl . '?topic=' . $row['id_topic'] . '.0',
 					'link' => $row['id_board'] == 0 ? $row['title'] : '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['title'] . '</a>',
 					'can_edit' => allowedTo('calendar_edit_any') || ($row['id_member'] == $user_info['id'] && allowedTo('calendar_edit_own')),
@@ -211,9 +216,10 @@ 
 					'can_export' => !empty($modSettings['cal_export']) ? true : false,
 					'export_href' => $scripturl . '?action=calendar;sa=ical;eventid=' . $row['id_event'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				));
+			}
 			// Otherwise, this is going to be cached and the VIEWER'S permissions should apply... just put together some info.
-			else
-				$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
+			else {
+							$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
 					'href' => $row['id_topic'] == 0 ? '' : $scripturl . '?topic=' . $row['id_topic'] . '.0',
 					'link' => $row['id_topic'] == 0 ? $row['title'] : '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['title'] . '</a>',
 					'can_edit' => false,
@@ -223,6 +229,7 @@ 
 					'poster' => $row['id_member'],
 					'allowed_groups' => explode(',', $row['member_groups']),
 				));
+			}
 
 			date_add($cal_date, date_interval_create_from_date_string('1 day'));
 		}
@@ -232,8 +239,9 @@ 
 	// If we're doing normal contextual data, go through and make things clear to the templates ;).
 	if ($use_permissions)
 	{
-		foreach ($events as $mday => $array)
-			$events[$mday][count($array) - 1]['is_last'] = true;
+		foreach ($events as $mday => $array) {
+					$events[$mday][count($array) - 1]['is_last'] = true;
+		}
 	}
 
 	ksort($events);
@@ -253,11 +261,12 @@ 
 	global $smcFunc;
 
 	// Get the lowest and highest dates for "all years".
-	if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
-		$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec}
+	if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) {
+			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec}
 			OR event_date BETWEEN {date:all_year_jan} AND {date:all_year_high}';
-	else
-		$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}';
+	} else {
+			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}';
+	}
 
 	// Find some holidays... ;).
 	$result = $smcFunc['db_query']('', '
@@ -277,10 +286,11 @@ 
 	$holidays = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
-			$event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4);
-		else
-			$event_year = substr($low_date, 0, 4);
+		if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) {
+					$event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4);
+		} else {
+					$event_year = substr($low_date, 0, 4);
+		}
 
 		$holidays[$event_year . substr($row['event_date'], 4)][] = $row['title'];
 	}
@@ -306,10 +316,12 @@ 
 	isAllowedTo('calendar_post');
 
 	// No board?  No topic?!?
-	if (empty($board))
-		fatal_lang_error('missing_board_id', false);
-	if (empty($topic))
-		fatal_lang_error('missing_topic_id', false);
+	if (empty($board)) {
+			fatal_lang_error('missing_board_id', false);
+	}
+	if (empty($topic)) {
+			fatal_lang_error('missing_topic_id', false);
+	}
 
 	// Administrator, Moderator, or owner.  Period.
 	if (!allowedTo('admin_forum') && !allowedTo('moderate_board'))
@@ -327,12 +339,14 @@ 
 		if ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Not the owner of the topic.
-			if ($row['id_member_started'] != $user_info['id'])
-				fatal_lang_error('not_your_topic', 'user');
+			if ($row['id_member_started'] != $user_info['id']) {
+							fatal_lang_error('not_your_topic', 'user');
+			}
 		}
 		// Topic/Board doesn't exist.....
-		else
-			fatal_lang_error('calendar_no_topic', 'general');
+		else {
+					fatal_lang_error('calendar_no_topic', 'general');
+		}
 		$smcFunc['db_free_result']($result);
 	}
 }
@@ -420,14 +434,16 @@ 
 	if (!empty($calendarOptions['start_day']))
 	{
 		$nShift -= $calendarOptions['start_day'];
-		if ($nShift < 0)
-			$nShift = 7 + $nShift;
+		if ($nShift < 0) {
+					$nShift = 7 + $nShift;
+		}
 	}
 
 	// Number of rows required to fit the month.
 	$nRows = floor(($month_info['last_day']['day_of_month'] + $nShift) / 7);
-	if (($month_info['last_day']['day_of_month'] + $nShift) % 7)
-		$nRows++;
+	if (($month_info['last_day']['day_of_month'] + $nShift) % 7) {
+			$nRows++;
+	}
 
 	// Fetch the arrays for birthdays, posted events, and holidays.
 	$bday = $calendarOptions['show_birthdays'] ? getBirthdayRange($month_info['first_day']['date'], $month_info['last_day']['date']) : array();
@@ -440,8 +456,9 @@ 
 	{
 		$calendarGrid['week_days'][] = $count;
 		$count++;
-		if ($count == 7)
-			$count = 0;
+		if ($count == 7) {
+					$count = 0;
+		}
 	}
 
 	// Iterate through each week.
@@ -458,8 +475,9 @@ 
 		{
 			$nDay = ($nRow * 7) + $nCol - $nShift + 1;
 
-			if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month'])
-				$nDay = 0;
+			if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month']) {
+							$nDay = 0;
+			}
 
 			$date = sprintf('%04d-%02d-%02d', $year, $month, $nDay);
 
@@ -477,8 +495,9 @@ 
 	}
 
 	// What is the last day of the month?
-	if ($is_previous === true)
-		$calendarGrid['last_of_month'] = $month_info['last_day']['day_of_month'];
+	if ($is_previous === true) {
+			$calendarGrid['last_of_month'] = $month_info['last_day']['day_of_month'];
+	}
 
 	// We'll use the shift in the template.
 	$calendarGrid['shift'] = $nShift;
@@ -512,8 +531,9 @@ 
 	{
 		// Here we offset accordingly to get things to the real start of a week.
 		$date_diff = $day_of_week - $calendarOptions['start_day'];
-		if ($date_diff < 0)
-			$date_diff += 7;
+		if ($date_diff < 0) {
+					$date_diff += 7;
+		}
 		$new_timestamp = mktime(0, 0, 0, $month, $day, $year) - $date_diff * 86400;
 		$day = (int) strftime('%d', $new_timestamp);
 		$month = (int) strftime('%m', $new_timestamp);
@@ -643,18 +663,20 @@ 
 	{
 		foreach ($date_events as $event_key => $event_val)
 		{
-			if (in_array($event_val['id'], $temp))
-				unset($calendarGrid['events'][$date][$event_key]);
-			else
-				$temp[] = $event_val['id'];
+			if (in_array($event_val['id'], $temp)) {
+							unset($calendarGrid['events'][$date][$event_key]);
+			} else {
+							$temp[] = $event_val['id'];
+			}
 		}
 	}
 
 	// Give birthdays and holidays a friendly format, without the year
-	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$date_format = '%b %d';
-	else
-		$date_format = str_replace(array('%Y', '%y', '%G', '%g', '%C', '%c', '%D'), array('', '', '', '', '', '%b %d', '%m/%d'), $matches[0]);
+	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$date_format = '%b %d';
+	} else {
+			$date_format = str_replace(array('%Y', '%y', '%G', '%g', '%C', '%c', '%D'), array('', '', '', '', '', '%b %d', '%m/%d'), $matches[0]);
+	}
 
 	foreach (array('birthdays', 'holidays') as $type)
 	{
@@ -762,8 +784,9 @@ 
 	// Holidays between now and now + days.
 	for ($i = $now; $i < $now + $days_for_index; $i += 86400)
 	{
-		if (isset($cached_data['holidays'][strftime('%Y-%m-%d', $i)]))
-			$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][strftime('%Y-%m-%d', $i)]);
+		if (isset($cached_data['holidays'][strftime('%Y-%m-%d', $i)])) {
+					$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][strftime('%Y-%m-%d', $i)]);
+		}
 	}
 
 	// Happy Birthday, guys and gals!
@@ -772,8 +795,9 @@ 
 		$loop_date = strftime('%Y-%m-%d', $i);
 		if (isset($cached_data['birthdays'][$loop_date]))
 		{
-			foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy)
-				$cached_data['birthdays'][strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+			foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy) {
+							$cached_data['birthdays'][strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+			}
 			$return_data['calendar_birthdays'] = array_merge($return_data['calendar_birthdays'], $cached_data['birthdays'][$loop_date]);
 		}
 	}
@@ -785,8 +809,9 @@ 
 		$loop_date = strftime('%Y-%m-%d', $i);
 
 		// No events today? Check the next day.
-		if (empty($cached_data['events'][$loop_date]))
-			continue;
+		if (empty($cached_data['events'][$loop_date])) {
+					continue;
+		}
 
 		// Loop through all events to add a few last-minute values.
 		foreach ($cached_data['events'][$loop_date] as $ev => $event)
@@ -799,9 +824,9 @@ 
 			{
 				unset($cached_data['events'][$loop_date][$ev]);
 				continue;
+			} else {
+							$duplicates[$this_event['topic'] . $this_event['title']] = true;
 			}
-			else
-				$duplicates[$this_event['topic'] . $this_event['title']] = true;
 
 			// Might be set to true afterwards, depending on the permissions.
 			$this_event['can_edit'] = false;
@@ -809,15 +834,18 @@ 
 			$this_event['date'] = $loop_date;
 		}
 
-		if (!empty($cached_data['events'][$loop_date]))
-			$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]);
+		if (!empty($cached_data['events'][$loop_date])) {
+					$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]);
+		}
 	}
 
 	// Mark the last item so that a list separator can be used in the template.
-	for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++)
-		$return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]);
-	for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++)
-		$return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+	for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++) {
+			$return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]);
+	}
+	for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++) {
+			$return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+	}
 
 	return array(
 		'data' => $return_data,
@@ -865,37 +893,46 @@ 
 		if (isset($_POST['start_date']))
 		{
 			$d = date_parse($_POST['start_date']);
-			if (!empty($d['error_count']) || !empty($d['warning_count']))
-				fatal_lang_error('invalid_date', false);
-			if (empty($d['year']))
-				fatal_lang_error('event_year_missing', false);
-			if (empty($d['month']))
-				fatal_lang_error('event_month_missing', false);
-		}
-		elseif (isset($_POST['start_datetime']))
+			if (!empty($d['error_count']) || !empty($d['warning_count'])) {
+							fatal_lang_error('invalid_date', false);
+			}
+			if (empty($d['year'])) {
+							fatal_lang_error('event_year_missing', false);
+			}
+			if (empty($d['month'])) {
+							fatal_lang_error('event_month_missing', false);
+			}
+		} elseif (isset($_POST['start_datetime']))
 		{
 			$d = date_parse($_POST['start_datetime']);
-			if (!empty($d['error_count']) || !empty($d['warning_count']))
-				fatal_lang_error('invalid_date', false);
-			if (empty($d['year']))
-				fatal_lang_error('event_year_missing', false);
-			if (empty($d['month']))
-				fatal_lang_error('event_month_missing', false);
+			if (!empty($d['error_count']) || !empty($d['warning_count'])) {
+							fatal_lang_error('invalid_date', false);
+			}
+			if (empty($d['year'])) {
+							fatal_lang_error('event_year_missing', false);
+			}
+			if (empty($d['month'])) {
+							fatal_lang_error('event_month_missing', false);
+			}
 		}
 		// The 2.0 way
 		else
 		{
 			// No month?  No year?
-			if (!isset($_POST['month']))
-				fatal_lang_error('event_month_missing', false);
-			if (!isset($_POST['year']))
-				fatal_lang_error('event_year_missing', false);
+			if (!isset($_POST['month'])) {
+							fatal_lang_error('event_month_missing', false);
+			}
+			if (!isset($_POST['year'])) {
+							fatal_lang_error('event_year_missing', false);
+			}
 
 			// Check the month and year...
-			if ($_POST['month'] < 1 || $_POST['month'] > 12)
-				fatal_lang_error('invalid_month', false);
-			if ($_POST['year'] < $modSettings['cal_minyear'] || $_POST['year'] > $modSettings['cal_maxyear'])
-				fatal_lang_error('invalid_year', false);
+			if ($_POST['month'] < 1 || $_POST['month'] > 12) {
+							fatal_lang_error('invalid_month', false);
+			}
+			if ($_POST['year'] < $modSettings['cal_minyear'] || $_POST['year'] > $modSettings['cal_maxyear']) {
+							fatal_lang_error('invalid_year', false);
+			}
 		}
 	}
 
@@ -905,8 +942,9 @@ 
 	// If they want to us to calculate an end date, make sure it will fit in an acceptable range.
 	if (isset($_POST['span']))
 	{
-		if (($_POST['span'] < 1) || (!empty($modSettings['cal_maxspan']) && $_POST['span'] > $modSettings['cal_maxspan']))
-			fatal_lang_error('invalid_days_numb', false);
+		if (($_POST['span'] < 1) || (!empty($modSettings['cal_maxspan']) && $_POST['span'] > $modSettings['cal_maxspan'])) {
+					fatal_lang_error('invalid_days_numb', false);
+		}
 	}
 
 	// There is no need to validate the following values if we are just deleting the event.
@@ -916,24 +954,29 @@ 
 		if (empty($_POST['start_date']) && empty($_POST['start_datetime']))
 		{
 			// No day?
-			if (!isset($_POST['day']))
-				fatal_lang_error('event_day_missing', false);
+			if (!isset($_POST['day'])) {
+							fatal_lang_error('event_day_missing', false);
+			}
 
 			// Bad day?
-			if (!checkdate($_POST['month'], $_POST['day'], $_POST['year']))
-				fatal_lang_error('invalid_date', false);
+			if (!checkdate($_POST['month'], $_POST['day'], $_POST['year'])) {
+							fatal_lang_error('invalid_date', false);
+			}
 		}
 
-		if (!isset($_POST['evtitle']) && !isset($_POST['subject']))
-			fatal_lang_error('event_title_missing', false);
-		elseif (!isset($_POST['evtitle']))
-			$_POST['evtitle'] = $_POST['subject'];
+		if (!isset($_POST['evtitle']) && !isset($_POST['subject'])) {
+					fatal_lang_error('event_title_missing', false);
+		} elseif (!isset($_POST['evtitle'])) {
+					$_POST['evtitle'] = $_POST['subject'];
+		}
 
 		// No title?
-		if ($smcFunc['htmltrim']($_POST['evtitle']) === '')
-			fatal_lang_error('no_event_title', false);
-		if ($smcFunc['strlen']($_POST['evtitle']) > 100)
-			$_POST['evtitle'] = $smcFunc['substr']($_POST['evtitle'], 0, 100);
+		if ($smcFunc['htmltrim']($_POST['evtitle']) === '') {
+					fatal_lang_error('no_event_title', false);
+		}
+		if ($smcFunc['strlen']($_POST['evtitle']) > 100) {
+					$_POST['evtitle'] = $smcFunc['substr']($_POST['evtitle'], 0, 100);
+		}
 		$_POST['evtitle'] = str_replace(';', '', $_POST['evtitle']);
 	}
 }
@@ -960,8 +1003,9 @@ 
 	);
 
 	// No results, return false.
-	if ($smcFunc['db_num_rows'] === 0)
-		return false;
+	if ($smcFunc['db_num_rows'] === 0) {
+			return false;
+	}
 
 	// Grab the results and return.
 	list ($poster) = $smcFunc['db_fetch_row']($request);
@@ -1095,8 +1139,9 @@ 
 	call_integration_hook('integrate_modify_event', array($event_id, &$eventOptions, &$event_columns, &$event_parameters));
 
 	$column_clauses = array();
-	foreach ($event_columns as $col => $crit)
-		$column_clauses[] = $col . ' = ' . $crit;
+	foreach ($event_columns as $col => $crit) {
+			$column_clauses[] = $col . ' = ' . $crit;
+	}
 
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}calendar
@@ -1181,8 +1226,9 @@ 
 	);
 
 	// If nothing returned, we are in poo, poo.
-	if ($smcFunc['db_num_rows']($request) === 0)
-		return false;
+	if ($smcFunc['db_num_rows']($request) === 0) {
+			return false;
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
@@ -1190,8 +1236,9 @@ 
 	list($start, $end, $allday, $span, $tz, $tz_abbrev) = buildEventDatetimes($row);
 
 	// Sanity check
-	if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count']))
-		return false;
+	if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) {
+			return false;
+	}
 
 	$return_value = array(
 		'boards' => array(),
@@ -1328,24 +1375,27 @@ 
 
 	// Set $span, in case we need it
 	$span = isset($eventOptions['span']) ? $eventOptions['span'] : (isset($_POST['span']) ? $_POST['span'] : 0);
-	if ($span > 0)
-		$span = !empty($modSettings['cal_maxspan']) ? min($modSettings['cal_maxspan'], $span - 1) : $span - 1;
+	if ($span > 0) {
+			$span = !empty($modSettings['cal_maxspan']) ? min($modSettings['cal_maxspan'], $span - 1) : $span - 1;
+	}
 
 	// Define the timezone for this event, falling back to the default if not provided
-	if (!empty($eventOptions['tz']) && in_array($eventOptions['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
-		$tz = $eventOptions['tz'];
-	elseif (!empty($_POST['tz']) && in_array($_POST['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
-		$tz = $_POST['tz'];
-	else
-		$tz = getUserTimezone();
+	if (!empty($eventOptions['tz']) && in_array($eventOptions['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) {
+			$tz = $eventOptions['tz'];
+	} elseif (!empty($_POST['tz']) && in_array($_POST['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) {
+			$tz = $_POST['tz'];
+	} else {
+			$tz = getUserTimezone();
+	}
 
 	// Is this supposed to be an all day event, or should it have specific start and end times?
-	if (isset($eventOptions['allday']))
-		$allday = $eventOptions['allday'];
-	elseif (empty($_POST['allday']))
-		$allday = false;
-	else
-		$allday = true;
+	if (isset($eventOptions['allday'])) {
+			$allday = $eventOptions['allday'];
+	} elseif (empty($_POST['allday'])) {
+			$allday = false;
+	} else {
+			$allday = true;
+	}
 
 	// Input might come as individual parameters...
 	$start_year = isset($eventOptions['year']) ? $eventOptions['year'] : (isset($_POST['year']) ? $_POST['year'] : null);
@@ -1372,10 +1422,12 @@ 
 	$end_time_string = isset($eventOptions['end_time']) ? $eventOptions['end_time'] : (isset($_POST['end_time']) ? $_POST['end_time'] : null);
 
 	// If the date and time were given in separate strings, combine them
-	if (empty($start_string) && isset($start_date_string))
-		$start_string = $start_date_string . (isset($start_time_string) ? ' ' . $start_time_string : '');
-	if (empty($end_string) && isset($end_date_string))
-		$end_string = $end_date_string . (isset($end_time_string) ? ' ' . $end_time_string : '');
+	if (empty($start_string) && isset($start_date_string)) {
+			$start_string = $start_date_string . (isset($start_time_string) ? ' ' . $start_time_string : '');
+	}
+	if (empty($end_string) && isset($end_date_string)) {
+			$end_string = $end_date_string . (isset($end_time_string) ? ' ' . $end_time_string : '');
+	}
 
 	// If some form of string input was given, override individually defined options with it
 	if (isset($start_string))
@@ -1466,10 +1518,11 @@ 
 	if ($start_object >= $end_object)
 	{
 		$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, $start_hour, $start_minute, $start_second) . ' ' . $tz);
-		if ($span > 0)
-			date_add($end_object, date_interval_create_from_date_string($span . ' days'));
-		else
-			date_add($end_object, date_interval_create_from_date_string('1 hour'));
+		if ($span > 0) {
+					date_add($end_object, date_interval_create_from_date_string($span . ' days'));
+		} else {
+					date_add($end_object, date_interval_create_from_date_string('1 hour'));
+		}
 	}
 
 	// Is $end_object too late?
@@ -1482,9 +1535,9 @@ 
 			{
 				$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, $start_hour, $start_minute, $start_second) . ' ' . $tz);
 				date_add($end_object, date_interval_create_from_date_string($modSettings['cal_maxspan'] . ' days'));
+			} else {
+							$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, '11', '59', '59') . ' ' . $tz);
 			}
-			else
-				$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, '11', '59', '59') . ' ' . $tz);
 		}
 	}
 
@@ -1497,8 +1550,7 @@ 
 		$start_time = null;
 		$end_time = null;
 		$tz = null;
-	}
-	else
+	} else
 	{
 		$start_time = date_format($start_object, 'H:i:s');
 		$end_time = date_format($end_object, 'H:i:s');
@@ -1519,16 +1571,18 @@ 
 	require_once($sourcedir . '/Subs.php');
 
 	// First, try to create a better date format, ignoring the "time" elements.
-	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$date_format = '%F';
-	else
-		$date_format = $matches[0];
+	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$date_format = '%F';
+	} else {
+			$date_format = $matches[0];
+	}
 
 	// We want a fairly compact version of the time, but as close as possible to the user's settings.
-	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$time_format = '%k:%M';
-	else
-		$time_format = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$time_format = '%k:%M';
+	} else {
+			$time_format = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	}
 
 	// Should this be an all day event?
 	$allday = (empty($row['start_time']) || empty($row['end_time']) || empty($row['timezone']) || !in_array($row['timezone'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) ? true : false;
@@ -1537,8 +1591,9 @@ 
 	$span = 1 + date_interval_format(date_diff(date_create($row['start_date']), date_create($row['end_date'])), '%d');
 
 	// We need to have a defined timezone in the steps below
-	if (empty($row['timezone']))
-		$row['timezone'] = getUserTimezone();
+	if (empty($row['timezone'])) {
+			$row['timezone'] = getUserTimezone();
+	}
 
 	// Get most of the standard date information for the start and end datetimes
 	$start = date_parse($row['start_date'] . (!$allday ? ' ' . $row['start_time'] : ''));
@@ -1582,8 +1637,9 @@ 
 		$tz_location = timezone_location_get(timezone_open($row['timezone']));
 
 		// Kazakstan
-		if ($tz_location['country_code'] == 'KZ')
-			$tz_abbrev = str_replace(array('+05', '+06'), array('AQTT', 'ALMT'), $tz_abbrev);
+		if ($tz_location['country_code'] == 'KZ') {
+					$tz_abbrev = str_replace(array('+05', '+06'), array('AQTT', 'ALMT'), $tz_abbrev);
+		}
 
 		// Russia likes to experiment with time zones
 		if ($tz_location['country_code'] == 'RU')
@@ -1594,8 +1650,9 @@ 
 		}
 
 		// Still no good? We'll just mark it as a UTC offset
-		if (strspn($tz_abbrev, '+-') > 0)
-			$tz_abbrev = 'UTC' . $tz_abbrev;
+		if (strspn($tz_abbrev, '+-') > 0) {
+					$tz_abbrev = 'UTC' . $tz_abbrev;
+		}
 	}
 
 	return array($start, $end, $allday, $span, $tz, $tz_abbrev);
@@ -1611,8 +1668,9 @@ 
 {
 	global $smcFunc, $context, $sourcedir, $user_info, $modSettings;
 
-	if (is_null($id_member) && $user_info['is_guest'] == false)
-		$id_member = $context['user']['id'];
+	if (is_null($id_member) && $user_info['is_guest'] == false) {
+			$id_member = $context['user']['id'];
+	}
 
 	if (isset($id_member))
 	{
@@ -1628,8 +1686,9 @@ 
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
-		$timezone = isset($modSettings['default_timezone']) ? $modSettings['default_timezone'] : date_default_timezone_get();
+	if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) {
+			$timezone = isset($modSettings['default_timezone']) ? $modSettings['default_timezone'] : date_default_timezone_get();
+	}
 
 	return $timezone;
 }
@@ -1658,8 +1717,9 @@ 
 		)
 	);
 	$holidays = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$holidays[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$holidays[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $holidays;

Sources/Calendar.php

Braces +125 added lines, -99 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Show the calendar.
@@ -47,12 +48,14 @@ 
 		'post' => 'CalendarPost',
 	);
 
-	if (isset($_GET['sa']) && isset($subActions[$_GET['sa']]))
-		return call_helper($subActions[$_GET['sa']]);
+	if (isset($_GET['sa']) && isset($subActions[$_GET['sa']])) {
+			return call_helper($subActions[$_GET['sa']]);
+	}
 
 	// You can't do anything if the calendar is off.
-	if (empty($modSettings['cal_enabled']))
-		fatal_lang_error('calendar_off', false);
+	if (empty($modSettings['cal_enabled'])) {
+			fatal_lang_error('calendar_off', false);
+	}
 
 	// This is gonna be needed...
 	loadTemplate('Calendar');
@@ -80,8 +83,9 @@ 
 				$_REQUEST['month'] = (int) $_REQUEST['month'];
 
 				// We want month view.
-				if (empty($_GET['viewmonth']))
-					$_GET['viewmonth'] = true;
+				if (empty($_GET['viewmonth'])) {
+									$_GET['viewmonth'] = true;
+				}
 
 				// And we definitely don't want weekly view.
 				unset ($_GET['viewweek']);
@@ -98,22 +102,25 @@ 
 	$context['page_title'] = $txt['calendar'];
 
 	// Ensure a default view is defined
-	if (empty($modSettings['calendar_default_view']))
-		$modSettings['calendar_default_view'] = 'view_list';
+	if (empty($modSettings['calendar_default_view'])) {
+			$modSettings['calendar_default_view'] = 'view_list';
+	}
 
 	// What view do we want?
-	if (isset($_GET['viewweek']))
-		$context['calendar_view'] = 'view_week';
-	elseif (isset($_GET['viewmonth']))
-		$context['calendar_view'] = 'view_month';
-	elseif (isset($_GET['viewlist']))
-		$context['calendar_view'] = 'view_list';
-	else
-		$context['calendar_view'] = $modSettings['calendar_default_view'];
+	if (isset($_GET['viewweek'])) {
+			$context['calendar_view'] = 'view_week';
+	} elseif (isset($_GET['viewmonth'])) {
+			$context['calendar_view'] = 'view_month';
+	} elseif (isset($_GET['viewlist'])) {
+			$context['calendar_view'] = 'view_list';
+	} else {
+			$context['calendar_view'] = $modSettings['calendar_default_view'];
+	}
 
 	// Don't let search engines index the non-default calendar pages
-	if ($context['calendar_view'] !== $modSettings['calendar_default_view'])
-		$context['robot_no_index'] = true;
+	if ($context['calendar_view'] !== $modSettings['calendar_default_view']) {
+			$context['robot_no_index'] = true;
+	}
 
 	// Get the current day of month...
 	require_once($sourcedir . '/Subs-Calendar.php');
@@ -174,16 +181,19 @@ 
 	);
 
 	// Make sure the year and month are in valid ranges.
-	if ($curPage['month'] < 1 || $curPage['month'] > 12)
-		fatal_lang_error('invalid_month', false);
-	if ($curPage['year'] < $modSettings['cal_minyear'] || $curPage['year'] > $modSettings['cal_maxyear'])
-		fatal_lang_error('invalid_year', false);
+	if ($curPage['month'] < 1 || $curPage['month'] > 12) {
+			fatal_lang_error('invalid_month', false);
+	}
+	if ($curPage['year'] < $modSettings['cal_minyear'] || $curPage['year'] > $modSettings['cal_maxyear']) {
+			fatal_lang_error('invalid_year', false);
+	}
 	// If we have a day clean that too.
 	if ($context['calendar_view'] != 'view_month')
 	{
 		$isValid = checkdate($curPage['month'], $curPage['day'], $curPage['year']);
-		if (!$isValid)
-			fatal_lang_error('invalid_day', false);
+		if (!$isValid) {
+					fatal_lang_error('invalid_day', false);
+		}
 	}
 
 	// Load all the context information needed to show the calendar grid.
@@ -205,23 +215,26 @@ 
 	);
 
 	// Load up the main view.
-	if ($context['calendar_view'] == 'view_list')
-		$context['calendar_grid_main'] = getCalendarList($curPage['start_date'], $curPage['end_date'], $calendarOptions);
-	elseif ($context['calendar_view'] == 'view_week')
-		$context['calendar_grid_main'] = getCalendarWeek($curPage['month'], $curPage['year'], $curPage['day'], $calendarOptions);
-	else
-		$context['calendar_grid_main'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
+	if ($context['calendar_view'] == 'view_list') {
+			$context['calendar_grid_main'] = getCalendarList($curPage['start_date'], $curPage['end_date'], $calendarOptions);
+	} elseif ($context['calendar_view'] == 'view_week') {
+			$context['calendar_grid_main'] = getCalendarWeek($curPage['month'], $curPage['year'], $curPage['day'], $calendarOptions);
+	} else {
+			$context['calendar_grid_main'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
+	}
 
 	// Load up the previous and next months.
 	$context['calendar_grid_current'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
 
 	// Only show previous month if it isn't pre-January of the min-year
-	if ($context['calendar_grid_current']['previous_calendar']['year'] > $modSettings['cal_minyear'] || $curPage['month'] != 1)
-		$context['calendar_grid_prev'] = getCalendarGrid($context['calendar_grid_current']['previous_calendar']['month'], $context['calendar_grid_current']['previous_calendar']['year'], $calendarOptions, true);
+	if ($context['calendar_grid_current']['previous_calendar']['year'] > $modSettings['cal_minyear'] || $curPage['month'] != 1) {
+			$context['calendar_grid_prev'] = getCalendarGrid($context['calendar_grid_current']['previous_calendar']['month'], $context['calendar_grid_current']['previous_calendar']['year'], $calendarOptions, true);
+	}
 
 	// Only show next month if it isn't post-December of the max-year
-	if ($context['calendar_grid_current']['next_calendar']['year'] < $modSettings['cal_maxyear'] || $curPage['month'] != 12)
-		$context['calendar_grid_next'] = getCalendarGrid($context['calendar_grid_current']['next_calendar']['month'], $context['calendar_grid_current']['next_calendar']['year'], $calendarOptions);
+	if ($context['calendar_grid_current']['next_calendar']['year'] < $modSettings['cal_maxyear'] || $curPage['month'] != 12) {
+			$context['calendar_grid_next'] = getCalendarGrid($context['calendar_grid_current']['next_calendar']['month'], $context['calendar_grid_current']['next_calendar']['year'], $calendarOptions);
+	}
 
 	// Basic template stuff.
 	$context['allow_calendar_event'] = allowedTo('calendar_post');
@@ -241,8 +254,9 @@ 
 	$context['blocks_disabled'] = !empty($modSettings['cal_disable_prev_next']) ? 1 : 0;
 
 	// Set the page title to mention the month or week, too
-	if ($context['calendar_view'] != 'view_list')
-		$context['page_title'] .= ' - ' . ($context['calendar_view'] == 'view_week' ? $context['calendar_grid_main']['week_title'] : $txt['months'][$context['current_month']] . ' ' . $context['current_year']);
+	if ($context['calendar_view'] != 'view_list') {
+			$context['page_title'] .= ' - ' . ($context['calendar_view'] == 'view_week' ? $context['calendar_grid_main']['week_title'] : $txt['months'][$context['current_month']] . ' ' . $context['current_year']);
+	}
 
 	// Load up the linktree!
 	$context['linktree'][] = array(
@@ -255,17 +269,19 @@ 
 		'name' => $txt['months'][$context['current_month']] . ' ' . $context['current_year']
 	);
 	// If applicable, add the current week to the linktree.
-	if ($context['calendar_view'] == 'view_week')
-		$context['linktree'][] = array(
+	if ($context['calendar_view'] == 'view_week') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=calendar;viewweek;year=' . $context['current_year'] . ';month=' . $context['current_month'] . ';day=' . $context['current_day'],
 			'name' => $context['calendar_grid_main']['week_title'],
 		);
+	}
 
 	// Build the calendar button array.
 	$context['calendar_buttons'] = array();
 
-	if ($context['can_post'])
-		$context['calendar_buttons']['post_event'] = array('text' => 'calendar_post_event', 'image' => 'calendarpe.png', 'url' => $scripturl . '?action=calendar;sa=post;month=' . $context['current_month'] . ';year=' . $context['current_year'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_post']) {
+			$context['calendar_buttons']['post_event'] = array('text' => 'calendar_post_event', 'image' => 'calendarpe.png', 'url' => $scripturl . '?action=calendar;sa=post;month=' . $context['current_month'] . ';year=' . $context['current_year'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
 	// Allow mods to add additional buttons here
 	call_integration_hook('integrate_calendar_buttons');
@@ -294,14 +310,16 @@ 
 	require_once($sourcedir . '/Subs.php');
 
 	// Cast this for safety...
-	if (isset($_REQUEST['eventid']))
-		$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
+	if (isset($_REQUEST['eventid'])) {
+			$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
+	}
 
 	// We want a fairly compact version of the time, but as close as possible to the user's settings.
-	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$time_string = '%k:%M';
-	else
-		$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$time_string = '%k:%M';
+	} else {
+			$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	}
 
 	$js_time_string = str_replace(
 		array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r',      '%R',  '%S', '%T',    '%X'),
@@ -315,12 +333,14 @@ 
 		checkSession();
 
 		// Validate the post...
-		if (!isset($_POST['link_to_board']))
-			validateEventPost();
+		if (!isset($_POST['link_to_board'])) {
+					validateEventPost();
+		}
 
 		// If you're not allowed to edit any events, you have to be the poster.
-		if ($_REQUEST['eventid'] > 0 && !allowedTo('calendar_edit_any'))
-			isAllowedTo('calendar_edit_' . (!empty($user_info['id']) && getEventPoster($_REQUEST['eventid']) == $user_info['id'] ? 'own' : 'any'));
+		if ($_REQUEST['eventid'] > 0 && !allowedTo('calendar_edit_any')) {
+					isAllowedTo('calendar_edit_' . (!empty($user_info['id']) && getEventPoster($_REQUEST['eventid']) == $user_info['id'] ? 'own' : 'any'));
+		}
 
 		// New - and directing?
 		if (isset($_POST['link_to_board']) || empty($modSettings['cal_allow_unlinked']))
@@ -343,8 +363,9 @@ 
 		}
 
 		// Deleting...
-		elseif (isset($_REQUEST['deleteevent']))
-			removeEvent($_REQUEST['eventid']);
+		elseif (isset($_REQUEST['deleteevent'])) {
+					removeEvent($_REQUEST['eventid']);
+		}
 
 		// ... or just update it?
 		else
@@ -366,14 +387,12 @@ 
 			$d = date_parse($_POST['start_date']);
 			$year = $d['year'];
 			$month = $d['month'];
-		}
-		elseif (isset($_POST['start_datetime']))
+		} elseif (isset($_POST['start_datetime']))
 		{
 			$d = date_parse($_POST['start_datetime']);
 			$year = $d['year'];
 			$month = $d['month'];
-		}
-		else
+		} else
 		{
 			$today = getdate();
 			$year = isset($_POST['year']) ? $_POST['year'] : $today['year'];
@@ -406,13 +425,13 @@ 
 		$context['event'] = array_merge($context['event'], $eventDatetimes);
 
 		$context['event']['last_day'] = (int) strftime('%d', mktime(0, 0, 0, $context['event']['month'] == 12 ? 1 : $context['event']['month'] + 1, 0, $context['event']['month'] == 12 ? $context['event']['year'] + 1 : $context['event']['year']));
-	}
-	else
+	} else
 	{
 		$context['event'] = getEventProperties($_REQUEST['eventid']);
 
-		if ($context['event'] === false)
-			fatal_lang_error('no_access', false);
+		if ($context['event'] === false) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// If it has a board, then they should be editing it within the topic.
 		if (!empty($context['event']['topic']['id']) && !empty($context['event']['topic']['first_msg']))
@@ -423,10 +442,11 @@ 
 		}
 
 		// Make sure the user is allowed to edit this event.
-		if ($context['event']['member'] != $user_info['id'])
-			isAllowedTo('calendar_edit_any');
-		elseif (!allowedTo('calendar_edit_any'))
-			isAllowedTo('calendar_edit_own');
+		if ($context['event']['member'] != $user_info['id']) {
+					isAllowedTo('calendar_edit_any');
+		} elseif (!allowedTo('calendar_edit_any')) {
+					isAllowedTo('calendar_edit_own');
+		}
 	}
 
 	// An all day event? Set up some nice defaults in case the user wants to change that
@@ -460,8 +480,7 @@ 
 	{
 		// You can post new events but can't link them to anything...
 		$context['event']['categories'] = array();
-	}
-	else
+	} else
 	{
 		// Load the list of boards and categories in the context.
 		require_once($sourcedir . '/Subs-MessageIndex.php');
@@ -548,12 +567,14 @@ 
 	global $smcFunc, $sourcedir, $forum_version, $modSettings, $webmaster_email, $mbname;
 
 	// You can't export if the calendar export feature is off.
-	if (empty($modSettings['cal_export']))
-		fatal_lang_error('calendar_export_off', false);
+	if (empty($modSettings['cal_export'])) {
+			fatal_lang_error('calendar_export_off', false);
+	}
 
 	// Goes without saying that this is required.
-	if (!isset($_REQUEST['eventid']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_REQUEST['eventid'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// This is kinda wanted.
 	require_once($sourcedir . '/Subs-Calendar.php');
@@ -561,15 +582,17 @@ 
 	// Load up the event in question and check it exists.
 	$event = getEventProperties($_REQUEST['eventid']);
 
-	if ($event === false)
-		fatal_lang_error('no_access', false);
+	if ($event === false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Check the title isn't too long - iCal requires some formatting if so.
 	$title = str_split($event['title'], 30);
 	foreach ($title as $id => $line)
 	{
-		if ($id != 0)
-			$title[$id] = ' ' . $title[$id];
+		if ($id != 0) {
+					$title[$id] = ' ' . $title[$id];
+		}
 		$title[$id] .= "\n";
 	}
 
@@ -582,8 +605,7 @@ 
 	{
 		$datestart = date_format($start_date, 'Ymd\THis');
 		$dateend = date_format($end_date, 'Ymd\THis');
-	}
-	else
+	} else
 	{
 		$datestart = date_format($start_date, 'Ymd');
 
@@ -604,15 +626,18 @@ 
 	$filecontents .= 'DTSTART' . (!empty($event['start_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $datestart . "\n";
 
 	// event has a duration
-	if ($event['start_iso_gmdate'] != $event['end_iso_gmdate'])
-		$filecontents .= 'DTEND' . (!empty($event['end_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $dateend . "\n";
+	if ($event['start_iso_gmdate'] != $event['end_iso_gmdate']) {
+			$filecontents .= 'DTEND' . (!empty($event['end_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $dateend . "\n";
+	}
 
 	// event has changed? advance the sequence for this UID
-	if ($event['sequence'] > 0)
-		$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	if ($event['sequence'] > 0) {
+			$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	}
 
-	if (!empty($event['location']))
-		$filecontents .= 'LOCATION:' . str_replace(',', '\,', $event['location']) . "\n";
+	if (!empty($event['location'])) {
+			$filecontents .= 'LOCATION:' . str_replace(',', '\,', $event['location']) . "\n";
+	}
 
 	$filecontents .= 'SUMMARY:' . implode('', $title);
 	$filecontents .= 'UID:' . $event['eventid'] . '@' . str_replace(' ', '-', $mbname) . "\n";
@@ -621,23 +646,26 @@ 
 
 	// Send some standard headers.
 	ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			ob_start();
+	}
 
 	// Send the file headers
 	header('Pragma: ');
 	header('Cache-Control: no-cache');
-	if (!isBrowser('gecko'))
-		header('Content-Transfer-Encoding: binary');
+	if (!isBrowser('gecko')) {
+			header('Content-Transfer-Encoding: binary');
+	}
 	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 525600 * 60) . ' GMT');
 	header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . 'GMT');
 	header('Accept-Ranges: bytes');
 	header('Connection: close');
 	header('Content-Disposition: attachment; filename="' . $event['title'] . '.ics"');
-	if (empty($modSettings['enableCompressedOutput']))
-		header('Content-Length: ' . $smcFunc['strlen']($filecontents));
+	if (empty($modSettings['enableCompressedOutput'])) {
+			header('Content-Length: ' . $smcFunc['strlen']($filecontents));
+	}
 
 	// This is a calendar item!
 	header('Content-Type: text/calendar');
@@ -676,20 +704,17 @@ 
 		$context['sub_template'] = 'bcd';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock;bcd', 'name' => 'BCD');
 		$context['clockicons'] = safe_unserialize(base64_decode('YTo2OntzOjI6ImgxIjthOjI6e2k6MDtpOjI7aToxO2k6MTt9czoyOiJoMiI7YTo0OntpOjA7aTo4O2k6MTtpOjQ7aToyO2k6MjtpOjM7aToxO31zOjI6Im0xIjthOjM6e2k6MDtpOjQ7aToxO2k6MjtpOjI7aToxO31zOjI6Im0yIjthOjQ6e2k6MDtpOjg7aToxO2k6NDtpOjI7aToyO2k6MztpOjE7fXM6MjoiczEiO2E6Mzp7aTowO2k6NDtpOjE7aToyO2k6MjtpOjE7fXM6MjoiczIiO2E6NDp7aTowO2k6ODtpOjE7aTo0O2k6MjtpOjI7aTozO2k6MTt9fQ=='));
-	}
-	elseif (!$omfg && !isset($_REQUEST['time']))
+	} elseif (!$omfg && !isset($_REQUEST['time']))
 	{
 		$context['sub_template'] = 'hms';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock', 'name' => 'Binary');
 		$context['clockicons'] = safe_unserialize(base64_decode('YTozOntzOjE6ImgiO2E6NTp7aTowO2k6MTY7aToxO2k6ODtpOjI7aTo0O2k6MztpOjI7aTo0O2k6MTt9czoxOiJtIjthOjY6e2k6MDtpOjMyO2k6MTtpOjE2O2k6MjtpOjg7aTozO2k6NDtpOjQ7aToyO2k6NTtpOjE7fXM6MToicyI7YTo2OntpOjA7aTozMjtpOjE7aToxNjtpOjI7aTo4O2k6MztpOjQ7aTo0O2k6MjtpOjU7aToxO319'));
-	}
-	elseif ($omfg)
+	} elseif ($omfg)
 	{
 		$context['sub_template'] = 'omfg';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock;omfg', 'name' => 'OMFG');
 		$context['clockicons'] = safe_unserialize(base64_decode('YTo2OntzOjQ6InllYXIiO2E6Nzp7aTowO2k6NjQ7aToxO2k6MzI7aToyO2k6MTY7aTozO2k6ODtpOjQ7aTo0O2k6NTtpOjI7aTo2O2k6MTt9czo1OiJtb250aCI7YTo0OntpOjA7aTo4O2k6MTtpOjQ7aToyO2k6MjtpOjM7aToxO31zOjM6ImRheSI7YTo1OntpOjA7aToxNjtpOjE7aTo4O2k6MjtpOjQ7aTozO2k6MjtpOjQ7aToxO31zOjQ6ImhvdXIiO2E6NTp7aTowO2k6MTY7aToxO2k6ODtpOjI7aTo0O2k6MztpOjI7aTo0O2k6MTt9czozOiJtaW4iO2E6Njp7aTowO2k6MzI7aToxO2k6MTY7aToyO2k6ODtpOjM7aTo0O2k6NDtpOjI7aTo1O2k6MTt9czozOiJzZWMiO2E6Njp7aTowO2k6MzI7aToxO2k6MTY7aToyO2k6ODtpOjM7aTo0O2k6NDtpOjI7aTo1O2k6MTt9fQ=='));
-	}
-	elseif (isset($_REQUEST['time']))
+	} elseif (isset($_REQUEST['time']))
 	{
 		$context['sub_template'] = 'thetime';
 		$time = getdate($_REQUEST['time'] == 'now' ? time() : (int) $_REQUEST['time']);
@@ -749,12 +774,13 @@ 
 			),
 		);
 
-		foreach ($context['clockicons'] as $t => $vs)
-			foreach ($vs as $v => $dumb)
+		foreach ($context['clockicons'] as $t => $vs) {
+					foreach ($vs as $v => $dumb)
 			{
 				if ($$t >= $v)
 				{
 					$$t -= $v;
+		}
 					$context['clockicons'][$t][$v] = true;
 				}
 			}

Sources/minify/data/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/minify/data/js/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/minify/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/minify/src/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/minify/src/Exceptions/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file