elkarte / Elkarte

sources/subs/MembersOnline.subs.php

Braces +28 added lines, -11 removed lines

@@ -51,13 +51,17 @@ 
 
 	// Not allowed sort method? Bang! Error!
 	elseif (!in_array($membersOnlineOptions['sort'], $allowed_sort_options))
-		trigger_error('Sort method for getMembersOnlineStats() function is not allowed', E_USER_NOTICE);
+	{
+			trigger_error('Sort method for getMembersOnlineStats() function is not allowed', E_USER_NOTICE);
+	}
 
 	// Get it from the cache and send it back.
 	$temp = array();
 	$cache = Cache::instance();
 	if ($cache->levelHigherThan(1) && $cache->getVar($temp, 'membersOnlineStats-' . $membersOnlineOptions['sort'], 240))
-		return filter_members_online($temp, empty($membersOnlineOptions['reverse_sort']) ? 'ksort' : 'krsort');
+	{
+			return filter_members_online($temp, empty($membersOnlineOptions['reverse_sort']) ? 'ksort' : 'krsort');
+	}
 
 	// Initialize the array that'll be returned later on.
 	$membersOnlineStats = array(
@@ -75,7 +79,9 @@ 
 	$spiders = array();
 	$spider_finds = array();
 	if (!empty($modSettings['show_spider_online']) && ($modSettings['show_spider_online'] < 3 || allowedTo('admin_forum')) && !empty($modSettings['spider_name_cache']))
-		$spiders = Util::unserialize($modSettings['spider_name_cache']);
+	{
+			$spiders = Util::unserialize($modSettings['spider_name_cache']);
+	}
 
 	// Load the users online right now.
 	$request = $db->query('', '
@@ -113,9 +119,12 @@ 
 
 		// Some basic color coding...
 		if (!empty($row['online_color']))
-			$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-		else
-			$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		{
+					$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
+		}
+		else {
+					$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		}
 
 		// Buddies get counted and highlighted.
 		$is_buddy = in_array($row['id_member'], $user_info['buddies']);
@@ -140,11 +149,13 @@ 
 
 		// Store all distinct (primary) membergroups that are shown.
 		if (!isset($membersOnlineStats['online_groups'][$row['id_group']]))
-			$membersOnlineStats['online_groups'][$row['id_group']] = array(
+		{
+					$membersOnlineStats['online_groups'][$row['id_group']] = array(
 				'id' => $row['id_group'],
 				'name' => $row['group_name'],
 				'color' => $row['online_color']
 			);
+		}
 	}
 	$db->free_result($request);
 
@@ -234,10 +245,12 @@ 
 
 	// More members on now than ever were?  Update it!
 	if (!isset($modSettings['mostOnline']) || $total_users_online >= $modSettings['mostOnline'])
-		$settingsToUpdate = array(
+	{
+			$settingsToUpdate = array(
 			'mostOnline' => $total_users_online,
 			'mostDate' => time()
 		);
+	}
 
 	$date = Util::strftime('%Y-%m-%d', forum_time(false));
 
@@ -270,7 +283,9 @@ 
 			list ($modSettings['mostOnlineToday']) = $db->fetch_row($request);
 
 			if ($total_users_online > $modSettings['mostOnlineToday'])
-				trackStats(array('most_on' => $total_users_online));
+			{
+							trackStats(array('most_on' => $total_users_online));
+			}
 
 			$total_users_online = max($total_users_online, $modSettings['mostOnlineToday']);
 		}
@@ -288,5 +303,7 @@ 
 	}
 
 	if (!empty($settingsToUpdate))
-		updateSettings($settingsToUpdate);
-}
+	{
+			updateSettings($settingsToUpdate);
+	}
+	}

sources/subs/TemplateLayers.class.php

Braces +30 added lines, -11 removed lines

@@ -50,7 +50,9 @@ 
 		parent::add($layer, $priority);
 
 		if (self::$_error_safe)
-			$this->_error_safe_layers[] = $layer;
+		{
+					$this->_error_safe_layers[] = $layer;
+		}
 	}
 
 	/**
@@ -64,7 +66,9 @@ 
 		parent::addBefore($layer, $following);
 
 		if (self::$_error_safe)
-			$this->_error_safe_layers[] = $layer;
+		{
+					$this->_error_safe_layers[] = $layer;
+		}
 	}
 
 	/**
@@ -78,7 +82,9 @@ 
 		parent::addAfter($layer, $previous);
 
 		if (self::$_error_safe)
-			$this->_error_safe_layers[] = $layer;
+		{
+					$this->_error_safe_layers[] = $layer;
+		}
 	}
 
 	/**
@@ -92,7 +98,9 @@ 
 		parent::addEnd($layer, $priority);
 
 		if (self::$_error_safe)
-			$this->_error_safe_layers[] = $layer;
+		{
+					$this->_error_safe_layers[] = $layer;
+		}
 	}
 
 	/**
@@ -106,7 +114,9 @@ 
 		parent::addBegin($layer, $priority);
 
 		if (self::$_error_safe)
-			$this->_error_safe_layers[] = $layer;
+		{
+					$this->_error_safe_layers[] = $layer;
+		}
 	}
 
 	/**
@@ -129,7 +139,9 @@ 
 			foreach ($dummy as $key => $val)
 			{
 				if (in_array($key, $this->_error_safe_layers))
-					$all_layers[$key] = $val;
+				{
+									$all_layers[$key] = $val;
+				}
 			}
 		}
 
@@ -147,7 +159,9 @@ 
 	public function reverseLayers()
 	{
 		if ($this->_sorted_entities === null)
-			$this->prepareContext();
+		{
+					$this->prepareContext();
+		}
 
 		return array_reverse($this->_sorted_entities);
 	}
@@ -162,9 +176,12 @@ 
 	public function hasLayers($base = false)
 	{
 		if (!$base)
-			return (!empty($this->_all_general) || !empty($this->_all_begin) || !empty($this->_all_end));
-		else
-			return array_diff_key(array_merge($this->_all_general, $this->_all_begin, $this->_all_end), array('body' => 0, 'html' => 0));
+		{
+					return (!empty($this->_all_general) || !empty($this->_all_begin) || !empty($this->_all_end));
+		}
+		else {
+					return array_diff_key(array_merge($this->_all_general, $this->_all_begin, $this->_all_end), array('body' => 0, 'html' => 0));
+		}
 	}
 
 	/**
@@ -193,7 +210,9 @@ 
 	public static function instance($error_safe = false)
 	{
 		if (self::$_instance === null)
-			self::$_instance = new Template_Layers();
+		{
+					self::$_instance = new Template_Layers();
+		}
 
 		self::$_error_safe = $error_safe;
 

sources/subs/Themes.subs.php

Braces +120 added lines, -43 removed lines

@@ -40,11 +40,13 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!isset($themes[$row['id_theme']]))
-			$themes[$row['id_theme']] = array(
+		{
+					$themes[$row['id_theme']] = array(
 				'id' => $row['id_theme'],
 				'num_default_options' => 0,
 				'num_members' => 0,
 			);
+		}
 		$themes[$row['id_theme']][$row['variable']] = $row['value'];
 	}
 	$db->free_result($request);
@@ -133,8 +135,10 @@ 
 	{
 		// Find the right one.
 		foreach ($indexes as $index)
-			if (strpos($row['value'], $index) !== false)
+		{
+					if (strpos($row['value'], $index) !== false)
 				$themes[$row['id_theme']] = $index;
+		}
 	}
 	$db->free_result($request);
 
@@ -166,7 +170,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$themelist[$row['id_theme']] = $row['value'];
+	{
+			$themelist[$row['id_theme']] = $row['value'];
+	}
 
 	$db->free_result($request);
 
@@ -205,7 +211,9 @@ 
 		),
 	);
 	while ($row = $db->fetch_assoc($request))
-		$themes[$row['id_theme']][$row['variable']] = $row['value'];
+	{
+			$themes[$row['id_theme']][$row['variable']] = $row['value'];
+	}
 	$db->free_result($request);
 
 	return $themes;
@@ -224,10 +232,14 @@ 
 
 	// Nothing passed then we use the defaults
 	if (empty($theme_list))
-		$theme_list = explode(',', $modSettings['knownThemes']);
+	{
+			$theme_list = explode(',', $modSettings['knownThemes']);
+	}
 
 	if (!is_array($theme_list))
-		$theme_list = array($theme_list);
+	{
+			$theme_list = array($theme_list);
+	}
 
 	// Load up any themes we need the paths for
 	$request = $db->query('', '
@@ -244,7 +256,9 @@ 
 	);
 	$theme_paths = array();
 	while ($row = $db->fetch_assoc($request))
-		$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	{
+			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	}
 	$db->free_result($request);
 
 	return $theme_paths;
@@ -274,11 +288,13 @@ 
 	);
 	$themes = array();
 	while ($row = $db->fetch_assoc($request))
-		$themes[] = array(
+	{
+			$themes[] = array(
 			'id' => $row['id_theme'],
 			'name' => $row['name'],
 			'known' => in_array($row['id_theme'], $knownThemes),
 		);
+	}
 	$db->free_result($request);
 
 	return $themes;
@@ -304,7 +320,9 @@ 
 	);
 	$themes = array();
 	while ($row = $db->fetch_row($request))
-		$themes = explode(',', $row[0]);
+	{
+			$themes = explode(',', $row[0]);
+	}
 	$db->free_result($request);
 
 	return $themes;
@@ -328,13 +346,17 @@ 
 
 	// Is it even a directory?
 	if (!is_dir($path))
-		throw new Elk_Exception('error_invalid_dir', 'critical');
+	{
+			throw new Elk_Exception('error_invalid_dir', 'critical');
+	}
 
 	// Read this directory's contents
 	$entries = array();
 	$dir = dir($path);
 	while ($entry = $dir->read())
-		$entries[] = $entry;
+	{
+			$entries[] = $entry;
+	}
 	$dir->close();
 
 	// Sort it so it looks natural to the user
@@ -347,11 +369,14 @@ 
 	{
 		// Skip all dot files, including .htaccess.
 		if (substr($entry, 0, 1) === '.' || $entry === 'CVS')
-			continue;
+		{
+					continue;
+		}
 
 		// A directory entry
 		if (is_dir($path . '/' . $entry))
-			$listing1[] = array(
+		{
+					$listing1[] = array(
 				'filename' => $entry,
 				'is_writable' => is_writable($path . '/' . $entry),
 				'is_directory' => true,
@@ -361,6 +386,7 @@ 
 				'href' => $scripturl . '?action=admin;area=theme;th=' . $_GET['th'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=browse;directory=' . $relative . $entry,
 				'size' => '',
 			);
+		}
 		// A file entry has some more checks
 		else
 		{
@@ -405,7 +431,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$themes[] = $row;
+	{
+			$themes[] = $row;
+	}
 	$db->free_result($request);
 
 	return($themes);
@@ -447,11 +475,13 @@ 
 		while ($row = $db->fetch_assoc($request))
 		{
 			if (!isset($available_themes[$row['id_theme']]))
-				$available_themes[$row['id_theme']] = array(
+			{
+							$available_themes[$row['id_theme']] = array(
 					'id' => $row['id_theme'],
 					'selected' => $current_theme == $row['id_theme'],
 					'num_users' => 0
 				);
+			}
 			$available_themes[$row['id_theme']][$row['variable']] = $row['value'];
 		}
 		$db->free_result($request);
@@ -465,8 +495,9 @@ 
 		);
 		$guest_theme = 0;
 	}
-	else
-		$guest_theme = $modSettings['theme_guests'];
+	else {
+			$guest_theme = $modSettings['theme_guests'];
+	}
 
 	$request = $db->query('', '
 		SELECT id_theme, COUNT(*) AS the_count
@@ -480,14 +511,21 @@ 
 	{
 		// Figure out which theme it is they are REALLY using.
 		if (!empty($modSettings['knownThemes']) && !in_array($row['id_theme'], explode(',', $modSettings['knownThemes'])))
-			$row['id_theme'] = $guest_theme;
+		{
+					$row['id_theme'] = $guest_theme;
+		}
 		elseif (empty($modSettings['theme_allow']))
-			$row['id_theme'] = $guest_theme;
+		{
+					$row['id_theme'] = $guest_theme;
+		}
 
 		if (isset($available_themes[$row['id_theme']]))
-			$available_themes[$row['id_theme']]['num_users'] += $row['the_count'];
-		else
-			$available_themes[$guest_theme]['num_users'] += $row['the_count'];
+		{
+					$available_themes[$row['id_theme']]['num_users'] += $row['the_count'];
+		}
+		else {
+					$available_themes[$guest_theme]['num_users'] += $row['the_count'];
+		}
 	}
 	$db->free_result($request);
 
@@ -507,7 +545,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$variant_preferences[$row['id_theme']] = $row['value'];
+		{
+					$variant_preferences[$row['id_theme']] = $row['value'];
+		}
 		$db->free_result($request);
 	}
 
@@ -519,16 +559,22 @@ 
 	{
 		// Don't try to load the forum or board default theme's data... it doesn't have any!
 		if ($id_theme == 0)
-			continue;
+		{
+					continue;
+		}
 
 		// The thumbnail needs the correct path.
 		$settings['images_url'] = &$theme_data['images_url'];
 		$theme_thumbnail_href = $theme_data['images_url'] . '/thumbnail.png';
 
 		if (file_exists($theme_data['theme_dir'] . '/languages/' . $user_info['language'] . '/Settings.' . $user_info['language'] . '.php'))
-			include($theme_data['theme_dir'] . '/languages/' . $user_info['language'] . '/Settings.' . $user_info['language'] . '.php');
+		{
+					include($theme_data['theme_dir'] . '/languages/' . $user_info['language'] . '/Settings.' . $user_info['language'] . '.php');
+		}
 		elseif (file_exists($theme_data['theme_dir'] . '/languages/' . $language . '/Settings.' . $language . '.php'))
-			include($theme_data['theme_dir'] . '/languages/' . $language . '/Settings.' . $language . '.php');
+		{
+					include($theme_data['theme_dir'] . '/languages/' . $language . '/Settings.' . $language . '.php');
+		}
 		else
 		{
 			$txt['theme_description'] = '';
@@ -556,14 +602,18 @@ 
 
 					$available_themes[$id_theme]['variants'] = array();
 					foreach ($settings['theme_variants'] as $variant)
-						$available_themes[$id_theme]['variants'][$variant] = array(
+					{
+											$available_themes[$id_theme]['variants'][$variant] = array(
 							'label' => isset($txt['variant_' . $variant]) ? $txt['variant_' . $variant] : $variant,
 							'thumbnail' => !file_exists($theme_data['theme_dir'] . '/images/thumbnail.png') || file_exists($theme_data['theme_dir'] . '/images/thumbnail_' . $variant . '.png') ? $theme_data['images_url'] . '/thumbnail_' . $variant . '.png' : ($theme_data['images_url'] . '/thumbnail.png'),
 						);
+					}
 
 					$available_themes[$id_theme]['selected_variant'] = isset($_GET['vrt']) ? $_GET['vrt'] : (!empty($variant_preferences[$id_theme]) ? $variant_preferences[$id_theme] : (!empty($settings['default_variant']) ? $settings['default_variant'] : $settings['theme_variants'][0]));
 					if (!isset($available_themes[$id_theme]['variants'][$available_themes[$id_theme]['selected_variant']]['thumbnail']))
-						$available_themes[$id_theme]['selected_variant'] = $settings['theme_variants'][0];
+					{
+											$available_themes[$id_theme]['selected_variant'] = $settings['theme_variants'][0];
+					}
 
 					$available_themes[$id_theme]['thumbnail_href'] = $available_themes[$id_theme]['variants'][$available_themes[$id_theme]['selected_variant']]['thumbnail'];
 
@@ -601,7 +651,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$themes[] = $row;
+	{
+			$themes[] = $row;
+	}
 	$db->free_result($request);
 
 	return $themes;
@@ -631,39 +683,60 @@ 
 
 	// The default theme is 1 (id_theme = 1)
 	if ($theme === 'default')
-		$query_param = array('theme_operator' => '=', 'theme' => 1);
+	{
+			$query_param = array('theme_operator' => '=', 'theme' => 1);
+	}
 	// All the themes that are not the default one (id_theme != 1)
 	// @todo 'non_default' would be more explicative, though it could be confused with the one in $membergroups
 	elseif ($theme === 'custom')
-		$query_param = array('theme_operator' => '!=', 'theme' => 1);
+	{
+			$query_param = array('theme_operator' => '!=', 'theme' => 1);
+	}
 	// If numeric means a specific theme
 	elseif (is_numeric($theme))
-		$query_param = array('theme_operator' => '=', 'theme' => (int) $theme);
+	{
+			$query_param = array('theme_operator' => '=', 'theme' => (int) $theme);
+	}
 
 	// Guests means id_member = -1
 	if ($membergroups === 'guests')
-		$query_param += array('member_operator' => '=', 'member' => -1);
+	{
+			$query_param += array('member_operator' => '=', 'member' => -1);
+	}
 	// Members means id_member > 0
 	elseif ($membergroups === 'members')
-		$query_param += array('member_operator' => '>', 'member' => 0);
+	{
+			$query_param += array('member_operator' => '>', 'member' => 0);
+	}
 	// Non default settings id_member != 0 (that is different from id_member > 0)
 	elseif ($membergroups === 'non_default')
-		$query_param += array('member_operator' => '!=', 'member' => 0);
+	{
+			$query_param += array('member_operator' => '!=', 'member' => 0);
+	}
 	// all it's all
 	elseif ($membergroups === 'all')
-		$query_param += array('member_operator' => '', 'member' => 0);
+	{
+			$query_param += array('member_operator' => '', 'member' => 0);
+	}
 	// If it is a number, then it means a specific member (id_member = (int))
 	elseif (is_numeric($membergroups))
-		$query_param += array('member_operator' => '=', 'member' => (int) $membergroups);
+	{
+			$query_param += array('member_operator' => '=', 'member' => (int) $membergroups);
+	}
 
 	// If array or string set up the query accordingly
 	if (is_array($old_settings))
-		$var = 'variable IN ({array_string:old_settings})';
+	{
+			$var = 'variable IN ({array_string:old_settings})';
+	}
 	elseif (!empty($old_settings))
-		$var = 'variable = {string:old_settings}';
+	{
+			$var = 'variable = {string:old_settings}';
+	}
 	// If empty then means any setting
-	else
-		$var = '1=1';
+	else {
+			$var = '1=1';
+	}
 
 	$db->query('', '
 		DELETE FROM {db_prefix}themes
@@ -733,7 +806,9 @@ 
 
 	// Make sure we never ever delete the default theme!
 	if ($id === 1)
-		throw new Elk_Exception('no_access', false);
+	{
+			throw new Elk_Exception('no_access', false);
+	}
 
 	$db->query('', '
 		DELETE FROM {db_prefix}themes
@@ -891,7 +966,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$options[$row['variable']] = $row['value'];
+	{
+			$options[$row['variable']] = $row['value'];
+	}
 	$db->free_result($request);
 
 	return $options;

sources/subs/ProfileOptions.subs.php

Braces +6 added lines, -2 removed lines

@@ -110,11 +110,15 @@
 		// Can they edit their primary group?
 		if (($row['id_group'] == $context['primary_group'] && $row['group_type'] > 1)
 			|| ($row['hidden'] != 2 && $context['primary_group'] == 0 && in_array($row['id_group'], $current_groups)))
-			$context['can_edit_primary'] = true;
+		{
+					$context['can_edit_primary'] = true;
+		}
 
 		// If they can't manage (protected) groups, and it's not publicly joinable or already assigned, they can't see it.
 		if (((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0)) && $row['id_group'] != $context['primary_group'])
-			continue;
+		{
+					continue;
+		}
 
 		$groups[in_array($row['id_group'], $current_groups) ? 'member' : 'available'][$row['id_group']] = array(
 			'id' => $row['id_group'],

sources/subs/Logging.subs.php

Braces +10 added lines, -4 removed lines

@@ -66,8 +66,10 @@ 
 
 	// Guess it got deleted.
 	if ($db->affected_rows() == 0)
-		$_SESSION['log_time'] = 0;
-}
+	{
+			$_SESSION['log_time'] = 0;
+	}
+	}
 
 /**
  * Update a users entry in the online log
@@ -83,7 +85,8 @@ 
 	$db = database();
 
 	if ($do_delete || !empty($user_info['id']))
-		$db->query('', '
+	{
+			$db->query('', '
 			DELETE FROM {db_prefix}log_online
 			WHERE ' . ($do_delete ? 'log_time < {int:log_time}' : '') . ($do_delete && !empty($user_info['id']) ? ' OR ' : '') . (empty($user_info['id']) ? '' : 'id_member = {int:current_member}'),
 			array(
@@ -91,6 +94,7 @@ 
 				'log_time' => time() - $modSettings['lastActive'] * 60,
 			)
 		);
+	}
 
 	$db->insert($do_delete ? 'ignore' : 'replace',
 		'{db_prefix}log_online',
@@ -263,7 +267,9 @@ 
 	$db = database();
 
 	if (!is_array($ids))
-		$ids = array($ids);
+	{
+			$ids = array($ids);
+	}
 
 	if (empty($on))
 	{

sources/subs/ManagePermissions.subs.php

Braces +82 added lines, -30 removed lines

@@ -186,15 +186,21 @@ 
 	foreach ($groupLevels['global'][$level] as $k => $permission)
 	{
 		if (!empty($illegal_permissions) && in_array($permission, $illegal_permissions))
-			unset($groupLevels['global'][$level][$k]);
+		{
+					unset($groupLevels['global'][$level][$k]);
+		}
 
 		if ($group == -1 && in_array($permission, $illegal_guest_permissions))
-			unset($groupLevels['global'][$level][$k]);
+		{
+					unset($groupLevels['global'][$level][$k]);
+		}
 	}
 	if ($group == -1)
-		foreach ($groupLevels['board'][$level] as $k => $permission)
+	{
+			foreach ($groupLevels['board'][$level] as $k => $permission)
 			if (in_array($permission, $illegal_guest_permissions))
 				unset($groupLevels['board'][$level][$k]);
+	}
 
 	// Reset all cached permissions.
 	updateSettings(array('settings_updated' => time()));
@@ -205,7 +211,9 @@ 
 		$group = (int) $group;
 
 		if (empty($groupLevels['global'][$level]))
-			return;
+		{
+					return;
+		}
 
 		$db->query('', '
 			DELETE FROM {db_prefix}permissions
@@ -228,7 +236,9 @@ 
 
 		$groupInserts = array();
 		foreach ($groupLevels['global'][$level] as $permission)
-			$groupInserts[] = array($group, $permission);
+		{
+					$groupInserts[] = array($group, $permission);
+		}
 
 		$db->insert('insert',
 			'{db_prefix}permissions',
@@ -239,7 +249,9 @@ 
 
 		$boardInserts = array();
 		foreach ($groupLevels['board'][$level] as $permission)
-			$boardInserts[] = array(1, $group, $permission);
+		{
+					$boardInserts[] = array(1, $group, $permission);
+		}
 
 		$db->insert('insert',
 			'{db_prefix}board_permissions',
@@ -271,7 +283,9 @@ 
 		{
 			$boardInserts = array();
 			foreach ($groupLevels['board'][$level] as $permission)
-				$boardInserts[] = array($profile, $group, $permission);
+			{
+							$boardInserts[] = array($profile, $group, $permission);
+			}
 
 			$db->insert('insert',
 				'{db_prefix}board_permissions',
@@ -295,7 +309,9 @@ 
 		);
 
 		if (empty($boardLevels[$level]))
-			return;
+		{
+					return;
+		}
 
 		// Get all the groups...
 		$query = $db->query('', '
@@ -314,7 +330,9 @@ 
 
 			$boardInserts = array();
 			foreach ($boardLevels[$level] as $permission)
-				$boardInserts[] = array($profile, $group, $permission);
+			{
+							$boardInserts[] = array($profile, $group, $permission);
+			}
 
 			$db->insert('insert',
 				'{db_prefix}board_permissions',
@@ -328,7 +346,9 @@ 
 		// Add permissions for ungrouped members.
 		$boardInserts = array();
 		foreach ($boardLevels[$level] as $permission)
-			$boardInserts[] = array($profile, 0, $permission);
+		{
+					$boardInserts[] = array($profile, 0, $permission);
+		}
 
 		$db->insert('insert',
 				'{db_prefix}board_permissions',
@@ -338,9 +358,10 @@ 
 			);
 	}
 	// $profile and $group are both null!
-	else
-		throw new Elk_Exception('no_access', false);
-}
+	else {
+			throw new Elk_Exception('no_access', false);
+	}
+	}
 
 /**
  * Load permissions profiles.
@@ -365,9 +386,12 @@ 
 	{
 		// Format the label nicely.
 		if (isset($txt['permissions_profile_' . $row['profile_name']]))
-			$name = $txt['permissions_profile_' . $row['profile_name']];
-		else
-			$name = $row['profile_name'];
+		{
+					$name = $txt['permissions_profile_' . $row['profile_name']];
+		}
+		else {
+					$name = $row['profile_name'];
+		}
 
 		$context['profiles'][$row['id_profile']] = array(
 			'id' => $row['id_profile'],
@@ -514,11 +538,17 @@ 
 		$hiddenPermissions[] = 'calendar_edit';
 	}
 	if (!in_array('w', $context['admin_features']))
-		$hiddenPermissions[] = 'issue_warning';
+	{
+			$hiddenPermissions[] = 'issue_warning';
+	}
 	if (!in_array('k', $context['admin_features']))
-		$hiddenPermissions[] = 'karma_edit';
+	{
+			$hiddenPermissions[] = 'karma_edit';
+	}
 	if (!in_array('l', $context['admin_features']))
-		$hiddenPermissions[] = 'like_posts';
+	{
+			$hiddenPermissions[] = 'like_posts';
+	}
 	if (!in_array('pe', $context['admin_features']))
 	{
 		$hiddenPermissions[] = 'approve_emails';
@@ -740,8 +770,10 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		if (isset($groups[(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
+	{
+			if (isset($groups[(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
 			$groups[$row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+	}
 	$db->free_result($request);
 
 	return $groups;
@@ -794,18 +826,24 @@ 
 	);
 	$target_perm = array();
 	while ($row = $db->fetch_assoc($request))
-		$target_perm[$row['permission']] = $row['add_deny'];
+	{
+			$target_perm[$row['permission']] = $row['add_deny'];
+	}
 	$db->free_result($request);
 
 	$inserts = array();
 	foreach ($groups as $group_id)
-		foreach ($target_perm as $perm => $add_deny)
+	{
+			foreach ($target_perm as $perm => $add_deny)
 		{
 			// No dodgy permissions please!
 			if (!empty($illegal_permissions) && in_array($perm, $illegal_permissions))
 				continue;
+	}
 			if ($group_id == -1 && in_array($perm, $non_guest_permissions))
-				continue;
+			{
+							continue;
+			}
 
 			if ($group_id != 1 && $group_id != 3)
 			{
@@ -858,7 +896,9 @@ 
 	);
 	$target_perm = array();
 	while ($row = $db->fetch_assoc($request))
-		$target_perm[$row['permission']] = $row['add_deny'];
+	{
+			$target_perm[$row['permission']] = $row['add_deny'];
+	}
 	$db->free_result($request);
 
 	$inserts = array();
@@ -868,7 +908,9 @@ 
 		{
 			// Are these for guests?
 			if ($group_id == -1 && in_array($perm, $non_guest_permissions))
-				continue;
+			{
+							continue;
+			}
 
 			$inserts[] = array($perm, $group_id, $add_deny, $profile_id);
 		}
@@ -1014,7 +1056,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($result))
-		$permissions[empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	{
+			$permissions[empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	}
 	$db->free_result($result);
 
 	return $permissions;
@@ -1048,7 +1092,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($result))
-		$permissions[empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	{
+			$permissions[empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	}
 	$db->free_result($result);
 
 	return $permissions;
@@ -1270,7 +1316,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) != 0)
-		throw new Elk_Exception('no_access', false);
+	{
+			throw new Elk_Exception('no_access', false);
+	}
 	$db->free_result($request);
 
 	// Oh well, delete.
@@ -1305,9 +1353,11 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		if (isset($profiles[$row['id_profile']]))
+	{
+			if (isset($profiles[$row['id_profile']]))
 		{
 			$profiles[$row['id_profile']]['in_use'] = true;
+	}
 			$profiles[$row['id_profile']]['boards'] = $row['board_count'];
 			$profiles[$row['id_profile']]['boards_text'] = $row['board_count'] > 1 ? sprintf($txt['permissions_profile_used_by_many'], $row['board_count']) : $txt['permissions_profile_used_by_' . ($row['board_count'] ? 'one' : 'none')];
 		}
@@ -1388,7 +1438,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$groups[$row['id_group']][$row['add_deny'] ? 'add' : 'deny'][] = $row['permission'];
+	{
+			$groups[$row['id_group']][$row['add_deny'] ? 'add' : 'deny'][] = $row['permission'];
+	}
 
 	$db->free_result($request);
 

Spacing +2 added lines, -2 removed lines

@@ -1140,7 +1140,7 @@ 
 		array(
 			'min_posts' => -1,
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_group'];
 		}
@@ -1205,7 +1205,7 @@ 
 		array(
 			'copy_from' => $copy_from,
 		),
-		function ($row) use ($profile_id)
+		function($row) use ($profile_id)
 		{
 			return array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
 		}

sources/subs/ScheduledTask/PaidSubscriptions.php

Braces +3 added lines, -1 removed lines

@@ -106,7 +106,8 @@ 
 
 		// Mark the reminder as sent.
 		if (!empty($subs_reminded))
-			$db->query('', '
+		{
+					$db->query('', '
 				UPDATE {db_prefix}log_subscribed
 				SET reminder_sent = {int:reminder_sent}
 				WHERE id_sublog IN ({array_int:subscription_list})',
@@ -115,6 +116,7 @@ 
 					'reminder_sent' => 1,
 				)
 			);
+		}
 
 		return true;
 	}

sources/subs/ScheduledTask/AutoOptimize.php

Braces +12 added lines, -4 removed lines

@@ -40,7 +40,9 @@ 
 
 		// As a kind of hack, if the server load is too great delay, but only by a bit!
 		if (!empty($modSettings['load_average']) && !empty($modSettings['loadavg_auto_opt']) && $modSettings['load_average'] >= $modSettings['loadavg_auto_opt'])
-			$delay = true;
+		{
+					$delay = true;
+		}
 
 		// Otherwise are we restricting the number of people online for this?
 		if (!empty($modSettings['autoOptMaxOnline']))
@@ -55,18 +57,24 @@ 
 			$db->free_result($request);
 
 			if ($dont_do_it > $modSettings['autoOptMaxOnline'])
-				$delay = true;
+			{
+							$delay = true;
+			}
 		}
 
 		// If we are gonna delay, do so now!
 		if ($delay)
-			return false;
+		{
+					return false;
+		}
 
 		// Get all the tables.
 		$tables = $db->db_list_tables(false, $db_prefix . '%');
 
 		foreach ($tables as $table)
-			$db_table->optimize($table);
+		{
+					$db_table->optimize($table);
+		}
 
 		// Return for the log...
 		return true;

sources/subs/ScheduledTask/RemoveTopicRedirect.php

Braces +3 added lines, -1 removed lines

@@ -55,7 +55,9 @@
 			)
 		);
 		while ($row = $db->fetch_row($request))
-			$topics[] = $row[0];
+		{
+					$topics[] = $row[0];
+		}
 		$db->free_result($request);
 
 		// Zap, you're gone