elkarte / Elkarte

sources/subs/Sound.subs.php

Spacing +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
 		$sound_letter = substr($sound_letter, strpos($sound_letter, 'data') + 8);
 		switch ($word[$i] === 's' ? 0 : mt_rand(0, 2))
 		{
-			case 0:
-				for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
+			case 0 : for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
 				for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
 					$sound_word .= $word[$i] === 's' ? $sound_letter[$j] : chr(mt_rand(max(ord($sound_letter[$j]) - 1, 0x00), min(ord($sound_letter[$j]) + 1, 0xFF)));
 			break;

Braces +34 added lines, -12 removed lines

@@ -32,7 +32,9 @@ 
 
 	// Allow max 2 requests per 20 seconds.
 	if (($ip = $cache->get('wave_file/' . $user_info['ip'], 20)) > 2 || ($ip2 = $cache->get('wave_file/' . $user_info['ip2'], 20)) > 2)
-		die(header('HTTP/1.1 400 Bad Request'));
+	{
+			die(header('HTTP/1.1 400 Bad Request'));
+	}
 
 	$cache->put('wave_file/' . $user_info['ip'], $ip ? $ip + 1 : 1, 20);
 	$cache->put('wave_file/' . $user_info['ip2'], $ip2 ? $ip2 + 1 : 1, 20);
@@ -42,13 +44,18 @@ 
 
 	// Try to see if there's a sound font in the user's language.
 	if (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.' . $user_info['language'] . '.wav'))
-		$sound_language = $user_info['language'];
+	{
+			$sound_language = $user_info['language'];
+	}
 	// English should be there.
 	elseif (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.english.wav'))
-		$sound_language = 'english';
+	{
+			$sound_language = 'english';
+	}
 	// Guess not...
-	else
-		return false;
+	else {
+			return false;
+	}
 
 	// File names are in lower case so lets make sure that we are only using a lower case string
 	$word = strtolower($word);
@@ -60,20 +67,29 @@ 
 	{
 		$sound_letter = implode('', file($settings['default_theme_dir'] . '/fonts/sound/' . $word[$i] . '.' . $sound_language . '.wav'));
 		if (strpos($sound_letter, 'data') === false)
-			return false;
+		{
+					return false;
+		}
 
 		$sound_letter = substr($sound_letter, strpos($sound_letter, 'data') + 8);
 		switch ($word[$i] === 's' ? 0 : mt_rand(0, 2))
 		{
 			case 0:
 				for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
-				for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
-					$sound_word .= $word[$i] === 's' ? $sound_letter[$j] : chr(mt_rand(max(ord($sound_letter[$j]) - 1, 0x00), min(ord($sound_letter[$j]) + 1, 0xFF)));
+				{
+								for ($k = 0, $m = round(mt_rand(15, 25) / 10);
+				}
+				$k < $m; $k++)
+				{
+									$sound_word .= $word[$i] === 's' ? $sound_letter[$j] : chr(mt_rand(max(ord($sound_letter[$j]) - 1, 0x00), min(ord($sound_letter[$j]) + 1, 0xFF)));
+				}
 			break;
 
 			case 1:
 				for ($j = 0, $n = strlen($sound_letter) - 1; $j < $n; $j += 2)
-					$sound_word .= (mt_rand(0, 3) == 0 ? '' : $sound_letter[$j]) . (mt_rand(0, 3) === 0 ? $sound_letter[$j + 1] : $sound_letter[$j]) . (mt_rand(0, 3) === 0 ? $sound_letter[$j] : $sound_letter[$j + 1]) . $sound_letter[$j + 1] . (mt_rand(0, 3) == 0 ? $sound_letter[$j + 1] : '');
+				{
+									$sound_word .= (mt_rand(0, 3) == 0 ? '' : $sound_letter[$j]) . (mt_rand(0, 3) === 0 ? $sound_letter[$j + 1] : $sound_letter[$j]) . (mt_rand(0, 3) === 0 ? $sound_letter[$j] : $sound_letter[$j + 1]) . $sound_letter[$j + 1] . (mt_rand(0, 3) == 0 ? $sound_letter[$j + 1] : '');
+				}
 				$sound_word .= str_repeat($sound_letter[$n], 2);
 			break;
 
@@ -82,9 +98,13 @@ 
 				for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
 				{
 					if (mt_rand(0, 10) === 0)
-						$shift += mt_rand(-3, 3);
+					{
+											$shift += mt_rand(-3, 3);
+					}
 					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
-						$sound_word .= chr(min(max(ord($sound_letter[$j]) + $shift, 0x00), 0xFF));
+					{
+											$sound_word .= chr(min(max(ord($sound_letter[$j]) + $shift, 0x00), 0xFF));
+					}
 				}
 			break;
 		}
@@ -112,7 +132,9 @@ 
 
 	// Clear anything in the buffers
 	while (@ob_get_level() > 0)
-		@ob_end_clean();
+	{
+			@ob_end_clean();
+	}
 
 	// Set up our headers
 	header('Content-Encoding: none');

sources/subs/BBC/BBCParser.php

Spacing +1 added lines, -1 removed lines

@@ -1205,7 +1205,7 @@
 		// If we have footnotes, add them in at the end of the message
 		if (!empty($fn_num))
 		{
-			$this->message .=  $this->smiley_marker . '<div class="bbc_footnotes">' . implode('', $this->fn_content) . '</div>' . $this->smiley_marker;
+			$this->message .= $this->smiley_marker . '<div class="bbc_footnotes">' . implode('', $this->fn_content) . '</div>' . $this->smiley_marker;
 		}
 	}
 

Braces +12 added lines, -5 removed lines

@@ -750,7 +750,9 @@ 
 	protected function handleItemCode()
 	{
 		if (!isset($this->item_codes[$this->message[$this->pos + 1]]))
-			return;
+		{
+					return;
+		}
 
 		$tag = $this->item_codes[$this->message[$this->pos + 1]];
 
@@ -1351,7 +1353,9 @@ 
 			$control_order[$index] = $index;
 
 			if ($this->tag_possible['optionals'][$index])
-				$control_order[$index] = $index + $this->tag_possible['regex_size'];
+			{
+							$control_order[$index] = $index + $this->tag_possible['regex_size'];
+			}
 		}
 
 		array_multisort($control_order, SORT_ASC, $this->tag_possible['regex_cache']);
@@ -1382,9 +1386,12 @@ 
 			if ($optional)
 			{
 				if ($param_exists)
-					$this->tag_possible['optionals'][$index] = false;
-				else
-					$this->tag_possible['regex_cache'][$index] .= '?';
+				{
+									$this->tag_possible['optionals'][$index] = false;
+				}
+				else {
+									$this->tag_possible['regex_cache'][$index] .= '?';
+				}
 			}
 		}
 	}

sources/subs/MessageIndex.subs.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 			$indexOptions['custom_selects'] = array_merge($indexOptions['custom_selects'], array('ml.body AS last_body', 'mf.body AS first_body'));
 		// Default: a SUBSTRING
 		elseif (!empty($indexOptions['previews']))
-			$indexOptions['custom_selects'] =  array_merge($indexOptions['custom_selects'], array('SUBSTRING(ml.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS last_body', 'SUBSTRING(mf.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS first_body'));
+			$indexOptions['custom_selects'] = array_merge($indexOptions['custom_selects'], array('SUBSTRING(ml.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS last_body', 'SUBSTRING(mf.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS first_body'));
 
 		if (!empty($indexOptions['include_avatars']))
 		{

Braces +18 added lines, -6 removed lines

@@ -73,7 +73,9 @@ 
 		);
 		$topic_ids = array();
 		while ($row = $db->fetch_assoc($request))
-			$topic_ids[] = $row['id_topic'];
+		{
+					$topic_ids[] = $row['id_topic'];
+		}
 		$db->free_result($request);
 	}
 
@@ -83,10 +85,14 @@ 
 	{
 		// If -1 means preview the whole body
 		if ($indexOptions['previews'] === -1)
-			$indexOptions['custom_selects'] = array_merge($indexOptions['custom_selects'], array('ml.body AS last_body', 'mf.body AS first_body'));
+		{
+					$indexOptions['custom_selects'] = array_merge($indexOptions['custom_selects'], array('ml.body AS last_body', 'mf.body AS first_body'));
+		}
 		// Default: a SUBSTRING
 		elseif (!empty($indexOptions['previews']))
-			$indexOptions['custom_selects'] =  array_merge($indexOptions['custom_selects'], array('SUBSTRING(ml.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS last_body', 'SUBSTRING(mf.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS first_body'));
+		{
+					$indexOptions['custom_selects'] =  array_merge($indexOptions['custom_selects'], array('SUBSTRING(ml.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS last_body', 'SUBSTRING(mf.body, 1, ' . ($indexOptions['previews'] + 256) . ') AS first_body'));
+		}
 
 		if (!empty($indexOptions['include_avatars']))
 		{
@@ -141,7 +147,9 @@ 
 
 		// Lets take the results
 		while ($row = $db->fetch_assoc($request))
-			$topics[$row['id_topic']] = $row;
+		{
+					$topics[$row['id_topic']] = $row;
+		}
 
 		$db->free_result($request);
 	}
@@ -196,7 +204,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($result))
-		$topics[] = $row;
+	{
+			$topics[] = $row;
+	}
 
 	$db->free_result($result);
 
@@ -235,7 +245,9 @@ 
 
 	$icon_sources = array();
 	foreach ($stable_icons as $icon)
-		$icon_sources[$icon] = 'images_url';
+	{
+			$icon_sources[$icon] = 'images_url';
+	}
 
 	return $icon_sources;
 }
\ No newline at end of file

themes/default/Theme.php

Spacing +1 added lines, -1 removed lines

@@ -1144,7 +1144,7 @@
 			// Variant icon definitions?
 			if (file_exists($settings['theme_dir'] . '/css/' . $context['theme_variant'] . '/icons_svg' . $context['theme_variant'] . '.css'))
 			{
-				loadCSSFile($context['theme_variant'] .  '/icons_svg' . $context['theme_variant'] . '.css');
+				loadCSSFile($context['theme_variant'] . '/icons_svg' . $context['theme_variant'] . '.css');
 			}
 
 			// Load a theme variant custom CSS

Braces +15 added lines, -5 removed lines

@@ -316,7 +316,9 @@ 
 		if (!empty($this->js_vars) && !$do_deferred)
 		{
 			foreach ($this->js_vars as $var => $value)
-				$js_vars[] = $var . ' = ' . $value;
+			{
+							$js_vars[] = $var . ' = ' . $value;
+			}
 
 			// Newlines and tabs are here to make it look nice in the page source view, stripped if minimized though
 			$this->js_inline['standard'][] = 'var ' . implode(",\n\t\t\t", $js_vars) . ';';
@@ -383,14 +385,18 @@ 
 				}
 
 				foreach ($combiner->getSpares() as $id => $file)
-					echo '
+				{
+									echo '
 	<link rel="stylesheet" href="', $file['filename'], '" id="', $id, '" />';
+				}
 			}
 			else
 			{
 				foreach ($this->css_files as $id => $file)
-					echo '
+				{
+									echo '
 	<link rel="stylesheet" href="', $file['filename'], '" id="', $id, '" />';
+				}
 			}
 		}
 	}
@@ -766,7 +772,9 @@ 
 		// Since it's nice to have avatars all of the same size, and in some cases the size detection may fail,
 		// let's add the css in any case
 		if (!isset($context['html_headers']))
-			$context['html_headers'] = '';
+		{
+					$context['html_headers'] = '';
+		}
 
 		if (!empty($modSettings['avatar_max_width']) || !empty($modSettings['avatar_max_height']))
 		{
@@ -1097,7 +1105,9 @@ 
 
 			// Load each template...
 			foreach ($templates as $template)
-				$this->templates->load($template);
+			{
+							$this->templates->load($template);
+			}
 
 			// ...and attempt to load their associated language files.
 			$required_files = implode('+', array_merge($templates, array('Addons')));

sources/subs/Who.subs.php

Spacing +1 added lines, -1 removed lines

@@ -503,7 +503,7 @@
 			'<a href="http://jqueryui.com/">JQuery UI</a> | &copy; jQuery Foundation and other contributors | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>',
 			'<a href="https://github.com/tchwork/jsqueeze">Jsqueeze</a> &copy Nicolas Grekas| Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>',
 			'<a href="https://github.com/mailcheck">MailCheck</a> | &copy; Received Inc | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>',
-			'<a href="https://github.com/michelf/php-markdown">PHP Markdown Lib</a> | &copy; Michel Fortin | Licensed under <a href="https://github.com/michelf/php-markdown/blob/lib/License.md">BSD-style open source</a>',			'<a href="http://www.openwall.com/phpass/">PH Pass</a> | Author: Solar Designer | Placed in the public domain</a>',
+			'<a href="https://github.com/michelf/php-markdown">PHP Markdown Lib</a> | &copy; Michel Fortin | Licensed under <a href="https://github.com/michelf/php-markdown/blob/lib/License.md">BSD-style open source</a>', '<a href="http://www.openwall.com/phpass/">PH Pass</a> | Author: Solar Designer | Placed in the public domain</a>',
 			'<a href="http://www.sceditor.com/">SCEditor</a> | &copy; Sam Clarke | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>',
 			'<a href="http://sourceforge.net/projects/simplehtmldom/">Simple HTML DOM</a> | Licensed under <a href="http://opensource.org/licenses/MIT">The MIT License (MIT)</a>',
 			'<a href="http://www.simplemachines.org/">Simple Machines</a> | &copy; Simple Machines | Licensed under <a href="http://www.simplemachines.org/about/smf/license.php">The BSD License</a>',

Braces +103 added lines, -44 removed lines

@@ -25,7 +25,9 @@ 
 
 	// Make sure we have a default value
 	if (!in_array($type, array('topic', 'board')))
-		$type = 'topic';
+	{
+			$type = 'topic';
+	}
 
 	$viewers = array();
 	$request = $db->query('', '
@@ -80,17 +82,24 @@ 
 
 		// it's a member. We format them with links 'n stuff.
 		if (!empty($viewer['online_color']))
-			$link = '<a href="' . $scripturl . '?action=profile;u=' . $viewer['id_member'] . '" style="color: ' . $viewer['online_color'] . ';">' . $viewer['real_name'] . '</a>';
-		else
-			$link = '<a href="' . $scripturl . '?action=profile;u=' . $viewer['id_member'] . '">' . $viewer['real_name'] . '</a>';
+		{
+					$link = '<a href="' . $scripturl . '?action=profile;u=' . $viewer['id_member'] . '" style="color: ' . $viewer['online_color'] . ';">' . $viewer['real_name'] . '</a>';
+		}
+		else {
+					$link = '<a href="' . $scripturl . '?action=profile;u=' . $viewer['id_member'] . '">' . $viewer['real_name'] . '</a>';
+		}
 
 		$is_buddy = in_array($viewer['id_member'], $user_info['buddies']);
 		if ($is_buddy)
-			$link = '<strong>' . $link . '</strong>';
+		{
+					$link = '<strong>' . $link . '</strong>';
+		}
 
 		// fill the summary list
 		if (!empty($viewer['show_online']) || allowedTo('moderate_forum'))
-			$context['view_members_list'][$viewer['log_time'] . $viewer['member_name']] = empty($viewer['show_online']) ? '<em>' . $link . '</em>' : $link;
+		{
+					$context['view_members_list'][$viewer['log_time'] . $viewer['member_name']] = empty($viewer['show_online']) ? '<em>' . $link . '</em>' : $link;
+		}
 
 		// fill the detailed list
 		$context['view_members'][$viewer['log_time'] . $viewer['member_name']] = array(
@@ -106,7 +115,9 @@ 
 
 		// add the hidden members to the count (and don't show them in the template)
 		if (empty($viewer['show_online']))
-			$context['view_num_hidden']++;
+		{
+					$context['view_num_hidden']++;
+		}
 	}
 
 	// Sort them out.
@@ -193,7 +204,9 @@ 
 	$db = database();
 
 	if (!allowedTo('who_view'))
-		return array();
+	{
+			return array();
+	}
 
 	loadLanguage('Who');
 
@@ -224,9 +237,12 @@ 
 	call_integration_hook('integrate_whos_online_allowed', array(&$allowedActions));
 
 	if (!is_array($urls))
-		$url_list = array(array($urls, $user_info['id']));
-	else
-		$url_list = $urls;
+	{
+			$url_list = array(array($urls, $user_info['id']));
+	}
+	else {
+			$url_list = $urls;
+	}
 
 	// These are done to query these in large chunks. (instead of one by one.)
 	$topic_ids = array();
@@ -239,11 +255,15 @@ 
 		// Get the request parameters..
 		$actions = Util::unserialize($url[0]);
 		if ($actions === false)
-			continue;
+		{
+					continue;
+		}
 
 		// If it's the admin or moderation center, and there is an area set, use that instead.
 		if (isset($actions['action']) && ($actions['action'] == 'admin' || $actions['action'] == 'moderate') && isset($actions['area']))
-			$actions['action'] = $actions['area'];
+		{
+					$actions['action'] = $actions['area'];
+		}
 
 		// Check if there was no action or the action is display.
 		if (!isset($actions['action']) || $actions['action'] == 'display')
@@ -263,12 +283,15 @@ 
 				$board_ids[$actions['board']][$k] = $txt['who_board'];
 			}
 			// It's the board index!!  It must be!
-			else
-				$data[$k] = replaceBasicActionUrl($txt['who_index']);
+			else {
+							$data[$k] = replaceBasicActionUrl($txt['who_index']);
+			}
 		}
 		// Probably an error or some goon?
 		elseif ($actions['action'] == '')
-			$data[$k] = replaceBasicActionUrl($txt['who_index']);
+		{
+					$data[$k] = replaceBasicActionUrl($txt['who_index']);
+		}
 		// Some other normal action...?
 		else
 		{
@@ -282,9 +305,12 @@ 
 					$memID = currentMemberID();
 
 					if ($memID == $user_info['id'])
-						$actions['u'] = $url[1];
-					else
-						$actions['u'] = $memID;
+					{
+											$actions['u'] = $url[1];
+					}
+					else {
+											$actions['u'] = $memID;
+					}
 				}
 
 				$data[$k] = $txt['who_hidden'];
@@ -295,16 +321,23 @@ 
 			{
 				$data[$k] = $txt['who_hidden'];
 				if ($actions['action'] == 'topicbyemail')
-					$board_ids[(int) $actions['board']][$k] = $txt['who_topicbyemail'];
-				else
-					$board_ids[(int) $actions['board']][$k] = isset($actions['poll']) ? $txt['who_poll'] : $txt['who_post'];
+				{
+									$board_ids[(int) $actions['board']][$k] = $txt['who_topicbyemail'];
+				}
+				else {
+									$board_ids[(int) $actions['board']][$k] = isset($actions['poll']) ? $txt['who_poll'] : $txt['who_post'];
+				}
 			}
 			// A subaction anyone can view... if the language string is there, show it.
 			elseif (isset($actions['sa']) && isset($txt['whoall_' . $actions['action'] . '_' . $actions['sa']]))
-				$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']]) ? $txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']] : $txt['whoall_' . $actions['action'] . '_' . $actions['sa']];
+			{
+							$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']]) ? $txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']] : $txt['whoall_' . $actions['action'] . '_' . $actions['sa']];
+			}
 			// An action any old fellow can look at. (if $txt['whoall_' . $action] exists, we know everyone can see it.)
 			elseif (isset($txt['whoall_' . $actions['action']]))
-				$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action']]) ? $txt[$preferred_prefix . $actions['action']] : replaceBasicActionUrl($txt['whoall_' . $actions['action']]);
+			{
+							$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action']]) ? $txt[$preferred_prefix . $actions['action']] : replaceBasicActionUrl($txt['whoall_' . $actions['action']]);
+			}
 			// Viewable if and only if they can see the board...
 			elseif (isset($txt['whotopic_' . $actions['action']]))
 			{
@@ -347,34 +380,49 @@ 
 				$db->free_result($result);
 
 				if (empty($id_topic))
-					$data[$k] = $txt['who_hidden'];
+				{
+									$data[$k] = $txt['who_hidden'];
+				}
 			}
 			// Viewable only by administrators.. (if it starts with whoadmin, it's admin only!)
 			elseif (allowedTo('moderate_forum') && isset($txt['whoadmin_' . $actions['action']]))
-				$data[$k] = $txt['whoadmin_' . $actions['action']];
+			{
+							$data[$k] = $txt['whoadmin_' . $actions['action']];
+			}
 			// Viewable by permission level.
 			elseif (isset($allowedActions[$actions['action']]))
 			{
 				if (allowedTo($allowedActions[$actions['action']]))
 				{
 					if (isset($actions['sa']) && isset($txt['whoallow_' . $actions['action'] . '_' . $actions['sa']]))
-						$data[$k] = replaceBasicActionUrl($txt['whoallow_' . $actions['action'] . '_' . $actions['sa']]);
-					else
-						$data[$k] = replaceBasicActionUrl($txt['whoallow_' . $actions['action']]);
+					{
+											$data[$k] = replaceBasicActionUrl($txt['whoallow_' . $actions['action'] . '_' . $actions['sa']]);
+					}
+					else {
+											$data[$k] = replaceBasicActionUrl($txt['whoallow_' . $actions['action']]);
+					}
 				}
 				elseif (in_array('moderate_forum', $allowedActions[$actions['action']]))
-					$data[$k] = $txt['who_moderate'];
+				{
+									$data[$k] = $txt['who_moderate'];
+				}
 				elseif (in_array('admin_forum', $allowedActions[$actions['action']]))
-					$data[$k] = $txt['who_admin'];
-				else
-					$data[$k] = $txt['who_hidden'];
+				{
+									$data[$k] = $txt['who_admin'];
+				}
+				else {
+									$data[$k] = $txt['who_hidden'];
+				}
 			}
 			// Something we don't have details about, but it is an action, maybe an addon
 			elseif (!empty($actions['action']))
-				$data[$k] = sprintf($txt['who_generic'], $actions['action']);
+			{
+							$data[$k] = sprintf($txt['who_generic'], $actions['action']);
+			}
 			// We just don't know
-			else
-				$data[$k] = $txt['who_unknown'];
+			else {
+							$data[$k] = $txt['who_unknown'];
+			}
 		}
 
 		// Maybe the action is integrated into another system?
@@ -403,7 +451,9 @@ 
 		{
 			// Show the topic's subject for each of the members looking at this...
 			foreach ($topic_ids[$topic['id_topic']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $scripturl . '?topic=' . $topic['id_topic'] . '.0', $topic['subject']);
+			{
+							$data[$k] = sprintf($session_text, $scripturl . '?topic=' . $topic['id_topic'] . '.0', $topic['subject']);
+			}
 		}
 	}
 
@@ -417,7 +467,9 @@ 
 		{
 			// Put the board name into the string for each member...
 			foreach ($board_ids[$board['id_board']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $scripturl . '?board=' . $board['id_board'] . '.0', $board['board_name']);
+			{
+							$data[$k] = sprintf($session_text, $scripturl . '?board=' . $board['id_board'] . '.0', $board['board_name']);
+			}
 		}
 	}
 
@@ -430,19 +482,26 @@ 
 		{
 			// If they aren't allowed to view this person's profile, skip it.
 			if (!allowedTo('profile_view_any') && $user_info['id'] != $row['id_member'])
-				continue;
+			{
+							continue;
+			}
 
 			// Set their action on each - session/text to sprintf.
 			foreach ($profile_ids[$row['id_member']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $scripturl . '?action=profile;u=' . $row['id_member'], $row['real_name']);
+			{
+							$data[$k] = sprintf($session_text, $scripturl . '?action=profile;u=' . $row['id_member'], $row['real_name']);
+			}
 		}
 	}
 
 	if (!is_array($urls))
-		return isset($data[0]) ? $data[0] : false;
-	else
-		return $data;
-}
+	{
+			return isset($data[0]) ? $data[0] : false;
+	}
+	else {
+			return $data;
+	}
+	}
 
 /**
  * Prepare credits for display.

sources/subs/BoardsList.class.php

Spacing +1 added lines, -1 removed lines

@@ -369,7 +369,7 @@
 			if ($row_board['subject'] != '')
 			{
 				$this_last_post['href'] = $this->_scripturl . '?topic=' . $row_board['id_topic'] . '.msg' . ($this->_user['is_guest'] ? $row_board['id_msg'] : $row_board['new_from']) . (empty($row_board['is_read']) ? ';boardseen' : '') . '#new';
-				$this_last_post['link'] = '<a href="' . $this_last_post['href'] . '" title="' . Util::htmlspecialchars($row_board['subject']). '">' . $row_board['short_subject'] . '</a>';
+				$this_last_post['link'] = '<a href="' . $this_last_post['href'] . '" title="' . Util::htmlspecialchars($row_board['subject']) . '">' . $row_board['short_subject'] . '</a>';
 				/* The board's and children's 'last_post's have:
 				time, timestamp (a number that represents the time.), id (of the post), topic (topic id.),
 				link, href, subject, start (where they should go for the first unread post.),

Braces +51 added lines, -20 removed lines

@@ -136,16 +136,23 @@ 
 
 		// Start with an empty array.
 		if ($this->_options['include_categories'])
-			$this->_categories = array();
-		else
-			$this->_current_boards = array();
+		{
+					$this->_categories = array();
+		}
+		else {
+					$this->_current_boards = array();
+		}
 
 		// For performance, track the latest post while going through the boards.
 		if (!empty($this->_options['set_latest_post']))
-			$this->_latest_post = array('timestamp' => 0);
+		{
+					$this->_latest_post = array('timestamp' => 0);
+		}
 
 		if (!empty($modSettings['recycle_enable']))
-			$this->_recycle_board = $modSettings['recycle_board'];
+		{
+					$this->_recycle_board = $modSettings['recycle_board'];
+		}
 	}
 
 	/**
@@ -230,14 +237,18 @@ 
 
 				// If this board has new posts in it (and isn't the recycle bin!) then the category is new.
 				if ($this->_recycle_board != $row_board['id_board'])
-					$this->_categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']) && $row_board['poster_name'] != '';
+				{
+									$this->_categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']) && $row_board['poster_name'] != '';
+				}
 
 				// Avoid showing category unread link where it only has redirection boards.
 				$this->_categories[$row_board['id_cat']]['show_unread'] = !empty($this->_categories[$row_board['id_cat']]['show_unread']) ? 1 : !$row_board['is_redirect'];
 
 				// Collapsed category - don't do any of this.
 				if ($this->_categories[$row_board['id_cat']]['is_collapsed'])
-					continue;
+				{
+									continue;
+				}
 
 				// Let's save some typing.  Climbing the array might be slower, anyhow.
 				$this->_current_boards = &$this->_categories[$row_board['id_cat']]['boards'];
@@ -313,13 +324,17 @@ 
 			{
 				// @todo why this is not initialized outside the loop?
 				if (!isset($parent_map))
-					$parent_map = array();
+				{
+									$parent_map = array();
+				}
 
 				if (!isset($parent_map[$row_board['id_parent']]))
-					foreach ($this->_current_boards as $id => $board)
+				{
+									foreach ($this->_current_boards as $id => $board)
 					{
 						if (!isset($board['children'][$row_board['id_parent']]))
 							continue;
+				}
 
 						$parent_map[$row_board['id_parent']] = array(&$this->_current_boards[$id], &$this->_current_boards[$id]['children'][$row_board['id_parent']]);
 						$parent_map[$row_board['id_board']] = array(&$this->_current_boards[$id], &$this->_current_boards[$id]['children'][$row_board['id_parent']]);
@@ -340,8 +355,9 @@ 
 				continue;
 			}
 			// Found a child of a child - skip.
-			else
-				continue;
+			else {
+							continue;
+			}
 
 			// Prepare the subject, and make sure it's not too long.
 			$row_board['subject'] = censor($row_board['subject']);
@@ -364,7 +380,9 @@ 
 			);
 
 			if ($this->_options['avatars_on_indexes'])
-				$this_last_post['member']['avatar'] = determineAvatar($row_board);
+			{
+							$this_last_post['member']['avatar'] = determineAvatar($row_board);
+			}
 
 			// Provide the href and link.
 			if ($row_board['subject'] != '')
@@ -386,7 +404,9 @@ 
 
 			// Set the last post in the parent board.
 			if ($row_board['id_parent'] == $this->_options['parent_id'] || ($isChild && !empty($row_board['poster_time']) && $this->_current_boards[$row_board['id_parent']]['last_post']['timestamp'] < forum_time(true, $row_board['poster_time'])))
-				$this->_current_boards[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+			{
+							$this->_current_boards[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+			}
 			// Just in the child...?
 			if ($isChild)
 			{
@@ -397,16 +417,22 @@ 
 			}
 			// No last post for this board?  It's not new then, is it..?
 			elseif ($row_board['poster_name'] == '')
-				$this->_current_boards[$row_board['id_board']]['new'] = false;
+			{
+							$this->_current_boards[$row_board['id_board']]['new'] = false;
+			}
 
 			// Determine a global most recent topic.
 			if ($this->_options['set_latest_post'] && !empty($row_board['poster_time']) && $row_board['poster_time'] > $this->_latest_post['timestamp'] && !$ignoreThisBoard)
-				$this->_latest_post = &$this->_current_boards[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'];
+			{
+							$this->_latest_post = &$this->_current_boards[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'];
+			}
 		}
 		$this->_db->free_result($result_boards);
 
 		if ($this->_options['get_moderators'] && !empty($this->_boards))
-			$this->_getBoardModerators();
+		{
+					$this->_getBoardModerators();
+		}
 
 		return $this->_options['include_categories'] ? $this->_categories : $this->_current_boards;
 	}
@@ -419,9 +445,12 @@ 
 	public function getLatestPost()
 	{
 		if (empty($this->_latest_post) || empty($this->_latest_post['link']))
-			return array();
-		else
-			return $this->_latest_post;
+		{
+					return array();
+		}
+		else {
+					return $this->_latest_post;
+		}
 	}
 
 	/**
@@ -451,7 +480,9 @@ 
 		foreach ($mod_cached as $row_mods)
 		{
 			if ($this->_options['include_categories'])
-				$this->_current_boards = &$this->_categories[$this->_boards[$row_mods['id_board']]]['boards'];
+			{
+							$this->_current_boards = &$this->_categories[$this->_boards[$row_mods['id_board']]]['boards'];
+			}
 
 			$this->_current_boards[$row_mods['id_board']]['moderators'][$row_mods['id_moderator']] = array(
 				'id' => $row_mods['id_moderator'],

sources/subs/Unread.class.php

Indentation +12 added lines, -12 removed lines

@@ -358,7 +358,7 @@ 
 	 */
 	private function _getUnreadReplies($start, $limit, $include_avatars = false)
 	{
-        $request = $this->_db->query('unread_replies', '
+		$request = $this->_db->query('unread_replies', '
 				SELECT DISTINCT t.id_topic
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic AND m.id_member = {int:current_member})' . (strpos($this->_sort_query, 'ms.') === false ? '' : '
@@ -369,19 +369,19 @@ 
 				WHERE t.id_board IN ({array_int:boards})
 					AND t.id_last_msg >= {int:min_message}
 					AND COALESCE(lt.id_msg, lmr.id_msg, 0) < t.id_last_msg' .
-            ($this->_post_mod ? ' AND t.approved = {int:is_approved}' : '') .
-            ($this->_unwatch ? ' AND COALESCE(lt.unwatched, 0) != 1' : '') . '
+			($this->_post_mod ? ' AND t.approved = {int:is_approved}' : '') .
+			($this->_unwatch ? ' AND COALESCE(lt.unwatched, 0) != 1' : '') . '
 				ORDER BY {raw:order}
 				LIMIT {int:offset}, {int:limit}',
-            array_merge($this->_query_parameters, array(
-                'current_member' => $this->_user_id,
-                'min_message' => $this->_min_message,
-                'is_approved' => 1,
-                'order' => $this->_sort_query . ($this->_ascending ? '' : ' DESC'),
-                'offset' => $start,
-                'limit' => $limit,
-            ))
-        );
+			array_merge($this->_query_parameters, array(
+				'current_member' => $this->_user_id,
+				'min_message' => $this->_min_message,
+				'is_approved' => 1,
+				'order' => $this->_sort_query . ($this->_ascending ? '' : ' DESC'),
+				'offset' => $start,
+				'limit' => $limit,
+			))
+		);
 
 		$topics = array();
 		while ($row = $this->_db->fetch_assoc($request))

Braces +57 added lines, -25 removed lines

@@ -80,9 +80,12 @@ 
 	public function setBoards($boards)
 	{
 		if (is_array($boards))
-			$this->_query_parameters['boards'] = $boards;
-		else
-			$this->_query_parameters['boards'] = array($boards);
+		{
+					$this->_query_parameters['boards'] = $boards;
+		}
+		else {
+					$this->_query_parameters['boards'] = array($boards);
+		}
 	}
 
 	/**
@@ -93,7 +96,9 @@ 
 	public function setAction($action)
 	{
 		if (in_array($action, array(self::UNREAD, self::UNREADREPLIES)))
-			$this->_action = $action;
+		{
+					$this->_action = $action;
+		}
 	}
 
 	/**
@@ -139,9 +144,12 @@ 
 	public function bodyPreview($chars)
 	{
 		if ($chars === true)
-			$this->_preview_bodies = 'all';
-		else
-			$this->_preview_bodies = (int) $chars;
+		{
+					$this->_preview_bodies = 'all';
+		}
+		else {
+					$this->_preview_bodies = (int) $chars;
+		}
 	}
 
 	/**
@@ -153,9 +161,12 @@ 
 	public function numUnreads($first_login = false, $id_msg_last_visit = 0)
 	{
 		if ($this->_action === self::UNREAD)
-			$this->_countRecentTopics($first_login, $id_msg_last_visit);
-		else
-			$this->_countUnreadReplies();
+		{
+					$this->_countRecentTopics($first_login, $id_msg_last_visit);
+		}
+		else {
+					$this->_countUnreadReplies();
+		}
 
 		return $this->_num_topics;
 	}
@@ -174,9 +185,12 @@ 
 	public function getUnreads($join, $start, $limit, $include_avatars)
 	{
 		if ($this->_action === self::UNREAD)
-			return $this->_getUnreadTopics($join, $start, $limit, $include_avatars);
-		else
-			return $this->_getUnreadReplies($start, $limit, $include_avatars);
+		{
+					return $this->_getUnreadTopics($join, $start, $limit, $include_avatars);
+		}
+		else {
+					return $this->_getUnreadReplies($start, $limit, $include_avatars);
+		}
 	}
 
 	/**
@@ -194,15 +208,20 @@ 
 	private function _getUnreadTopics($join, $start, $limit, $include_avatars = false)
 	{
 		if ($this->_preview_bodies == 'all')
-			$body_query = 'ml.body AS last_body, ms.body AS first_body,';
+		{
+					$body_query = 'ml.body AS last_body, ms.body AS first_body,';
+		}
 		else
 		{
 			// If empty, no preview at all
 			if (empty($this->_preview_bodies))
-				$body_query = '';
+			{
+							$body_query = '';
+			}
 			// Default: a SUBSTRING
-			else
-				$body_query = 'SUBSTRING(ml.body, 1, ' . ($this->_preview_bodies + 256) . ') AS last_body, SUBSTRING(ms.body, 1, ' . ($this->_preview_bodies + 256) . ') AS first_body,';
+			else {
+							$body_query = 'SUBSTRING(ml.body, 1, ' . ($this->_preview_bodies + 256) . ') AS last_body, SUBSTRING(ms.body, 1, ' . ($this->_preview_bodies + 256) . ') AS first_body,';
+			}
 		}
 
 		if (!empty($include_avatars))
@@ -265,7 +284,9 @@ 
 		);
 		$topics = array();
 		while ($row = $this->_db->fetch_assoc($request))
-			$topics[] = $row;
+		{
+					$topics[] = $row;
+		}
 		$this->_db->free_result($request);
 
 		return Topic_Util::prepareContext($topics, true, ((int) $this->_preview_bodies) + 128);
@@ -365,23 +386,32 @@ 
 
 		$topics = array();
 		while ($row = $this->_db->fetch_assoc($request))
-			$topics[] = $row['id_topic'];
+		{
+					$topics[] = $row['id_topic'];
+		}
 		$this->_db->free_result($request);
 
 		// Sanity... where have you gone?
 		if (empty($topics))
-			return false;
+		{
+					return false;
+		}
 
 		if ($this->_preview_bodies == 'all')
-			$body_query = 'ml.body AS last_body, ms.body AS first_body,';
+		{
+					$body_query = 'ml.body AS last_body, ms.body AS first_body,';
+		}
 		else
 		{
 			// If empty, no preview at all
 			if (empty($this->_preview_bodies))
-				$body_query = '';
+			{
+							$body_query = '';
+			}
 			// Default: a SUBSTRING
-			else
-				$body_query = 'SUBSTRING(ml.body, 1, ' . ($this->_preview_bodies + 256) . ') AS last_body, SUBSTRING(ms.body, 1, ' . ($this->_preview_bodies + 256) . ') AS first_body,';
+			else {
+							$body_query = 'SUBSTRING(ml.body, 1, ' . ($this->_preview_bodies + 256) . ') AS last_body, SUBSTRING(ms.body, 1, ' . ($this->_preview_bodies + 256) . ') AS first_body,';
+			}
 		}
 
 		if (!empty($include_avatars))
@@ -437,7 +467,9 @@ 
 		);
 		$return = array();
 		while ($row = $this->_db->fetch_assoc($request))
-			$return[] = $row;
+		{
+					$return[] = $row;
+		}
 		$this->_db->free_result($request);
 
 		return Topic_Util::prepareContext($return, true, ((int) $this->_preview_bodies) + 128);

sources/subs/Topic.subs.php

Indentation +21 added lines, -21 removed lines

@@ -1591,7 +1591,7 @@ 
 	$db = database();
 
 	// Get the messages and stick them into an array.
-    $request = $db->query('', '
+	$request = $db->query('', '
 		SELECT 
 			m.subject, COALESCE(mem.real_name, m.poster_name) AS real_name, m.poster_time, m.body, 
 			m.id_msg, m.smileys_enabled, m.id_member 
@@ -1610,17 +1610,17 @@ 
 		JOIN {db_prefix}messages as m ON o.id_msg=m.id_msg 
 		LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 		ORDER BY m.id_msg DESC',
-        array(
-            'current_topic' => $topic,
-            'no_split_msgs' => !empty($messages['excluded']) ? $messages['excluded'] : array(),
-            'split_msgs' => !empty($messages['included']) ? $messages['included'] : array(),
-            'is_approved' => 1,
-            'start' => $start,
-            'messages_per_page' => $items_per_page,
-            'msg_before' => !empty($messages['before']) ? (int) $messages['before'] : 0,
-            'msg_after' => !empty($messages['after']) ? (int) $messages['after'] : 0,
-        )
-    );
+		array(
+			'current_topic' => $topic,
+			'no_split_msgs' => !empty($messages['excluded']) ? $messages['excluded'] : array(),
+			'split_msgs' => !empty($messages['included']) ? $messages['included'] : array(),
+			'is_approved' => 1,
+			'start' => $start,
+			'messages_per_page' => $items_per_page,
+			'msg_before' => !empty($messages['before']) ? (int) $messages['before'] : 0,
+			'msg_after' => !empty($messages['after']) ? (int) $messages['after'] : 0,
+		)
+	);
 
 	$messages = array();
 	$parser = \BBC\ParserWrapper::instance();
@@ -2176,9 +2176,9 @@ 
 	);
 
 	// When evaluating potentially huge offsets, grab the ids only, first.
-    // The performance impact is still significant going from three columns to one.
+	// The performance impact is still significant going from three columns to one.
 	$postMod = $modSettings['postmod_active'] && allowedTo('approve_posts');
-    $request = $db->query('display_get_post_poster', '
+	$request = $db->query('display_get_post_poster', '
 		SELECT 
 			m.id_msg, m.id_member
 		FROM (
@@ -2191,13 +2191,13 @@ 
 			LIMIT ' . $limit['start'] . ', ' . $limit['offset']) . ') AS o 
 		JOIN {db_prefix}messages as m ON o.id_msg=m.id_msg
 		ORDER BY m.id_msg ' . ($sort ? '' : 'DESC'),
-        array(
-            'current_member' => $user_info['id'],
-            'current_topic' => $topic,
-            'is_approved' => 1,
-            'blank_id_member' => 0,
-        )
-    );
+		array(
+			'current_member' => $user_info['id'],
+			'current_topic' => $topic,
+			'is_approved' => 1,
+			'blank_id_member' => 0,
+		)
+	);
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!empty($row['id_member']))

Braces +271 added lines, -96 removed lines

@@ -38,7 +38,9 @@ 
 	{
 		// Skip if we have to test the owner *and* the user is not the owner
 		if ($test_owner && $row['id_member_started'] != $user_info['id'])
-			continue;
+		{
+					continue;
+		}
 
 		$removeCache[] = $row['id_topic'];
 		$removeCacheBoards[$row['id_topic']] = $row['id_board'];
@@ -46,8 +48,10 @@ 
 
 	// Maybe *none* were their own topics.
 	if (!empty($removeCache))
-		removeTopics($removeCache, true, false, true, $removeCacheBoards);
-}
+	{
+			removeTopics($removeCache, true, false, true, $removeCacheBoards);
+	}
+	}
 
 /**
  * Removes the passed id_topic's.
@@ -67,14 +71,18 @@ 
 
 	// Nothing to do?
 	if (empty($topics))
-		return;
+	{
+			return;
+	}
 
 	$db = database();
 	$cache = Cache::instance();
 
 	// Only a single topic.
 	if (!is_array($topics))
-		$topics = array($topics);
+	{
+			$topics = array($topics);
+	}
 
 	if ($log)
 	{
@@ -110,7 +118,9 @@ 
 		{
 			require_once(SUBSDIR . '/Members.subs.php');
 			while ($rowMembers = $db->fetch_assoc($requestMembers))
-				updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+			{
+							updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+			}
 		}
 		$db->free_result($requestMembers);
 	}
@@ -130,7 +140,9 @@ 
 			{
 				// If it's already in the recycle board do nothing
 				if ($row['id_board'] == $modSettings['recycle_board'])
-					continue;
+				{
+									continue;
+				}
 
 				$recycleTopics[] = $row['id_topic'];
 
@@ -182,7 +194,9 @@ 
 
 	// Still topics left to delete?
 	if (empty($topics))
-		return;
+	{
+			return;
+	}
 
 	$adjustBoards = array();
 
@@ -217,9 +231,12 @@ 
 
 		// Add the topics to the right type.
 		if ($row['approved'])
-			$adjustBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
-		else
-			$adjustBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		{
+					$adjustBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
+		}
+		else {
+					$adjustBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		}
 	}
 	$db->free_result($request);
 
@@ -251,7 +268,9 @@ 
 	foreach ($possible_polls as $row)
 	{
 		if (!empty($row['id_poll']))
-			$polls[] = $row['id_poll'];
+		{
+					$polls[] = $row['id_poll'];
+		}
 	}
 
 	if (!empty($polls))
@@ -313,7 +332,8 @@ 
 		$words = array_unique($words);
 
 		if (!empty($words) && !empty($messages))
-			$db->query('', '
+		{
+					$db->query('', '
 				DELETE FROM {db_prefix}log_search_words
 				WHERE id_word IN ({array_int:word_list})
 					AND id_msg IN ({array_int:message_list})',
@@ -322,11 +342,14 @@ 
 					'message_list' => $messages,
 				)
 			);
+		}
 	}
 
 	// Reuse the message array if available
 	if (empty($messages))
-		$messages = messagesInTopics($topics);
+	{
+			$messages = messagesInTopics($topics);
+	}
 
 	// If there are messages left in this topic
 	if (!empty($messages))
@@ -407,7 +430,9 @@ 
 	removeFollowUpsByTopic($topics);
 
 	foreach ($topics as $topic_id)
-		$cache->remove('topic_board-' . $topic_id);
+	{
+			$cache->remove('topic_board-' . $topic_id);
+	}
 
 	// Maybe there's an addon that wants to delete topic related data of its own
 	call_integration_hook('integrate_remove_topics', array($topics));
@@ -423,7 +448,9 @@ 
 	require_once(SUBSDIR . '/Post.subs.php');
 	$updates = array();
 	foreach ($adjustBoards as $stats)
-		$updates[] = $stats['id_board'];
+	{
+			$updates[] = $stats['id_board'];
+	}
 	updateLastMessages($updates);
 }
 
@@ -460,13 +487,17 @@ 
 		$to = $moveCache[1][$row['id_topic']];
 
 		if (empty($to))
-			continue;
+		{
+					continue;
+		}
 
 		// Does this topic's board count the posts or not?
 		$countPosts[$row['id_topic']] = empty($row['count_posts']);
 
 		if (!isset($moveTos[$to]))
-			$moveTos[$to] = array();
+		{
+					$moveTos[$to] = array();
+		}
 
 		$moveTos[$to][] = $row['id_topic'];
 
@@ -477,7 +508,9 @@ 
 
 	// Do the actual moves...
 	foreach ($moveTos as $to => $topics)
-		moveTopics($topics, $to, true);
+	{
+			moveTopics($topics, $to, true);
+	}
 
 	// Does the post counts need to be updated?
 	if (!empty($moveTos))
@@ -512,7 +545,9 @@ 
 			{
 				$post_adj = 0;
 				foreach ($topics as $id_topic)
-					$post_adj += $topicRecounts[$id_topic];
+				{
+									$post_adj += $topicRecounts[$id_topic];
+				}
 
 				// And now update that member's post counts
 				if (!empty($post_adj))
@@ -545,13 +580,17 @@ 
 
 	// No topics or no board?
 	if (empty($topics) || empty($toBoard))
-		return;
+	{
+			return;
+	}
 
 	$db = database();
 
 	// Only a single topic.
 	if (!is_array($topics))
-		$topics = array($topics);
+	{
+			$topics = array($topics);
+	}
 
 	$fromBoards = array();
 	$fromCacheBoards = array();
@@ -572,7 +611,9 @@ 
 	);
 	// Num of rows = 0 -> no topics found. Num of rows > 1 -> topics are on multiple boards.
 	if ($db->num_rows($request) == 0)
-		return;
+	{
+			return;
+	}
 
 	while ($row = $db->fetch_assoc($request))
 	{
@@ -593,9 +634,12 @@ 
 
 		// Add the topics to the right type.
 		if ($row['approved'])
-			$fromBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
-		else
-			$fromBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		{
+					$fromBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
+		}
+		else {
+					$fromBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		}
 	}
 	$db->free_result($request);
 
@@ -713,12 +757,15 @@ 
 		);
 		$approval_msgs = array();
 		while ($row = $db->fetch_assoc($request))
-			$approval_msgs[] = $row['id_msg'];
+		{
+					$approval_msgs[] = $row['id_msg'];
+		}
 		$db->free_result($request);
 
 		// Empty the approval queue for these, as we're going to approve them next.
 		if (!empty($approval_msgs))
-			$db->query('', '
+		{
+					$db->query('', '
 				DELETE FROM {db_prefix}approval_queue
 				WHERE id_msg IN ({array_int:message_list})
 					AND id_attach = {int:id_attach}',
@@ -727,6 +774,7 @@ 
 					'id_attach' => 0,
 				)
 			);
+		}
 
 		// Get all the current max and mins.
 		$topicAttribute = topicAttribute($topics, array('id_topic', 'id_first_msg', 'id_last_msg'));
@@ -753,10 +801,12 @@ 
 		{
 			// If not, update.
 			if ($row['first_msg'] != $topicMaxMin[$row['id_topic']]['min'] || $row['last_msg'] != $topicMaxMin[$row['id_topic']]['max'])
-				setTopicAttribute($row['id_topic'], array(
+			{
+							setTopicAttribute($row['id_topic'], array(
 					'id_first_msg' => $row['first_msg'],
 					'id_last_msg' => $row['last_msg'],
 				));
+			}
 		}
 		$db->free_result($request);
 	}
@@ -813,7 +863,9 @@ 
 	$cache = Cache::instance();
 	// Update the cache?
 	foreach ($topics as $topic_id)
-		$cache->remove('topic_board-' . $topic_id);
+	{
+			$cache->remove('topic_board-' . $topic_id);
+	}
 
 	require_once(SUBSDIR . '/Post.subs.php');
 
@@ -861,17 +913,27 @@ 
 
 	// @deprecated since 1.1
 	if ($move_from === null && isset($_GET['current_board']))
-		$move_from = (int) $_GET['current_board'];
+	{
+			$move_from = (int) $_GET['current_board'];
+	}
 	if ($id_board === null && !empty($board))
-		$id_board = $board;
+	{
+			$id_board = $board;
+	}
 	if ($id_topic === null && !empty($topic))
-		$id_topic = $topic;
+	{
+			$id_topic = $topic;
+	}
 
 	if (empty($move_from) || empty($id_board) || empty($id_topic))
-		return true;
+	{
+			return true;
+	}
 
 	if ($move_from == $id_board)
-		return true;
+	{
+			return true;
+	}
 	else
 	{
 		$request = $db->query('', '
@@ -957,7 +1019,9 @@ 
 	$db = database();
 
 	if (!is_array($mark_topics))
-		return;
+	{
+			return;
+	}
 
 	$db->insert($was_set ? 'replace' : 'ignore',
 		'{db_prefix}log_topics',
@@ -1000,7 +1064,9 @@ 
 	{
 		// Find if this topic is marked for notification...
 		if (!empty($row['id_topic']))
-			$context['is_marked_notify'] = true;
+		{
+					$context['is_marked_notify'] = true;
+		}
 
 		// Only do this once, but mark the notifications as "not sent yet" for next time.
 		if (!empty($row['sent']))
@@ -1283,15 +1349,19 @@ 
 
 	// Nothing to do
 	if (empty($topic_parameters))
-		return false;
+	{
+			return false;
+	}
 
 	// Build what we can with what we were given
 	if (!is_array($topic_parameters))
-		$topic_parameters = array(
+	{
+			$topic_parameters = array(
 			'topic' => $topic_parameters,
 			'member' => $user_info['id'],
 			'board' => (int) $board,
 		);
+	}
 
 	$messages_table = $full === 'message' || $full === 'all' || $full === 'starter';
 	$members_table = $full === 'starter';
@@ -1322,7 +1392,9 @@ 
 	);
 	$topic_info = array();
 	if ($request !== false)
-		$topic_info = $db->fetch_assoc($request);
+	{
+			$topic_info = $db->fetch_assoc($request);
+	}
 	$db->free_result($request);
 
 	return $topic_info;
@@ -1342,7 +1414,9 @@ 
 
 	// Nothing to do
 	if (empty($topic))
-		return false;
+	{
+			return false;
+	}
 
 	$db = database();
 
@@ -1433,7 +1507,9 @@ 
 	);
 	$topics = array();
 	while ($row = $db->fetch_assoc($request))
-		$topics[] = $row['id_topic'];
+	{
+			$topics[] = $row['id_topic'];
+	}
 	$db->free_result($request);
 
 	removeTopics($topics, false, true);
@@ -1459,7 +1535,9 @@ 
 		);
 	$topicIDs = array();
 	while ($row = $db->fetch_assoc($request))
-		$topicIDs[] = $row['id_topic'];
+	{
+			$topicIDs[] = $row['id_topic'];
+	}
 	$db->free_result($request);
 
 	return $topicIDs;
@@ -1496,7 +1574,9 @@ 
 	);
 	$messages = array();
 	while ($row = $db->fetch_assoc($request))
-		$messages[] = $row['id_msg'];
+	{
+			$messages[] = $row['id_msg'];
+	}
 	$db->free_result($request);
 
 	return $messages;
@@ -1519,7 +1599,9 @@ 
 
 	// Give us something to work with
 	if (empty($id_topic) || empty($id_msg))
-		return false;
+	{
+			return false;
+	}
 
 	$request = $db->query('', '
 		SELECT COUNT(*)
@@ -1738,7 +1820,9 @@ 
 	{
 		$temp[$row['id_attach']] = $row;
 		if (!isset($printattach[$row['id_msg']]))
-			$printattach[$row['id_msg']] = array();
+		{
+					$printattach[$row['id_msg']] = array();
+		}
 	}
 	$db->free_result($request);
 	ksort($temp);
@@ -1789,7 +1873,9 @@ 
 
 	// not all guests are the same!
 	if (empty($id_member))
-		return array();
+	{
+			return array();
+	}
 
 	$request = $db->query('', '
 			SELECT COUNT(id_member) AS my_unapproved_posts
@@ -1850,7 +1936,8 @@ 
 	// If the new topic isn't approved ensure the first message flags
 	// this just in case.
 	if (!$options['split2_approved'])
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}messages
 			SET approved = {int:approved}
 			WHERE id_msg = {int:id_msg}
@@ -1861,6 +1948,7 @@ 
 				'id_topic' => $options['split2_ID_TOPIC'],
 			)
 		);
+	}
 
 	// The board has more topics now (Or more unapproved ones!).
 	$db->query('', '
@@ -1921,7 +2009,9 @@ 
 	}
 
 	if (empty($update))
-		return false;
+	{
+			return false;
+	}
 
 	$attributes['current_topic'] = (array) $topic;
 
@@ -1967,7 +2057,9 @@ 
 	{
 		$status = array();
 		while ($row = $db->fetch_assoc($request))
-			$status[] = $row;
+		{
+					$status[] = $row;
+		}
 	}
 	else
 	{
@@ -2105,7 +2197,9 @@ 
 	);
 	$logged_topics = array();
 	while ($row = $db->fetch_assoc($request))
-		$logged_topics[$row['id_topic']] = $row;
+	{
+			$logged_topics[$row['id_topic']] = $row;
+	}
 	$db->free_result($request);
 
 	return $logged_topics;
@@ -2122,7 +2216,9 @@ 
 
 	// you have to want *something* from this function
 	if (empty($topic_ids))
-		return array();
+	{
+			return array();
+	}
 
 	$db = database();
 
@@ -2201,7 +2297,9 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!empty($row['id_member']))
-			$topic_details['all_posters'][$row['id_msg']] = $row['id_member'];
+		{
+					$topic_details['all_posters'][$row['id_msg']] = $row['id_member'];
+		}
 
 		$topic_details['messages'][] = $row['id_msg'];
 	}
@@ -2267,7 +2365,9 @@ 
 
 		// and tell the world about it again
 		foreach ($messages as $post)
-			logAction('approve', array('topic' => $messageDetails[$post]['topic'], 'subject' => $messageDetails[$post]['subject'], 'member' => $messageDetails[$post]['member'], 'board' => $messageDetails[$post]['board']));
+		{
+					logAction('approve', array('topic' => $messageDetails[$post]['topic'], 'subject' => $messageDetails[$post]['subject'], 'member' => $messageDetails[$post]['member'], 'board' => $messageDetails[$post]['board']));
+		}
 	}
 }
 
@@ -2284,10 +2384,14 @@ 
 	global $board;
 
 	if (!is_array($topics))
-		$topics = array($topics);
+	{
+			$topics = array($topics);
+	}
 
 	if (empty($topics))
-		return false;
+	{
+			return false;
+	}
 
 	$db = database();
 
@@ -2330,7 +2434,9 @@ 
 	);
 	$msgs = array();
 	while ($row = $db->fetch_assoc($request))
-		$msgs[] = $row['id_msg'];
+	{
+			$msgs[] = $row['id_msg'];
+	}
 	$db->free_result($request);
 
 	require_once(SUBSDIR . '/Post.subs.php');
@@ -2352,7 +2458,9 @@ 
 
 	// Should be in the boardwide language.
 	if ($user_info['language'] != $language)
-		loadLanguage('index', $language);
+	{
+			loadLanguage('index', $language);
+	}
 
 	preparsecode($reason);
 
@@ -2408,7 +2516,9 @@ 
 
 	// Nothing to split?
 	if (empty($splitMessages))
-		throw new Elk_Exception('no_posts_selected', false);
+	{
+			throw new Elk_Exception('no_posts_selected', false);
+	}
 
 	// Get some board info.
 	$topicAttribute = topicAttribute($split1_ID_TOPIC, array('id_board', 'approved'));
@@ -2433,7 +2543,9 @@ 
 	);
 	// You can't select ALL the messages!
 	if ($db->num_rows($request) == 0)
-		throw new Elk_Exception('selected_all_posts', false);
+	{
+			throw new Elk_Exception('selected_all_posts', false);
+	}
 
 	$split1_first_msg = null;
 	$split1_last_msg = null;
@@ -2442,10 +2554,14 @@ 
 	{
 		// Get the right first and last message dependant on approved state...
 		if (empty($split1_first_msg) || $row['myid_first_msg'] < $split1_first_msg)
-			$split1_first_msg = $row['myid_first_msg'];
+		{
+					$split1_first_msg = $row['myid_first_msg'];
+		}
 
 		if (empty($split1_last_msg) || $row['approved'])
-			$split1_last_msg = $row['myid_last_msg'];
+		{
+					$split1_last_msg = $row['myid_last_msg'];
+		}
 
 		// Get the counts correct...
 		if ($row['approved'])
@@ -2456,10 +2572,14 @@ 
 		else
 		{
 			if (!isset($split1_replies))
-				$split1_replies = 0;
+			{
+							$split1_replies = 0;
+			}
 			// If the topic isn't approved then num replies must go up by one... as first post wouldn't be counted.
 			elseif (!$split1_approved)
-				$split1_replies++;
+			{
+							$split1_replies++;
+			}
 
 			$split1_unapprovedposts = $row['message_count'];
 		}
@@ -2486,10 +2606,14 @@ 
 	{
 		// As before get the right first and last message dependant on approved state...
 		if (empty($split2_first_msg) || $row['myid_first_msg'] < $split2_first_msg)
-			$split2_first_msg = $row['myid_first_msg'];
+		{
+					$split2_first_msg = $row['myid_first_msg'];
+		}
 
 		if (empty($split2_last_msg) || $row['approved'])
-			$split2_last_msg = $row['myid_last_msg'];
+		{
+					$split2_last_msg = $row['myid_last_msg'];
+		}
 
 		// Then do the counts again...
 		if ($row['approved'])
@@ -2502,13 +2626,19 @@ 
 		{
 			// Should this one be approved??
 			if ($split2_first_msg == $row['myid_first_msg'])
-				$split2_approved = false;
+			{
+							$split2_approved = false;
+			}
 
 			if (!isset($split2_replies))
-				$split2_replies = 0;
+			{
+							$split2_replies = 0;
+			}
 			// As before, fix number of replies.
 			elseif (!$split2_approved)
-				$split2_replies++;
+			{
+							$split2_replies++;
+			}
 
 			$split2_unapprovedposts = $row['message_count'];
 		}
@@ -2519,11 +2649,15 @@ 
 
 	// No database changes yet, so let's double check to see if everything makes at least a little sense.
 	if ($split1_first_msg <= 0 || $split1_last_msg <= 0 || $split2_first_msg <= 0 || $split2_last_msg <= 0 || $split1_replies < 0 || $split2_replies < 0 || $split1_unapprovedposts < 0 || $split2_unapprovedposts < 0 || !isset($split1_approved) || !isset($split2_approved))
-		throw new Elk_Exception('cant_find_messages');
+	{
+			throw new Elk_Exception('cant_find_messages');
+	}
 
 	// You cannot split off the first message of a topic.
 	if ($split1_first_msg > $split2_first_msg)
-		throw new Elk_Exception('split_first_post', false);
+	{
+			throw new Elk_Exception('split_first_post', false);
+	}
 
 	// The message that is starting the new topic may have likes, these become topic likes
 	require_once(SUBSDIR . '/Likes.subs.php');
@@ -2552,14 +2686,18 @@ 
 	);
 	$split2_ID_TOPIC = $db->insert_id('{db_prefix}topics', 'id_topic');
 	if ($split2_ID_TOPIC <= 0)
-		throw new Elk_Exception('cant_insert_topic');
+	{
+			throw new Elk_Exception('cant_insert_topic');
+	}
 
 	// Move the messages over to the other topic.
 	$new_subject = strtr(Util::htmltrim(Util::htmlspecialchars($new_subject)), array("\r" => '', "\n" => '', "\t" => ''));
 
 	// Check the subject length.
 	if (Util::strlen($new_subject) > 100)
-		$new_subject = Util::substr($new_subject, 0, 100);
+	{
+			$new_subject = Util::substr($new_subject, 0, 100);
+	}
 
 	// Valid subject?
 	if ($new_subject != '')
@@ -2621,7 +2759,9 @@ 
 	{
 		$replaceEntries = array();
 		while ($row = $db->fetch_assoc($request))
-			$replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']);
+		{
+					$replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']);
+		}
 
 		require_once(SUBSDIR . '/Topic.subs.php');
 		markTopicsRead($replaceEntries, false);
@@ -2643,7 +2783,9 @@ 
 	$search = new \ElkArte\Search\Search;
 	$searchAPI = $search->findSearchAPI();
 	if (is_callable(array($searchAPI, 'topicSplit')))
-		$searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages);
+	{
+			$searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages);
+	}
 
 	// Return the ID of the newly created topic.
 	return $split2_ID_TOPIC;
@@ -2668,12 +2810,16 @@ 
 	{
 		$doMove = false;
 		if (allowedTo('move_any'))
-			$doMove = true;
+		{
+					$doMove = true;
+		}
 		else
 		{
 			$new_topic = getTopicInfo($totopic);
 			if ($new_topic['id_member_started'] == $user_info['id'] && allowedTo('move_own'))
-				$doMove = true;
+			{
+							$doMove = true;
+			}
 		}
 
 		if ($doMove)
@@ -2696,7 +2842,9 @@ 
 				while ($row = $db->fetch_assoc($request))
 				{
 					if (!isset($posters[$row['id_member']]))
-						$posters[$row['id_member']] = 0;
+					{
+											$posters[$row['id_member']] = 0;
+					}
 
 					$posters[$row['id_member']]++;
 				}
@@ -2707,18 +2855,22 @@ 
 				{
 					// The board we're moving from counted posts, but not to.
 					if (empty($boards['current']['count_posts']))
-						updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+					{
+											updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+					}
 					// The reverse: from didn't, to did.
-					else
-						updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+					else {
+											updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+					}
 				}
 			}
 
 			// And finally move it!
 			moveTopics($totopic, $boards['destination']['id']);
 		}
-		else
-			$boards['destination'] = $boards['current'];
+		else {
+					$boards['destination'] = $boards['current'];
+		}
 	}
 }
 
@@ -2736,19 +2888,26 @@ 
 
 	$current_board = boardInfo($board, $topic);
 	if (empty($current_board))
-		throw new Elk_Exception('no_board');
+	{
+			throw new Elk_Exception('no_board');
+	}
 
 	if (!empty($toboard) && $board !== $toboard)
 	{
 		$destination_board = boardInfo($toboard);
 		if (empty($destination_board))
-			throw new Elk_Exception('no_board');
+		{
+					throw new Elk_Exception('no_board');
+		}
 	}
 
 	if (!isset($destination_board))
-		$destination_board = array_merge($current_board, array('id' => $board));
-	else
-		$destination_board['id'] = $toboard;
+	{
+			$destination_board = array_merge($current_board, array('id' => $board));
+	}
+	else {
+			$destination_board['id'] = $toboard;
+	}
 
 	return array('current' => $current_board, 'destination' => $destination_board);
 }
@@ -2879,7 +3038,9 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!isset($posters[$row['id_member']]))
-			$posters[$row['id_member']] = 0;
+		{
+					$posters[$row['id_member']] = 0;
+		}
 
 		$posters[$row['id_member']]++;
 	}
@@ -2997,7 +3158,9 @@ 
 	));
 	$messages = array();
 	while ($row = $db->fetch_assoc($request))
-		$messages[] = $row['id_msg'];
+	{
+			$messages[] = $row['id_msg'];
+	}
 	$db->free_result($request);
 
 	return $messages;
@@ -3023,7 +3186,9 @@ 
 			'topic_list' => $topics,
 	));
 	while ($row = $db->fetch_assoc($request))
-		$members[$row['id_member']][] = $row['id_topic'];
+	{
+			$members[$row['id_member']][] = $row['id_topic'];
+	}
 	$db->free_result($request);
 
 	return $members;
@@ -3133,7 +3298,9 @@ 
 	{
 		$replaceEntries = array();
 		while ($row = $db->fetch_assoc($request))
-			$replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']);
+		{
+					$replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']);
+		}
 
 		markTopicsRead($replaceEntries, true);
 		unset($replaceEntries);
@@ -3164,7 +3331,9 @@ 
 		{
 			$replaceEntries = array();
 			while ($row = $db->fetch_assoc($request))
-				$replaceEntries[] = array($row['id_member'], $id_topic, 0, $row['sent']);
+			{
+							$replaceEntries[] = array($row['id_member'], $id_topic, 0, $row['sent']);
+			}
 
 			$db->insert('replace',
 					'{db_prefix}log_notify',
@@ -3216,7 +3385,9 @@ 
 	);
 
 	if ($db->num_rows($request) == 0)
-		throw new Elk_Exception('topic_gone', false);
+	{
+			throw new Elk_Exception('topic_gone', false);
+	}
 
 	list ($subject) = $db->fetch_row($request);
 	$db->free_result($request);
@@ -3237,7 +3408,9 @@ 
 	$db = database();
 
 	if ($increment === true)
-		updateSettings(array('totalTopics' => true), true);
+	{
+			updateSettings(array('totalTopics' => true), true);
+	}
 	else
 	{
 		// Get the number of topics - a SUM is better for InnoDB tables.
@@ -3280,7 +3453,9 @@ 
 		// Skip the entry if it needs to be checked and the user is not the owen and
 		// the topic was not locked or locked by someone with more permissions
 		if ($needs_check && ($user_info['id'] != $row['id_member_started'] || !in_array($row['locked'], array(0, 2))))
-			continue;
+		{
+					continue;
+		}
 
 		$lockCache[] = $row['id_topic'];
 

sources/controllers/Notify.controller.php

Spacing +1 added lines, -1 removed lines

@@ -425,7 +425,7 @@
 		if ($valid)
 		{
 			$this->_unsubscribeToggle($member, $area, $extra);
-			$this->_prepareTemplateMessage( $area, $extra, $member['email_address']);
+			$this->_prepareTemplateMessage($area, $extra, $member['email_address']);
 
 			return true;
 		}

Braces +6 added lines, -2 removed lines

@@ -85,7 +85,9 @@ 
 
 		// Make sure the topic has been specified.
 		if (empty($topic))
-			throw new Elk_Exception('not_a_topic', false);
+		{
+					throw new Elk_Exception('not_a_topic', false);
+		}
 
 		// What do we do?  Better ask if they didn't say..
 		if (empty($this->_req->query->sa))
@@ -210,7 +212,9 @@ 
 
 		// You have to specify a board to turn notifications on!
 		if (empty($board))
-			throw new Elk_Exception('no_board', false);
+		{
+					throw new Elk_Exception('no_board', false);
+		}
 
 		// No subaction: find out what to do.
 		if (empty($this->_req->query->sa))