elkarte / Elkarte

sources/subs/Admin.subs.php

Braces +71 added lines, -29 removed lines

@@ -53,7 +53,9 @@ 
 	{
 		$conn = $db->connection();
 		if (empty($conn))
-			trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
+		{
+					trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
+		}
 		else
 		{
 			$versions['db_server'] = array('title' => sprintf($txt['support_versions_db'], $db->db_title()), 'version' => '');
@@ -66,19 +68,25 @@ 
 	foreach ($cache_engines as $name => $details)
 	{
 		if (in_array($name, $checkFor))
-			$versions[$name] = $details;
+		{
+					$versions[$name] = $details;
+		}
 	}
 
 	if (in_array('opcache', $checkFor) && extension_loaded('Zend OPcache'))
 	{
 		$opcache_config = @opcache_get_configuration();
 		if (!empty($opcache_config['directives']['opcache.enable']))
-			$versions['opcache'] = array('title' => $opcache_config['version']['opcache_product_name'], 'version' => $opcache_config['version']['version']);
+		{
+					$versions['opcache'] = array('title' => $opcache_config['version']['opcache_product_name'], 'version' => $opcache_config['version']['version']);
+		}
 	}
 
 	// PHP Version
 	if (in_array('php', $checkFor))
-		$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION . ' (' . php_sapi_name() . ')', 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	{
+			$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION . ' (' . php_sapi_name() . ')', 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	}
 
 	// Server info
 	if (in_array('server', $checkFor))
@@ -91,7 +99,9 @@ 
 		require_once(SUBSDIR . '/Server.subs.php');
 		$loading = detectServerLoad();
 		if ($loading !== false)
-			$versions['server_load'] = array('title' => $txt['loadavg'], 'version' => $loading);
+		{
+					$versions['server_load'] = array('title' => $txt['loadavg'], 'version' => $loading);
+		}
 	}
 
 	return $versions;
@@ -127,7 +137,9 @@ 
 	foreach ($quick_admin_tasks as $task)
 	{
 		if (!empty($task[0]) && !allowedTo($task[0]))
-			continue;
+		{
+					continue;
+		}
 
 		$available_admin_tasks[] = array(
 			'href' => $scripturl . '?action=admin;area=' . $task[1],
@@ -209,7 +221,9 @@ 
 
 	// Find the version in SSI.php's file header.
 	if (!empty($versionOptions['include_ssi']) && file_exists(BOARDDIR . '/SSI.php'))
-		readFileVersions($version_info, array('file_versions' => BOARDDIR), 'SSI.php');
+	{
+			readFileVersions($version_info, array('file_versions' => BOARDDIR), 'SSI.php');
+	}
 
 	// Do the paid subscriptions handler?
 	if (!empty($versionOptions['include_subscriptions']))
@@ -255,7 +269,9 @@ 
 	// Load all the files in the default template directory - and the current theme if applicable.
 	$directories = array('default_template_versions' => $settings['default_theme_dir']);
 	if ($settings['theme_id'] != 1)
-		$directories += array('template_versions' => $settings['theme_dir']);
+	{
+			$directories += array('template_versions' => $settings['theme_dir']);
+	}
 	readFileVersions($version_info, $directories, 'template.php');
 	readFileVersions($version_info, $directories, 'Theme.php');
 
@@ -265,7 +281,9 @@ 
 	while ($path = $this_dir->read())
 	{
 		if ($path == '.' || $path == '..')
-			continue;
+		{
+					continue;
+		}
 
 		if (is_dir($lang_dir . '/' . $path))
 		{
@@ -288,10 +306,13 @@ 
 
 					// Look for the version comment in the file header.
 					if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1)
-						$version_info['default_language_versions'][$language][$name] = $match[1];
+					{
+											$version_info['default_language_versions'][$language][$name] = $match[1];
+					}
 					// It wasn't found, but the file was... show a '??'.
-					else
-						$version_info['default_language_versions'][$language][$name] = '??';
+					else {
+											$version_info['default_language_versions'][$language][$name] = '??';
+					}
 				}
 			}
 		}
@@ -312,7 +333,9 @@ 
 
 		// For languages sort each language too.
 		foreach ($version_info['default_language_versions'] as $language => $dummy)
-			ksort($version_info['default_language_versions'][$language]);
+		{
+					ksort($version_info['default_language_versions'][$language]);
+		}
 	}
 
 	return $version_info;
@@ -377,10 +400,13 @@ 
 
 				// Look for the version comment in the file header.
 				if (preg_match($version_regex, $header, $match) == 1)
-					$version_info[$type][$entry_key] = $match[1];
+				{
+									$version_info[$type][$entry_key] = $match[1];
+				}
 				// It wasn't found, but the file was... show a $unknown_version.
-				else
-					$version_info[$type][$entry_key] = $unknown_version;
+				else {
+									$version_info[$type][$entry_key] = $unknown_version;
+				}
 			}
 		}
 	}
@@ -417,7 +443,9 @@ 
 
 	// This must exist!
 	if (!isset($context['admin_preferences']))
-		return false;
+	{
+			return false;
+	}
 
 	// This is what we'll be saving.
 	$options['admin_preferences'] = json_encode($context['admin_preferences']);
@@ -508,7 +536,9 @@ 
 		foreach ($additional_recipients as $recipient)
 		{
 			if (in_array($recipient['email'], $emails_sent))
-				continue;
+			{
+							continue;
+			}
 
 			$replacements['IDMEMBER'] = $recipient['id'];
 			$replacements['REALNAME'] = $recipient['name'];
@@ -566,8 +596,10 @@ 
 
 	// Should we calculate next trigger?
 	if ($value)
-		calculateNextTrigger('paid_subscriptions');
-}
+	{
+			calculateNextTrigger('paid_subscriptions');
+	}
+	}
 
 /**
  * Callback used in the core features page when the post-by-email feature
@@ -584,8 +616,10 @@ 
 
 	// Should we calculate next trigger?
 	if ($value)
-		calculateNextTrigger('maillist_fetch_IMAP');
-}
+	{
+			calculateNextTrigger('maillist_fetch_IMAP');
+	}
+	}
 
 /**
  * Enables a certain module on a set of controllers
@@ -602,9 +636,12 @@ 
 	foreach ((array) $controllers as $controller)
 	{
 		if (!empty($modSettings['modules_' . $controller]))
-			$existing = explode(',', $modSettings['modules_' . $controller]);
-		else
-			$existing = array();
+		{
+					$existing = explode(',', $modSettings['modules_' . $controller]);
+		}
+		else {
+					$existing = array();
+		}
 
 		$existing[] = $module;
 		$existing = array_filter(array_unique($existing));
@@ -627,9 +664,12 @@ 
 	foreach ((array) $controllers as $controller)
 	{
 		if (!empty($modSettings['modules_' . $controller]))
-			$existing = explode(',', $modSettings['modules_' . $controller]);
-		else
-			$existing = array();
+		{
+					$existing = explode(',', $modSettings['modules_' . $controller]);
+		}
+		else {
+					$existing = array();
+		}
 
 		$existing = array_diff($existing, (array) $module);
 		updateSettings(array('modules_' . $controller => implode(',', $existing)));
@@ -652,7 +692,9 @@ 
 		{
 			$modules = explode(',', $val);
 			if (in_array($module, $modules))
-				return true;
+			{
+							return true;
+			}
 		}
 	}
 

Spacing +2 added lines, -2 removed lines

@@ -241,7 +241,7 @@ 
 		'file_versions_subs' => SUBSDIR,
 		'file_versions_modules' => SOURCEDIR . '/modules',
 	);
-	$tmp_version_info = array_combine(array_keys($directories),array_fill(0,count($directories),array()));
+	$tmp_version_info = array_combine(array_keys($directories), array_fill(0, count($directories), array()));
 	readFileVersions($tmp_version_info, $directories, '.php', true);
 
 	foreach ($tmp_version_info['file_versions_subs'] as $key => $val)
@@ -484,7 +484,7 @@ 
 			'notify_types' => 4,
 			'group_array_implode' => implode(', additional_groups) != 0 OR FIND_IN_SET(', $groups),
 		),
-		function ($row) use($replacements, $modSettings, $language, $template)
+		function($row) use($replacements, $modSettings, $language, $template)
 		{
 			// Stick their particulars in the replacement data.
 			$replacements['IDMEMBER'] = $row['id_member'];

sources/subs/Categories.subs.php

Braces +51 added lines, -18 removed lines

@@ -42,7 +42,9 @@ 
 
 		// Setting 'move_after' to '0' moves the category to the top.
 		if ($catOptions['move_after'] == 0)
-			$cats[] = $category_id;
+		{
+					$cats[] = $category_id;
+		}
 
 		// Grab the categories sorted by cat_order.
 		$request = $db->query('', '
@@ -55,16 +57,21 @@ 
 		while ($row = $db->fetch_assoc($request))
 		{
 			if ($row['id_cat'] != $category_id)
-				$cats[] = $row['id_cat'];
+			{
+							$cats[] = $row['id_cat'];
+			}
 			if ($row['id_cat'] == $catOptions['move_after'])
-				$cats[] = $category_id;
+			{
+							$cats[] = $category_id;
+			}
 			$cat_order[$row['id_cat']] = $row['cat_order'];
 		}
 		$db->free_result($request);
 
 		// Set the new order for the categories.
 		foreach ($cats as $index => $cat)
-			if ($index != $cat_order[$cat])
+		{
+					if ($index != $cat_order[$cat])
 				$db->query('', '
 					UPDATE {db_prefix}categories
 					SET cat_order = {int:new_order}
@@ -74,6 +81,7 @@ 
 						'current_category' => $cat,
 					)
 				);
+		}
 
 		// If the category order changed, so did the board order.
 		require_once(SUBSDIR . '/Boards.subs.php');
@@ -111,7 +119,9 @@ 
 		);
 
 		if (empty($catOptions['dont_log']))
-			logAction('edit_cat', array('catname' => isset($catOptions['cat_name']) ? $catOptions['cat_name'] : $category_id), 'admin');
+		{
+					logAction('edit_cat', array('catname' => isset($catOptions['cat_name']) ? $catOptions['cat_name'] : $category_id), 'admin');
+		}
 	}
 }
 
@@ -129,13 +139,19 @@ 
 
 	// Check required values.
 	if (!isset($catOptions['cat_name']) || trim($catOptions['cat_name']) == '')
-		trigger_error('createCategory(): A category name is required', E_USER_ERROR);
+	{
+			trigger_error('createCategory(): A category name is required', E_USER_ERROR);
+	}
 
 	// Set default values.
 	if (!isset($catOptions['move_after']))
-		$catOptions['move_after'] = 0;
+	{
+			$catOptions['move_after'] = 0;
+	}
 	if (!isset($catOptions['is_collapsible']))
-		$catOptions['is_collapsible'] = true;
+	{
+			$catOptions['is_collapsible'] = true;
+	}
 	// Don't log an edit right after.
 	$catOptions['dont_log'] = true;
 
@@ -198,14 +214,18 @@ 
 		$boards_inside = array_keys(fetchBoardsInfo(array('categories' => $categories)));
 
 		if (!empty($boards_inside))
-			deleteBoards($boards_inside, null);
+		{
+					deleteBoards($boards_inside, null);
+		}
 	}
 	// Make sure the safe category is really safe.
 	elseif (in_array($moveBoardsTo, $categories))
-		trigger_error('deleteCategories(): You cannot move the boards to a category that\'s being deleted', E_USER_ERROR);
+	{
+			trigger_error('deleteCategories(): You cannot move the boards to a category that\'s being deleted', E_USER_ERROR);
+	}
 	// Move the boards inside the categories to a safe category.
-	else
-		$db->query('', '
+	else {
+			$db->query('', '
 			UPDATE {db_prefix}boards
 			SET id_cat = {int:new_parent_cat}
 			WHERE id_cat IN ({array_int:category_list})',
@@ -214,6 +234,7 @@ 
 				'new_parent_cat' => $moveBoardsTo,
 			)
 		);
+	}
 
 	// No one will ever be able to collapse these categories anymore.
 	$db->query('', '
@@ -235,7 +256,9 @@ 
 
 	// Log what we've done.
 	foreach ($categories as $category)
-		logAction('delete_cat', array('catname' => $cat_tree[$category]['node']['name']), 'admin');
+	{
+			logAction('delete_cat', array('catname' => $cat_tree[$category]['node']['name']), 'admin');
+	}
 
 	// Get all boards back into the right order.
 	reorderBoards();
@@ -270,7 +293,8 @@ 
 		);
 
 		if ($new_status === 'collapse')
-			$db->query('', '
+		{
+					$db->query('', '
 				INSERT INTO {db_prefix}collapsed_categories
 					(id_cat, id_member)
 				SELECT c.id_cat, mem.id_member
@@ -285,6 +309,7 @@ 
 					'is_collapsible' => 1,
 				)
 			);
+		}
 	}
 
 	// Toggle the categories: collapsed get expanded and expanded get collapsed.
@@ -309,15 +334,20 @@ 
 			function ($row) use (&$updates, $check_collapsable)
 			{
 				if (empty($row['is_collapsed']) && (!empty($row['can_collapse']) || !$check_collapsable))
-					$updates['insert'][] = array($row['id_member'], $row['id_cat']);
+				{
+									$updates['insert'][] = array($row['id_member'], $row['id_cat']);
+				}
 				elseif (!empty($row['is_collapsed']))
-					$updates['remove'][] = '(id_member = ' . $row['id_member'] . ' AND id_cat = ' . $row['id_cat'] . ')';
+				{
+									$updates['remove'][] = '(id_member = ' . $row['id_member'] . ' AND id_cat = ' . $row['id_cat'] . ')';
+				}
 			}
 		);
 
 		// Collapse the ones that were originally expanded...
 		if (!empty($updates['insert']))
-			$db->insert('replace',
+		{
+					$db->insert('replace',
 				'{db_prefix}collapsed_categories',
 				array(
 					'id_cat' => 'int', 'id_member' => 'int',
@@ -325,15 +355,18 @@ 
 				$updates['insert'],
 				array('id_cat', 'id_member')
 			);
+		}
 
 		// And expand the ones that were originally collapsed.
 		if (!empty($updates['remove']))
-			$db->query('', '
+		{
+					$db->query('', '
 				DELETE FROM {db_prefix}collapsed_categories
 				WHERE ' . implode(' OR ', $updates['remove']),
 				array(
 				)
 			);
+		}
 	}
 }
 

Spacing +1 added lines, -1 removed lines

@@ -306,7 +306,7 @@
 				'category_list' => $categories,
 				'member_list' => $members,
 			),
-			function ($row) use (&$updates, $check_collapsable)
+			function($row) use (&$updates, $check_collapsable)
 			{
 				if (empty($row['is_collapsed']) && (!empty($row['can_collapse']) || !$check_collapsable))
 					$updates['insert'][] = array($row['id_member'], $row['id_cat']);

sources/subs/Calendar.subs.php

Braces +150 added lines, -59 removed lines

@@ -65,9 +65,12 @@ 
 	while ($row = $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;
+		{
+					$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'],
@@ -80,7 +83,9 @@ 
 
 	// 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;
+	{
+			$bday[$mday][count($array) - 1]['is_last'] = true;
+	}
 
 	return $bday;
 }
@@ -137,7 +142,9 @@ 
 	{
 		// 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;
+		{
+					continue;
+		}
 
 		// Force a censor of the title - as often these are used by others.
 		$row['title'] = censor($row['title'], $use_permissions ? false : true);
@@ -153,12 +160,15 @@ 
 			// Attempt to avoid DST problems.
 			// @todo Resolve this properly at some point.
 			if (Util::strftime('%Y-%m-%d', $date) == $lastDate)
-				$date += 3601;
+			{
+							$date += 3601;
+			}
 			$lastDate = Util::strftime('%Y-%m-%d', $date);
 
 			// If we're using permissions (calendar pages?) then just ouput normal contextual style information.
 			if ($use_permissions)
-				$events[Util::strftime('%Y-%m-%d', $date)][] = array(
+			{
+							$events[Util::strftime('%Y-%m-%d', $date)][] = array(
 					'id' => $row['id_event'],
 					'title' => $row['title'],
 					'start_date' => $row['start_date'],
@@ -173,9 +183,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[Util::strftime('%Y-%m-%d', $date)][] = array(
+			else {
+							$events[Util::strftime('%Y-%m-%d', $date)][] = array(
 					'id' => $row['id_event'],
 					'title' => $row['title'],
 					'start_date' => $row['start_date'],
@@ -192,6 +203,7 @@ 
 					'poster' => $row['id_member'],
 					'allowed_groups' => explode(',', $row['member_groups']),
 				);
+			}
 		}
 	}
 	$db->free_result($result);
@@ -200,7 +212,9 @@ 
 	if ($use_permissions)
 	{
 		foreach ($events as $mday => $array)
-			$events[$mday][count($array) - 1]['is_last'] = true;
+		{
+					$events[$mday][count($array) - 1]['is_last'] = true;
+		}
 	}
 
 	return $events;
@@ -220,10 +234,13 @@ 
 
 	// 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}
+	{
+			$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 = $db->query('', '
@@ -244,9 +261,12 @@ 
 	while ($row = $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);
+		{
+					$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'];
 	}
@@ -277,9 +297,13 @@ 
 
 	// No board?  No topic?!?
 	if (empty($board))
-		throw new Elk_Exception('missing_board_id', false);
+	{
+			throw new Elk_Exception('missing_board_id', false);
+	}
 	if (empty($topic))
-		throw new Elk_Exception('missing_topic_id', false);
+	{
+			throw new Elk_Exception('missing_topic_id', false);
+	}
 
 	// Administrator, Moderator, or owner.  Period.
 	if (!allowedTo('admin_forum') && !allowedTo('moderate_board'))
@@ -290,11 +314,14 @@ 
 		{
 			// Not the owner of the topic.
 			if ($row['id_member_started'] != $user_info['id'])
-				throw new Elk_Exception('not_your_topic', 'user');
+			{
+							throw new Elk_Exception('not_your_topic', 'user');
+			}
 		}
 		// Topic/Board doesn't exist.....
-		else
-			throw new Elk_Exception('calendar_no_topic', 'general');
+		else {
+					throw new Elk_Exception('calendar_no_topic', 'general');
+		}
 	}
 }
 
@@ -379,13 +406,17 @@ 
 	{
 		$nShift -= $calendarOptions['start_day'];
 		if ($nShift < 0)
-			$nShift = 7 + $nShift;
+		{
+					$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++;
+	{
+			$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();
@@ -399,7 +430,9 @@ 
 		$calendarGrid['week_days'][] = $count;
 		$count++;
 		if ($count == 7)
-			$count = 0;
+		{
+					$count = 0;
+		}
 	}
 
 	// An adjustment value to apply to all calculated week numbers.
@@ -410,7 +443,9 @@ 
 		// a Sunday, then there is a partial week at the start of the year
 		// that needs to be accounted for.
 		if ($calendarOptions['start_day'] === 0)
-			$nWeekAdjust = $month_info['first_day_of_year'] === 0 ? 0 : 1;
+		{
+					$nWeekAdjust = $month_info['first_day_of_year'] === 0 ? 0 : 1;
+		}
 		// If we are viewing the weeks, with a starting date other than Sunday,
 		// then things get complicated! Basically, as PHP is calculating the
 		// weeks with a Sunday starting date, we need to take this into account
@@ -418,18 +453,22 @@ 
 		// year is above or below our starting date. Note that we offset by
 		// two, as some of this will get undone quite quickly by the statement
 		// below.
-		else
-			$nWeekAdjust = $calendarOptions['start_day'] > $month_info['first_day_of_year'] && $month_info['first_day_of_year'] !== 0 ? 2 : 1;
+		else {
+					$nWeekAdjust = $calendarOptions['start_day'] > $month_info['first_day_of_year'] && $month_info['first_day_of_year'] !== 0 ? 2 : 1;
+		}
 
 		// If our week starts on a day greater than the day the month starts
 		// on, then our week numbers will be one too high. So we need to
 		// reduce it by one - all these thoughts of offsets makes my head
 		// hurt...
 		if ($month_info['first_day']['day_of_week'] < $calendarOptions['start_day'] || $month_info['first_day_of_year'] > 4)
-			$nWeekAdjust--;
+		{
+					$nWeekAdjust--;
+		}
+	}
+	else {
+			$nWeekAdjust = 0;
 	}
-	else
-		$nWeekAdjust = 0;
 
 	// Iterate through each week.
 	$calendarGrid['weeks'] = array();
@@ -443,7 +482,9 @@ 
 
 		// Handle the dreaded "week 53", it can happen, but only once in a blue moon ;)
 		if ($calendarGrid['weeks'][$nRow]['number'] == 53 && $nShift != 4 && $month_info['first_day_of_next_year'] < 4)
-			$calendarGrid['weeks'][$nRow]['number'] = 1;
+		{
+					$calendarGrid['weeks'][$nRow]['number'] = 1;
+		}
 
 		// And figure out all the days.
 		for ($nCol = 0; $nCol < 7; $nCol++)
@@ -451,7 +492,9 @@ 
 			$nDay = ($nRow * 7) + $nCol - $nShift + 1;
 
 			if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month'])
-				$nDay = 0;
+			{
+							$nDay = 0;
+			}
 
 			$date = sprintf('%04d-%02d-%02d', $year, $month, $nDay);
 
@@ -499,7 +542,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;
+		{
+					$date_diff += 7;
+		}
 		$new_timestamp = mktime(0, 0, 0, $month, $day, $year) - $date_diff * 86400;
 		$day = (int) Util::strftime('%d', $new_timestamp);
 		$month = (int) Util::strftime('%m', $new_timestamp);
@@ -545,15 +590,20 @@ 
 
 		// All this is as getCalendarGrid.
 		if ($calendarOptions['start_day'] === 0)
-			$nWeekAdjust = $first_day_of_year === 0 && $first_day_of_year > 3 ? 0 : 1;
-		else
-			$nWeekAdjust = $calendarOptions['start_day'] > $first_day_of_year && $first_day_of_year !== 0 ? 2 : 1;
+		{
+					$nWeekAdjust = $first_day_of_year === 0 && $first_day_of_year > 3 ? 0 : 1;
+		}
+		else {
+					$nWeekAdjust = $calendarOptions['start_day'] > $first_day_of_year && $first_day_of_year !== 0 ? 2 : 1;
+		}
 
 		$calendarGrid['week_number'] = (int) Util::strftime('%U', mktime(0, 0, 0, $month, $day, $year)) + $nWeekAdjust;
 
 		// If this crosses a year boundary and includes january it should be week one.
 		if ((int) Util::strftime('%Y', $curTimestamp + 518400) != $year && $calendarGrid['week_number'] > 53 && $first_day_of_next_year < 5)
-			$calendarGrid['week_number'] = 1;
+		{
+					$calendarGrid['week_number'] = 1;
+		}
 	}
 
 	// This holds all the main data - there is at least one month!
@@ -668,7 +718,9 @@ 
 	for ($i = $now; $i < $now + $days_for_index; $i += 86400)
 	{
 		if (isset($cached_data['holidays'][Util::strftime('%Y-%m-%d', $i)]))
-			$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][Util::strftime('%Y-%m-%d', $i)]);
+		{
+					$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][Util::strftime('%Y-%m-%d', $i)]);
+		}
 	}
 
 	// Happy Birthday, guys and gals!
@@ -678,7 +730,9 @@ 
 		if (isset($cached_data['birthdays'][$loop_date]))
 		{
 			foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy)
-				$cached_data['birthdays'][Util::strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+			{
+							$cached_data['birthdays'][Util::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]);
 		}
 	}
@@ -691,7 +745,9 @@ 
 
 		// No events today? Check the next day.
 		if (empty($cached_data['events'][$loop_date]))
-			continue;
+		{
+					continue;
+		}
 
 		// Loop through all events to add a few last-minute values.
 		foreach ($cached_data['events'][$loop_date] as $ev => $event)
@@ -705,8 +761,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;
@@ -715,14 +772,20 @@ 
 		}
 
 		if (!empty($cached_data['events'][$loop_date]))
-			$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $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]);
+	{
+			$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_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+	}
 
 	return array(
 		'data' => $return_data,
@@ -781,7 +844,9 @@ 
 
 	// No results, return false.
 	if ($db->num_rows($request) === 0)
-		return false;
+	{
+			return false;
+	}
 
 	// Grab the results and return.
 	list ($poster) = $db->fetch_row($request);
@@ -818,11 +883,15 @@ 
 	$month = '';
 	$day = '';
 	if (($num_results = sscanf($eventOptions['start_date'], '%d-%d-%d', $year, $month, $day)) !== 3)
-		trigger_error('insertEvent(): invalid start date format given', E_USER_ERROR);
+	{
+			trigger_error('insertEvent(): invalid start date format given', E_USER_ERROR);
+	}
 
 	// Set the end date (if not yet given)
 	if (!isset($eventOptions['end_date']))
-		$eventOptions['end_date'] = Util::strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	{
+			$eventOptions['end_date'] = Util::strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	}
 
 	// If no topic and board are given, they are not linked to a topic.
 	$eventOptions['id_board'] = isset($eventOptions['id_board']) ? (int) $eventOptions['id_board'] : 0;
@@ -878,14 +947,18 @@ 
 	$month = '';
 	$day = '';
 	if (($num_results = sscanf($eventOptions['start_date'], '%d-%d-%d', $year, $month, $day)) !== 3)
-		trigger_error('modifyEvent(): invalid start date format given', E_USER_ERROR);
+	{
+			trigger_error('modifyEvent(): invalid start date format given', E_USER_ERROR);
+	}
 
 	// Default span to 0 days.
 	$eventOptions['span'] = isset($eventOptions['span']) ? (int) $eventOptions['span'] : 0;
 
 	// Set the end date to the start date + span (if the end date wasn't already given).
 	if (!isset($eventOptions['end_date']))
-		$eventOptions['end_date'] = Util::strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	{
+			$eventOptions['end_date'] = Util::strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	}
 
 	$event_columns = array(
 		'start_date' => 'start_date = {date:start_date}',
@@ -901,11 +974,15 @@ 
 
 	$to_update = array();
 	foreach ($event_columns as $key => $value)
-		if (isset($eventOptions[$key]))
+	{
+			if (isset($eventOptions[$key]))
 			$to_update[] = $value;
+	}
 
 	if (empty($to_update))
-		return;
+	{
+			return;
+	}
 
 	$db->query('', '
 		UPDATE {db_prefix}calendar
@@ -979,13 +1056,17 @@ 
 
 	// If nothing returned, we are in poo, poo.
 	if ($db->num_rows($request) === 0)
-		return false;
+	{
+			return false;
+	}
 
 	$row = $db->fetch_assoc($request);
 	$db->free_result($request);
 
 	if ($calendar_only)
-		$return_value = $row;
+	{
+			$return_value = $row;
+	}
 	else
 	{
 		$return_value = array(
@@ -1094,7 +1175,9 @@ 
 	$db = database();
 
 	if (!is_array($holiday_ids))
-		$holiday_ids = array($holiday_ids);
+	{
+			$holiday_ids = array($holiday_ids);
+	}
 
 	$db->query('', '
 		DELETE FROM {db_prefix}calendar_holidays
@@ -1185,13 +1268,15 @@ 
 			)
 		);
 	while ($row = $db->fetch_assoc($request))
-		$holiday = array(
+	{
+			$holiday = array(
 			'id' => $row['id_holiday'],
 			'day' => $row['day'],
 			'month' => $row['month'],
 			'year' => $row['year'] <= 4 ? 0 : $row['year'],
 			'title' => $row['title']
 		);
+	}
 	$db->free_result($request);
 
 	return $holiday;
@@ -1219,7 +1304,9 @@ 
 	foreach ($title as $id => $line)
 	{
 		if ($id != 0)
-			$title[$id] = ' ' . $title[$id];
+		{
+					$title[$id] = ' ' . $title[$id];
+		}
 		$title[$id] .= "\n";
 	}
 
@@ -1248,11 +1335,15 @@ 
 
 	// more than one day
 	if ($event['span'] > 1)
-		$filecontents .= 'DTEND;VALUE=DATE:' . $dateend . "\n";
+	{
+			$filecontents .= 'DTEND;VALUE=DATE:' . $dateend . "\n";
+	}
 
 	// event has changed? advance the sequence for this UID
 	if ($event['sequence'] > 0)
-		$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	{
+			$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	}
 
 	$filecontents .= 'SUMMARY:' . implode('', $title);
 	$filecontents .= 'UID:' . $event['eventid'] . '@' . str_replace(' ', '-', $mbname) . "\n";

sources/subs/UserNotification.class.php

Braces +12 added lines, -5 removed lines

@@ -141,10 +141,14 @@ 
 
 		$types = array();
 		foreach ($this->_valid_types as $val)
-			$types[$val] = $txt['usernotif_favicon_shape_' . $val];
+		{
+					$types[$val] = $txt['usernotif_favicon_shape_' . $val];
+		}
 		$positions = array();
 		foreach ($this->_valid_positions as $val)
-			$positions[$val] = $txt['usernotif_favicon_' . $val];
+		{
+					$positions[$val] = $txt['usernotif_favicon_' . $val];
+		}
 
 		$config_vars = array(
 			array('title', 'usernotif_title'),
@@ -189,9 +193,12 @@ 
 		{
 			$validation_errors = $validator->validation_errors($key);
 			if (empty($validation_errors))
-				$post[$key] = $validator->{$key};
-			else
-				$post[$key] = !empty($post[$key]) && isset($this->_modSettings[$key]) ? $this->_modSettings[$key] : '';
+			{
+							$post[$key] = $validator->{$key};
+			}
+			else {
+							$post[$key] = !empty($post[$key]) && isset($this->_modSettings[$key]) ? $this->_modSettings[$key] : '';
+			}
 		}
 
 		return $post;

sources/subs/Recent.subs.php

Braces +15 added lines, -5 removed lines

@@ -189,7 +189,9 @@ 
 		);
 
 		if ($user_info['id'] == $row['first_id_member'])
-			$board_ids['own'][$row['id_board']][] = $row['id_msg'];
+		{
+					$board_ids['own'][$row['id_board']][] = $row['id_msg'];
+		}
 		$board_ids['any'][$row['id_board']][] = $row['id_msg'];
 	}
 
@@ -237,12 +239,16 @@ 
 
 	// This is needed in case of topics marked unread.
 	if (empty($earliest_msg))
-		$earliest_msg = 0;
+	{
+			$earliest_msg = 0;
+	}
 	else
 	{
 		// Using caching, when possible, to ignore the below slow query.
 		if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time())
-			$earliest_msg2 = $_SESSION['cached_log_time'][1];
+		{
+					$earliest_msg2 = $_SESSION['cached_log_time'][1];
+		}
 		else
 		{
 			// This query is pretty slow, but it's needed to ensure nothing crucial is ignored.
@@ -259,7 +265,9 @@ 
 
 			// In theory this could be zero, if the first ever post is unread, so fudge it ;)
 			if ($earliest_msg2 == 0)
-				$earliest_msg2 = -1;
+			{
+							$earliest_msg2 = -1;
+			}
 
 			$_SESSION['cached_log_time'] = array(time(), $earliest_msg2);
 		}
@@ -377,8 +385,10 @@ 
 			'new_href' => $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['new_from'] . '#new',
 		);
 		if ($post['new'])
-			$post['link'] .= '
+		{
+					$post['link'] .= '
 							<a class="new_posts" href="' . $post['new_href'] . '" id="newicon' . $row['id_msg'] . '">' . $txt['new'] . '</a>';
+		}
 
 		$posts[] = $post;
 	}

sources/subs/ManageAttachments.subs.php

Braces +145 added lines, -58 removed lines

@@ -29,7 +29,9 @@ 
 	$db = database();
 
 	if (empty($attachments))
-		return 0;
+	{
+			return 0;
+	}
 
 	// For safety, check for thumbnails...
 	$request = $db->query('', '
@@ -49,14 +51,18 @@ 
 	{
 		// Update the thumbnail too...
 		if (!empty($row['id_thumb']))
-			$attachments[] = $row['id_thumb'];
+		{
+					$attachments[] = $row['id_thumb'];
+		}
 
 		$attachments[] = $row['id_attach'];
 	}
 	$db->free_result($request);
 
 	if (empty($attachments))
-		return 0;
+	{
+			return 0;
+	}
 
 	// Approving an attachment is not hard - it's easy.
 	$db->query('', '
@@ -144,23 +150,37 @@ 
 			// @todo the !empty($restriction) is a trick to override the checks on $_POST['attach_del'] in Post.controller
 			// In theory it should not be necessary
 			if (in_array($type, array('id_member', 'id_attach', 'id_msg')) && !empty($restriction))
-				$new_condition[] = 'a.' . $type . ($is_not ? ' NOT' : '') . ' IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			{
+							$new_condition[] = 'a.' . $type . ($is_not ? ' NOT' : '') . ' IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			}
 			elseif ($type == 'attachment_type')
-				$new_condition[] = 'a.attachment_type = {int:' . $real_type . '}';
+			{
+							$new_condition[] = 'a.attachment_type = {int:' . $real_type . '}';
+			}
 			elseif ($type == 'poster_time')
-				$new_condition[] = 'm.poster_time < {int:' . $real_type . '}';
+			{
+							$new_condition[] = 'm.poster_time < {int:' . $real_type . '}';
+			}
 			elseif ($type == 'last_login')
-				$new_condition[] = 'mem.last_login < {int:' . $real_type . '}';
+			{
+							$new_condition[] = 'mem.last_login < {int:' . $real_type . '}';
+			}
 			elseif ($type == 'size')
-				$new_condition[] = 'a.size > {int:' . $real_type . '}';
+			{
+							$new_condition[] = 'a.size > {int:' . $real_type . '}';
+			}
 			elseif ($type == 'id_topic')
-				$new_condition[] = 'm.id_topic IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			{
+							$new_condition[] = 'm.id_topic IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			}
 
 			// Add the parameter!
 			$query_parameter[$real_type] = $restriction;
 
 			if ($type == 'do_logging')
-				$do_logging = $condition['id_attach'];
+			{
+							$do_logging = $condition['id_attach'];
+			}
 		}
 
 		if (empty($new_condition))
@@ -208,7 +228,9 @@ 
 
 			// If this was a thumb, the parent attachment should know about it.
 			if (!empty($row['id_parent']))
-				$parents[] = $row['id_parent'];
+			{
+							$parents[] = $row['id_parent'];
+			}
 
 			// If this attachments has a thumb, remove it as well.
 			if (!empty($row['id_thumb']) && $autoThumbRemoval)
@@ -221,7 +243,9 @@ 
 
 		// Make a list.
 		if ($return_affected_messages && empty($row['attachment_type']))
-			$msgs[] = $row['id_msg'];
+		{
+					$msgs[] = $row['id_msg'];
+		}
 		$attach[] = $row['id_attach'];
 	}
 	$db->free_result($request);
@@ -229,7 +253,8 @@ 
 	// Removed attachments don't have to be updated anymore.
 	$parents = array_diff($parents, $attach);
 	if (!empty($parents))
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}attachments
 			SET id_thumb = {int:no_thumb}
 			WHERE id_attach IN ({array_int:parent_attachments})',
@@ -238,6 +263,7 @@ 
 				'no_thumb' => 0,
 			)
 		);
+	}
 
 	if (!empty($do_logging))
 	{
@@ -266,21 +292,26 @@ 
 	}
 
 	if (!empty($attach))
-		$db->query('', '
+	{
+			$db->query('', '
 			DELETE FROM {db_prefix}attachments
 			WHERE id_attach IN ({array_int:attachment_list})',
 			array(
 				'attachment_list' => $attach,
 			)
 		);
+	}
 
 	call_integration_hook('integrate_remove_attachments', array($attach));
 
 	if ($return_affected_messages)
-		return array_unique($msgs);
-	else
-		return true;
-}
+	{
+			return array_unique($msgs);
+	}
+	else {
+			return true;
+	}
+	}
 
 /**
  * Return an array of attachments directories.
@@ -293,18 +324,23 @@ 
 	global $modSettings;
 
 	if (empty($modSettings['attachmentUploadDir']))
-		return array(BOARDDIR . '/attachments');
+	{
+			return array(BOARDDIR . '/attachments');
+	}
 	elseif (!empty($modSettings['currentAttachmentUploadDir']))
 	{
 		// we have more directories
 		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		{
+					$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		}
 
 		return $modSettings['attachmentUploadDir'];
 	}
-	else
-		return array($modSettings['attachmentUploadDir']);
-}
+	else {
+			return array($modSettings['attachmentUploadDir']);
+	}
+	}
 
 /**
  * How many attachments we have overall.
@@ -396,11 +432,16 @@ 
 	global $modSettings;
 
 	if (!empty($modSettings['currentAttachmentUploadDir']))
-		$attach_dirs = Util::unserialize($modSettings['attachmentUploadDir']);
+	{
+			$attach_dirs = Util::unserialize($modSettings['attachmentUploadDir']);
+	}
 	elseif (!empty($modSettings['attachmentUploadDir']))
-		$attach_dirs = array($modSettings['attachmentUploadDir']);
-	else
-		$attach_dirs = array(BOARDDIR . '/attachments');
+	{
+			$attach_dirs = array($modSettings['attachmentUploadDir']);
+	}
+	else {
+			$attach_dirs = array(BOARDDIR . '/attachments');
+	}
 
 	return $attach_dirs;
 }
@@ -707,9 +748,12 @@ 
 	{
 		// Get the filename.
 		if ($row['attachment_type'] == 1)
-			$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
-		else
-			$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+		{
+					$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
+		}
+		else {
+					$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+		}
 
 		// File doesn't exist?
 		if (!file_exists($filename))
@@ -721,7 +765,9 @@ 
 				$attachment_name = !empty($row['file_hash']) ? $row['id_attach'] . '_' . $row['file_hash'] . '.elk' : getLegacyAttachmentFilename($row['filename'], $row['id_attach'], null, true);
 
 				if (!is_array($modSettings['attachmentUploadDir']))
-					$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+				{
+									$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+				}
 
 				// Loop through the other folders looking for this file
 				foreach ($modSettings['attachmentUploadDir'] as $id => $dir)
@@ -732,7 +778,9 @@ 
 
 						// Are we going to fix this now?
 						if ($fix_errors && in_array('wrong_folder', $to_fix))
-							attachment_folder($row['id_attach'], $id);
+						{
+													attachment_folder($row['id_attach'], $id);
+						}
 
 						// Found it, on to the next attachment
 						continue 2;
@@ -745,7 +793,9 @@ 
 					$attachment_name = $row['id_attach'] . '_' . $row['file_hash'];
 
 					if (!is_array($modSettings['attachmentUploadDir']))
-						$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+					{
+											$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+					}
 
 					// Loop through the other folders looking for this file
 					foreach ($modSettings['attachmentUploadDir'] as $id => $dir)
@@ -791,14 +841,18 @@ 
 
 			// Fix it here?
 			if ($fix_errors && in_array('file_wrong_size', $to_fix))
-				attachment_filesize($row['id_attach'], filesize($filename));
+			{
+							attachment_filesize($row['id_attach'], filesize($filename));
+			}
 		}
 	}
 	$db->free_result($result);
 
 	// Do we need to delete what we have?
 	if ($fix_errors && !empty($to_remove) && in_array('file_missing_on_disk', $to_fix))
-		removeOrphanAttachments($to_remove);
+	{
+			removeOrphanAttachments($to_remove);
+	}
 
 	return $repair_errors;
 }
@@ -840,9 +894,12 @@ 
 			if ($fix_errors && in_array('avatar_no_member', $to_fix))
 			{
 				if ($row['attachment_type'] == 1)
-					$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
-				else
-					$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+				{
+									$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
+				}
+				else {
+									$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+				}
 				@unlink($filename);
 			}
 
@@ -1217,7 +1274,9 @@ 
 	{
 		// If there aren't any attachments in this directory this won't exist.
 		if (!isset($expected_files[$id]))
-			$expected_files[$id] = 0;
+		{
+					$expected_files[$id] = 0;
+		}
 
 		// Check if the directory is doing okay.
 		list ($status, $error, $files) = attachDirStatus($dir, $expected_files[$id]);
@@ -1231,9 +1290,11 @@ 
 
 			// Count any sub-folders.
 			foreach ($modSettings['attachmentUploadDir'] as $sid => $sub)
-				if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
+			{
+							if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
 				{
 					$expected_files[$id]++;
+			}
 					$sub_dirs++;
 				}
 		}
@@ -1252,7 +1313,8 @@ 
 
 	// Just stick a new directory on at the bottom.
 	if (isset($_REQUEST['new_path']))
-		$attachdirs[] = array(
+	{
+			$attachdirs[] = array(
 			'id' => max(array_merge(array_keys($expected_files), array_keys($modSettings['attachmentUploadDir']))) + 1,
 			'current' => false,
 			'path' => '',
@@ -1260,6 +1322,7 @@ 
 			'num_files' => '',
 			'status' => '',
 		);
+	}
 
 	return $attachdirs;
 }
@@ -1275,9 +1338,13 @@ 
 function attachDirStatus($dir, $expected_files)
 {
 	if (!is_dir($dir))
-		return array('does_not_exist', true, '');
+	{
+			return array('does_not_exist', true, '');
+	}
 	elseif (!is_writable($dir))
-		return array('not_writable', true, '');
+	{
+			return array('not_writable', true, '');
+	}
 
 	// Count the files with a glob, easier and less time consuming
 	$glob = new GlobIterator($dir . '/*.elk', FilesystemIterator::SKIP_DOTS);
@@ -1291,14 +1358,19 @@ 
 	}
 
 	if ($num_files < $expected_files)
-		return array('files_missing', true, $num_files);
+	{
+			return array('files_missing', true, $num_files);
+	}
 	// Empty?
 	elseif ($expected_files == 0)
-		return array('unused', false, $num_files);
+	{
+			return array('unused', false, $num_files);
+	}
 	// All good!
-	else
-		return array('ok', false, $num_files);
-}
+	else {
+			return array('ok', false, $num_files);
+	}
+	}
 
 /**
  * Prepare the base directories to be displayed in a list.
@@ -1312,7 +1384,9 @@ 
 	global $modSettings, $txt;
 
 	if (empty($modSettings['attachment_basedirectories']))
-		return;
+	{
+			return;
+	}
 
 	// Get a list of the base directories.
 	$basedirs = array();
@@ -1321,15 +1395,22 @@ 
 		// Loop through the attach directory array to count any sub-directories
 		$expected_dirs = 0;
 		foreach ($modSettings['attachmentUploadDir'] as $sid => $sub)
-			if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
+		{
+					if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
 				$expected_dirs++;
+		}
 
 		if (!is_dir($dir))
-			$status = 'does_not_exist';
+		{
+					$status = 'does_not_exist';
+		}
 		elseif (!is_writeable($dir))
-			$status = 'not_writable';
-		else
-			$status = 'ok';
+		{
+					$status = 'not_writable';
+		}
+		else {
+					$status = 'ok';
+		}
 
 		$basedirs[] = array(
 			'id' => $id,
@@ -1341,13 +1422,15 @@ 
 	}
 
 	if (isset($_REQUEST['new_base_path']))
-		$basedirs[] = array(
+	{
+			$basedirs[] = array(
 			'id' => '',
 			'current' => false,
 			'path' => '<input type="text" name="new_base_dir" value="" size="40" />',
 			'num_dirs' => '',
 			'status' => '',
 		);
+	}
 
 	return $basedirs;
 }
@@ -1558,12 +1641,15 @@ 
 		$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
 
 		if (rename($filename, $modSettings['custom_avatar_dir'] . '/' . $row['filename']))
-			$updatedAvatars[] = $row['id_attach'];
+		{
+					$updatedAvatars[] = $row['id_attach'];
+		}
 	}
 	$db->free_result($request);
 
 	if (!empty($updatedAvatars))
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}attachments
 			SET attachment_type = {int:attachment_type}
 			WHERE id_attach IN ({array_int:updated_avatars})',
@@ -1572,7 +1658,8 @@ 
 				'attachment_type' => 1,
 			)
 		);
-}
+	}
+	}
 
 /**
  * Select a group of attachments to move to a new destination

Spacing +8 added lines, -8 removed lines

@@ -80,7 +80,7 @@ 
 			'attachments' => $attachments,
 			'attachment_type' => 0,
 		),
-		function ($row)
+		function($row)
 		{
 			logAction(
 				'approve_attach',
@@ -252,7 +252,7 @@ 
 				'attachments' => $do_logging,
 				'attachment_type' => 0,
 			),
-			function ($row)
+			function($row)
 			{
 				logAction(
 					'remove_attach',
@@ -643,7 +643,7 @@ 
 			'no_thumb' => 0,
 			'substep' => $start,
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_attach'];
 		}
@@ -834,7 +834,7 @@ 
 			'no_msg' => 0,
 			'substep' => $start,
 		),
-		function ($row) use ($fix_errors, $to_fix, $modSettings)
+		function($row) use ($fix_errors, $to_fix, $modSettings)
 		{
 			// If we are repairing remove the file from disk now.
 			if ($fix_errors && in_array('avatar_no_member', $to_fix))
@@ -896,7 +896,7 @@ 
 			'no_msg' => 0,
 			'substep' => $start,
 		),
-		function ($row) use ($fix_errors, $to_fix)
+		function($row) use ($fix_errors, $to_fix)
 		{
 			// If we are repairing remove the file from disk now.
 			if ($fix_errors && in_array('attachment_no_msg', $to_fix))
@@ -999,7 +999,7 @@ 
 			'not_approved' => 0,
 			'attachment_type' => 0,
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_attach'];
 		}
@@ -1107,7 +1107,7 @@ 
 			'items_per_page' => $items_per_page,
 			'approve_query' => $approve_query,
 		),
-		function ($row) use ($scripturl, $bbc_parser)
+		function($row) use ($scripturl, $bbc_parser)
 		{
 			return array(
 				'id' => $row['id_attach'],
@@ -1675,7 +1675,7 @@ 
 			'is_approved' => 0,
 			'attachment_type' => 0,
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_attach'];
 		}

sources/subs/Server.subs.php

Braces +12 added lines, -4 removed lines

@@ -23,7 +23,9 @@ 
 function detectServerLoad()
 {
 	if (stristr(PHP_OS, 'win'))
-		return false;
+	{
+			return false;
+	}
 
 	$cores = detectServerCores();
 
@@ -39,9 +41,13 @@ 
 		$load_average = @file_get_contents('/proc/loadavg');
 
 		if (!empty($load_average) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $load_average, $matches) != 0)
-			return (float) $matches[1] / $cores;
+		{
+					return (float) $matches[1] / $cores;
+		}
 		elseif (($load_average = @`uptime`) !== null && preg_match('~load average[s]?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $load_average, $matches) != 0)
-			return (float) $matches[1] / $cores;
+		{
+					return (float) $matches[1] / $cores;
+		}
 
 		return false;
 	}
@@ -62,7 +68,9 @@ 
 	{
 		$cores = preg_match_all('~^physical id~m', $cores, $matches);
 		if (!empty($cores))
-			return (int) $cores;
+		{
+					return (int) $cores;
+		}
 	}
 
 	return 1;

sources/subs/OpenID.subs.php

Braces +90 added lines, -35 removed lines

@@ -53,11 +53,15 @@ 
 
 		// We can't do anything without the proper response data.
 		if ($response_data === false || empty($response_data['provider']))
-			return 'no_data';
+		{
+					return 'no_data';
+		}
 
 		// Is there an existing association?
 		if (($assoc = $this->getAssociation($response_data['provider'])) === null)
-			$assoc = $this->makeAssociation($response_data['provider']);
+		{
+					$assoc = $this->makeAssociation($response_data['provider']);
+		}
 
 		// Include file for member existence
 		require_once(SUBSDIR . '/Members.subs.php');
@@ -67,7 +71,9 @@ 
 
 		// Just in case they are doing something else at this time.
 		while (isset($_SESSION['openid']['saved_data'][$request_time]))
-			$request_time = md5($request_time);
+		{
+					$request_time = md5($request_time);
+		}
 
 		$_SESSION['openid']['saved_data'][$request_time] = array(
 			'get' => $_GET,
@@ -85,9 +91,12 @@ 
 		{
 			$openid_identity = urlencode(empty($response_data['delegate']) ? $openid_url : $response_data['delegate']);
 			if (strpos($openid_identity, 'https') === 0)
-				$openid_claimedid = str_replace('http://', 'https://', $openid_url);
-			else
-				$openid_claimedid = $openid_url;
+			{
+							$openid_claimedid = str_replace('http://', 'https://', $openid_url);
+			}
+			else {
+							$openid_claimedid = $openid_url;
+			}
 		}
 
 		// Prepare parameters for the OpenID setup.
@@ -104,14 +113,19 @@ 
 
 		// If they are logging in but don't yet have an account or they are registering, let's request some additional information
 		if (($_REQUEST['action'] == 'login2' && !memberExists($openid_url)) || $_REQUEST['action'] == 'register')
-			$parameters[] = 'openid.sreg.optional=nickname,dob';
+		{
+					$parameters[] = 'openid.sreg.optional=nickname,dob';
+		}
 
 		$redir_url = $response_data['server'] . '?' . implode('&', $parameters);
 
 		if ($return)
-			return $redir_url;
-		else
-			redirectexit($redir_url);
+		{
+					return $redir_url;
+		}
+		else {
+					redirectexit($redir_url);
+		}
 	}
 
 	/**
@@ -131,8 +145,9 @@ 
 			unset($_SESSION['openid_revalidate_time']);
 			return true;
 		}
-		else
-			$this->validate($user_settings['openid_uri'], false, null, 'revalidate');
+		else {
+					$this->validate($user_settings['openid_uri'], false, null, 'revalidate');
+		}
 
 		// We shouldn't get here.
 		trigger_error('Hacking attempt...', E_USER_ERROR);
@@ -178,7 +193,9 @@ 
 		);
 
 		if ($db->num_rows($request) == 0)
-			return null;
+		{
+					return null;
+		}
 
 		$return = $db->fetch_assoc($request);
 		$return['server_url'] = $server;
@@ -209,7 +226,9 @@ 
 
 		// If we don't support DH we'll have to see if the provider will accept no encryption.
 		if ($dh_keys === false)
-			$parameters[] = 'openid.session_type=';
+		{
+					$parameters[] = 'openid.session_type=';
+		}
 		else
 		{
 			$parameters[] = 'openid.session_type=DH-SHA1';
@@ -226,10 +245,14 @@ 
 		$assoc_data = array();
 
 		foreach ($matches[1] as $key => $match)
-			$assoc_data[$match] = $matches[2][$key];
+		{
+					$assoc_data[$match] = $matches[2][$key];
+		}
 
 		if (!isset($assoc_data['assoc_type']) || (empty($assoc_data['mac_key']) && empty($assoc_data['enc_mac_key'])))
-			throw new Elk_Exception('openid_server_bad_response');
+		{
+					throw new Elk_Exception('openid_server_bad_response');
+		}
 
 		// Clean things up a bit.
 		$handle = isset($assoc_data['assoc_handle']) ? $assoc_data['assoc_handle'] : '';
@@ -239,8 +262,10 @@ 
 
 		// @todo Is this really needed?
 		foreach (array('dh_server_public', 'enc_mac_key') as $key)
-			if (isset($assoc_data[$key]))
+		{
+					if (isset($assoc_data[$key]))
 				$assoc_data[$key] = str_replace(' ', '+', $assoc_data[$key]);
+		}
 
 		// Figure out the Diffie-Hellman secret.
 		if (!empty($assoc_data['enc_mac_key']))
@@ -248,8 +273,9 @@ 
 			$dh_secret = bcpowmod(binary_to_long(base64_decode($assoc_data['dh_server_public'])), $dh_keys['private'], $this->p);
 			$secret = base64_encode(binary_xor(sha1(long_to_binary($dh_secret), true), base64_decode($assoc_data['enc_mac_key'])));
 		}
-		else
-			$secret = $assoc_data['mac_key'];
+		else {
+					$secret = $assoc_data['mac_key'];
+		}
 
 		// Store the data
 		$db->insert('replace',
@@ -300,7 +326,9 @@ 
 
 		// Strip http:// and https:// and if there is no / in what is left, add one
 		if (strpos(strtr($uri, array('http://' => '', 'https://' => '')), '/') === false)
-			$uri .= '/';
+		{
+					$uri .= '/';
+		}
 
 		return $uri;
 	}
@@ -316,7 +344,9 @@ 
 	{
 		// First off, do we have BC Math available?
 		if (!function_exists('bcpow'))
-			return false;
+		{
+					return false;
+		}
 
 		// Make sure the scale is set.
 		bcscale(0);
@@ -375,7 +405,9 @@ 
 		$byte_string = long_to_binary($this->p);
 
 		if (isset($cache[$byte_string]))
-			list ($dup, $num_bytes) = $cache[$byte_string];
+		{
+					list ($dup, $num_bytes) = $cache[$byte_string];
+		}
 		else
 		{
 			$num_bytes = strlen($byte_string) - ($byte_string[0] == "\x00" ? 1 : 0);
@@ -391,7 +423,9 @@ 
 		{
 			$str = '';
 			for ($i = 0; $i < $num_bytes; $i += 4)
-				$str .= pack('L', mt_rand());
+			{
+							$str .= pack('L', mt_rand());
+			}
 
 			$bytes = "\x00" . $str;
 
@@ -417,7 +451,9 @@ 
 		$webdata = fetch_web_data($openid_url);
 
 		if (empty($webdata))
-			return false;
+		{
+					return false;
+		}
 
 		$response_data = array();
 
@@ -432,23 +468,32 @@ 
 
 		// Some OpenID servers have strange but still valid HTML which makes our job hard.
 		if (preg_match_all('~<link([\s\S]*?)/?>~i', $webdata, $link_matches) == 0)
-			throw new Elk_Exception('openid_server_bad_response');
+		{
+					throw new Elk_Exception('openid_server_bad_response');
+		}
 
 		foreach ($link_matches[1] as $link_match)
 		{
 			if (preg_match('~rel="([\s\S]*?)"~i', $link_match, $rel_match) == 0 || preg_match('~href="([\s\S]*?)"~i', $link_match, $href_match) == 0)
-				continue;
+			{
+							continue;
+			}
 
 			$rels = preg_split('~\s+~', $rel_match[1]);
 			foreach ($rels as $rel)
-				if (preg_match('~openid2?\.(server|delegate|provider)~i', $rel, $match) != 0)
+			{
+							if (preg_match('~openid2?\.(server|delegate|provider)~i', $rel, $match) != 0)
 					$response_data[$match[1]] = $href_match[1];
+			}
 		}
 
 		if (empty($response_data['provider']))
-			$response_data['server'] = $openid_url;
-		else
-			$response_data['server'] = $response_data['provider'];
+		{
+					$response_data['server'] = $openid_url;
+		}
+		else {
+					$response_data['server'] = $response_data['provider'];
+		}
 
 		return $response_data;
 	}
@@ -491,10 +536,14 @@ 
 {
 	$cmp = bccomp($value, 0);
 	if ($cmp < 0)
-		throw new Elk_Exception('Only non-negative integers allowed.');
+	{
+			throw new Elk_Exception('Only non-negative integers allowed.');
+	}
 
 	if ($cmp == 0)
-		return "\x00";
+	{
+			return "\x00";
+	}
 
 	$bytes = array();
 
@@ -505,11 +554,15 @@ 
 	}
 
 	if (!empty($bytes) && ($bytes[0] > 127))
-		array_unshift($bytes, 0);
+	{
+			array_unshift($bytes, 0);
+	}
 
 	$return = '';
 	foreach ($bytes as $byte)
-		$return .= pack('C', $byte);
+	{
+			$return .= pack('C', $byte);
+	}
 
 	return $return;
 }
@@ -530,7 +583,9 @@ 
 
 	$str_len = strlen($num2);
 	for ($i = 0; $i < $str_len; $i++)
-		$return .= $num1[$i] ^ $num2[$i];
+	{
+			$return .= $num1[$i] ^ $num2[$i];
+	}
 
 	return $return;
 }

sources/subs/SearchEngines.subs.php

Braces +86 added lines, -33 removed lines

@@ -28,7 +28,9 @@ 
 	$db = database();
 
 	if (isset($_SESSION['id_robot']))
-		unset($_SESSION['id_robot']);
+	{
+			unset($_SESSION['id_robot']);
+	}
 
 	$_SESSION['robot_check'] = time();
 
@@ -45,7 +47,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$spider_data[] = $row;
+		{
+					$spider_data[] = $row;
+		}
 		$db->free_result($request);
 
 		// Save it in the cache
@@ -53,23 +57,30 @@ 
 	}
 
 	if (empty($spider_data))
-		return false;
+	{
+			return false;
+	}
 
 	// We need the user agent
 	$req = request();
 
 	// Always attempt IPv6 first.
 	if (strpos($_SERVER['REMOTE_ADDR'], ':') !== false)
-		$ip_parts = convertIPv6toInts($_SERVER['REMOTE_ADDR']);
+	{
+			$ip_parts = convertIPv6toInts($_SERVER['REMOTE_ADDR']);
+	}
 	// Then xxx.xxx.xxx.xxx next
-	else
-		preg_match('/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/', $_SERVER['REMOTE_ADDR'], $ip_parts);
+	else {
+			preg_match('/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/', $_SERVER['REMOTE_ADDR'], $ip_parts);
+	}
 
 	foreach ($spider_data as $spider)
 	{
 		// User agent is easy.
 		if (!empty($spider['user_agent']) && strpos(strtolower($req->user_agent()), strtolower($spider['user_agent'])) !== false)
-			$_SESSION['id_robot'] = $spider['id_spider'];
+		{
+					$_SESSION['id_robot'] = $spider['id_spider'];
+		}
 		// IP stuff is harder.
 		elseif (!empty($ip_parts))
 		{
@@ -82,21 +93,29 @@ 
 					foreach ($ip as $key => $value)
 					{
 						if ($value['low'] > $ip_parts[$key + 1] || $value['high'] < $ip_parts[$key + 1])
-							break;
+						{
+													break;
+						}
 						elseif (($key == 7 && strpos($_SERVER['REMOTE_ADDR'], ':') !== false) || ($key == 3 && strpos($_SERVER['REMOTE_ADDR'], ':') === false))
-							$_SESSION['id_robot'] = $spider['id_spider'];
+						{
+													$_SESSION['id_robot'] = $spider['id_spider'];
+						}
 					}
 				}
 			}
 		}
 
 		if (isset($_SESSION['id_robot']))
-			break;
+		{
+					break;
+		}
 	}
 
 	// If this is low server tracking then log the spider here as opposed to the main logging function.
 	if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot']))
-		logSpider();
+	{
+			logSpider();
+	}
 
 	return !empty($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 }
@@ -113,7 +132,9 @@ 
 	$db = database();
 
 	if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot']))
-		return;
+	{
+			return;
+	}
 
 	// Attempt to update today's entry.
 	if ($modSettings['spider_mode'] == 1)
@@ -152,13 +173,17 @@ 
 		{
 			$url = $_GET;
 			if (isset($context['session_var']))
-				unset($url['sesc'], $url[$context['session_var']]);
-			else
-				unset($url['sesc']);
+			{
+							unset($url['sesc'], $url[$context['session_var']]);
+			}
+			else {
+							unset($url['sesc']);
+			}
 			$url = serialize($url);
 		}
-		else
-			$url = '';
+		else {
+					$url = '';
+		}
 
 		$db->insert('insert',
 			'{db_prefix}log_spider_hits',
@@ -189,11 +214,15 @@ 
 	);
 	$spider_hits = array();
 	while ($row = $db->fetch_assoc($request))
-		$spider_hits[] = $row;
+	{
+			$spider_hits[] = $row;
+	}
 	$db->free_result($request);
 
 	if (empty($spider_hits))
-		return;
+	{
+			return;
+	}
 
 	// Attempt to update the master data.
 	$stat_inserts = array();
@@ -214,17 +243,21 @@ 
 			)
 		);
 		if ($db->affected_rows() == 0)
-			$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		{
+					$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		}
 	}
 
 	// New stats?
 	if (!empty($stat_inserts))
-		$db->insert('ignore',
+	{
+			$db->insert('ignore',
 			'{db_prefix}log_spider_stats',
 			array('stat_date' => 'date', 'id_spider' => 'int', 'page_hits' => 'int', 'last_seen' => 'int'),
 			$stat_inserts,
 			array('stat_date', 'id_spider')
 		);
+	}
 
 	// All processed.
 	$db->query('', '
@@ -255,7 +288,9 @@ 
 	);
 	$spiders = array();
 	while ($row = $db->fetch_assoc($request))
-		$spiders[$row['id_spider']] = $row['spider_name'];
+	{
+			$spiders[$row['id_spider']] = $row['spider_name'];
+	}
 	$db->free_result($request);
 
 	updateSettings(array('spider_name_cache' => serialize($spiders)));
@@ -306,7 +341,9 @@ 
 	);
 	$spiders = array();
 	while ($row = $db->fetch_assoc($request))
-		$spiders[$row['id_spider']] = $row;
+	{
+			$spiders[$row['id_spider']] = $row;
+	}
 	$db->free_result($request);
 
 	return $spiders;
@@ -386,7 +423,9 @@ 
 	);
 	$spider_logs = array();
 	while ($row = $db->fetch_assoc($request))
-		$spider_logs[] = $row;
+	{
+			$spider_logs[] = $row;
+	}
 	$db->free_result($request);
 
 	return $spider_logs;
@@ -440,7 +479,9 @@ 
 	);
 	$spider_stats = array();
 	while ($row = $db->fetch_assoc($request))
-		$spider_stats[] = $row;
+	{
+			$spider_stats[] = $row;
+	}
 	$db->free_result($request);
 
 	return $spider_stats;
@@ -564,7 +605,9 @@ 
 
 	$spider_last_seen = array();
 	while ($row = $db->fetch_assoc($request))
-		$spider_last_seen[$row['id_spider']] = $row['last_seen_time'];
+	{
+			$spider_last_seen[$row['id_spider']] = $row['last_seen_time'];
+	}
 	$db->free_result($request);
 
 	return $spider_last_seen;
@@ -600,13 +643,20 @@ 
 	// Prepare the dates for the drop down.
 	$date_choices = array();
 	for ($y = $min_year; $y <= $max_year; $y++)
-		for ($m = 1; $m <= 12; $m++)
+	{
+			for ($m = 1;
+	}
+	$m <= 12; $m++)
 		{
 			// This doesn't count?
 			if ($y == $min_year && $m < $min_month)
-				continue;
+			{
+							continue;
+			}
 			if ($y == $max_year && $m > $max_month)
-				break;
+			{
+							break;
+			}
 
 			$date_choices[$y . $m] = $txt['months_short'][$m] . ' ' . $y;
 		}
@@ -629,7 +679,8 @@ 
 
 	// New spider, insert
 	if (empty($id))
-		$db->insert('insert',
+	{
+			$db->insert('insert',
 			'{db_prefix}spiders',
 			array(
 				'spider_name' => 'string', 'user_agent' => 'string', 'ip_info' => 'string',
@@ -639,9 +690,10 @@ 
 			),
 			array('id_spider')
 		);
+	}
 	// Existing spider update
-	else
-		$db->query('', '
+	else {
+			$db->query('', '
 			UPDATE {db_prefix}spiders
 			SET spider_name = {string:spider_name}, user_agent = {string:spider_agent},
 				ip_info = {string:ip_info}
@@ -653,4 +705,5 @@ 
 				'ip_info' => $info_ip,
 			)
 		);
-}
\ No newline at end of file
+	}
+	}
\ No newline at end of file