SimpleMachines / SMF2.1

Sources/CacheAPI-memcache.php

Braces +19 added lines, -14 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -34,8 +35,9 @@ 
 
 		$supported = class_exists('memcache');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported && !empty($cache_memcached);
 	}
 
@@ -61,9 +63,9 @@ 
 			$server = trim($servers[array_rand($servers)]);
 
 			// Normal host names do not contain slashes, while e.g. unix sockets do. Assume alternative transport pipe with port 0.
-			if (strpos($server,'/') !== false)
-				$host = $server;
-			else
+			if (strpos($server,'/') !== false) {
+							$host = $server;
+			} else
 			{
 				$server = explode(':', $server);
 				$host = $server[0];
@@ -71,10 +73,11 @@ 
 			}
 
 			// Don't wait too long: yes, we want the server, but we might be able to run the query faster!
-			if (empty($db_persist))
-				$connected = $this->memcache->connect($host, $port);
-			else
-				$connected = $this->memcache->pconnect($host, $port);
+			if (empty($db_persist)) {
+							$connected = $this->memcache->connect($host, $port);
+			} else {
+							$connected = $this->memcache->pconnect($host, $port);
+			}
 		}
 
 		return $connected;
@@ -90,8 +93,9 @@ 
 		$value = $this->memcache->get($key);
 
 		// $value should return either data or false (from failure, key not found or empty array).
-		if ($value === false)
-			return null;
+		if ($value === false) {
+					return null;
+		}
 		return $value;
 	}
 
@@ -132,8 +136,9 @@ 
 		$config_vars[] = $txt['cache_memcache_settings'];
 		$config_vars[] = array('cache_memcached', $txt['cache_memcache_servers'], 'file', 'text', 0, 'cache_memcached', 'postinput' => '<br /><div class="smalltext"><em>' . $txt['cache_memcache_servers_subtext'] . '</em></div>');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {

Sources/Subs-Admin.php

Braces +124 added lines, -89 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get a list of versions that are currently installed on the server.
@@ -45,8 +46,7 @@ 
 			$temp2 = $temp->getVersion();
 			$im_version = $temp2['versionString'];
 			$extension_version = 'Imagick ' . phpversion('Imagick');
-		}
-		else
+		} else
 		{
 			$im_version = MagickGetVersionString();
 			$extension_version = 'MagickWand ' . phpversion('MagickWand');
@@ -61,9 +61,9 @@ 
 	if (in_array('db_server', $checkFor))
 	{
 		db_extend();
-		if (!isset($db_connection) || $db_connection === false)
-			trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
-		else
+		if (!isset($db_connection) || $db_connection === false) {
+					trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
+		} else
 		{
 			$versions['db_engine'] = array('title' => sprintf($txt['support_versions_db_engine'], $smcFunc['db_title']), 'version' => '');
 			$versions['db_engine']['version'] = $smcFunc['db_get_engine']();
@@ -74,24 +74,31 @@ 
 	}
 
 	// If we're using memcache we need the server info.
-	if (empty($memcached) && function_exists('memcache_get') && isset($modSettings['cache_memcached']) && trim($modSettings['cache_memcached']) != '')
-		get_memcached_server();
+	if (empty($memcached) && function_exists('memcache_get') && isset($modSettings['cache_memcached']) && trim($modSettings['cache_memcached']) != '') {
+			get_memcached_server();
+	}
 
 	// Check to see if we have any accelerators installed...
-	if (in_array('phpa', $checkFor) && isset($_PHPA))
-		$versions['phpa'] = array('title' => 'ionCube PHP-Accelerator', 'version' => $_PHPA['VERSION']);
-	if (in_array('apc', $checkFor) && extension_loaded('apc'))
-		$versions['apc'] = array('title' => 'Alternative PHP Cache', 'version' => phpversion('apc'));
-	if (in_array('memcache', $checkFor) && function_exists('memcache_set'))
-		$versions['memcache'] = array('title' => 'Memcached', 'version' => empty($memcached) ? '???' : memcache_get_version($memcached));
-	if (in_array('xcache', $checkFor) && function_exists('xcache_set'))
-		$versions['xcache'] = array('title' => 'XCache', 'version' => XCACHE_VERSION);
+	if (in_array('phpa', $checkFor) && isset($_PHPA)) {
+			$versions['phpa'] = array('title' => 'ionCube PHP-Accelerator', 'version' => $_PHPA['VERSION']);
+	}
+	if (in_array('apc', $checkFor) && extension_loaded('apc')) {
+			$versions['apc'] = array('title' => 'Alternative PHP Cache', 'version' => phpversion('apc'));
+	}
+	if (in_array('memcache', $checkFor) && function_exists('memcache_set')) {
+			$versions['memcache'] = array('title' => 'Memcached', 'version' => empty($memcached) ? '???' : memcache_get_version($memcached));
+	}
+	if (in_array('xcache', $checkFor) && function_exists('xcache_set')) {
+			$versions['xcache'] = array('title' => 'XCache', 'version' => XCACHE_VERSION);
+	}
 
-	if (in_array('php', $checkFor))
-		$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION, 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	if (in_array('php', $checkFor)) {
+			$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION, 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	}
 
-	if (in_array('server', $checkFor))
-		$versions['server'] = array('title' => $txt['support_versions_server'], 'version' => $_SERVER['SERVER_SOFTWARE']);
+	if (in_array('server', $checkFor)) {
+			$versions['server'] = array('title' => $txt['support_versions_server'], 'version' => $_SERVER['SERVER_SOFTWARE']);
+	}
 
 	return $versions;
 }
@@ -131,11 +138,13 @@ 
 		fclose($fp);
 
 		// The comment looks rougly like... that.
-		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-			$version_info['file_versions']['SSI.php'] = $match[1];
+		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+					$version_info['file_versions']['SSI.php'] = $match[1];
+		}
 		// Not found!  This is bad.
-		else
-			$version_info['file_versions']['SSI.php'] = '??';
+		else {
+					$version_info['file_versions']['SSI.php'] = '??';
+		}
 	}
 
 	// Do the paid subscriptions handler?
@@ -146,11 +155,13 @@ 
 		fclose($fp);
 
 		// Found it?
-		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-			$version_info['file_versions']['subscriptions.php'] = $match[1];
+		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+					$version_info['file_versions']['subscriptions.php'] = $match[1];
+		}
 		// If we haven't how do we all get paid?
-		else
-			$version_info['file_versions']['subscriptions.php'] = '??';
+		else {
+					$version_info['file_versions']['subscriptions.php'] = '??';
+		}
 	}
 
 	// Load all the files in the Sources directory, except this file and the redirect.
@@ -165,11 +176,13 @@ 
 			fclose($fp);
 
 			// Look for the version comment in the file header.
-			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-				$version_info['file_versions'][$entry] = $match[1];
+			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+							$version_info['file_versions'][$entry] = $match[1];
+			}
 			// It wasn't found, but the file was... show a '??'.
-			else
-				$version_info['file_versions'][$entry] = '??';
+			else {
+							$version_info['file_versions'][$entry] = '??';
+			}
 		}
 	}
 	$sources_dir->close();
@@ -188,11 +201,13 @@ 
 				fclose($fp);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					$version_info['tasks_versions'][$entry] = $match[1];
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+									$version_info['tasks_versions'][$entry] = $match[1];
+				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-					$version_info['tasks_versions'][$entry] = '??';
+				else {
+									$version_info['tasks_versions'][$entry] = '??';
+				}
 			}
 		}
 		$tasks_dir->close();
@@ -200,8 +215,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']);
+	if ($settings['theme_id'] != 1) {
+			$directories += array('template_versions' => $settings['theme_dir']);
+	}
 
 	foreach ($directories as $type => $dirname)
 	{
@@ -216,11 +232,13 @@ 
 				fclose($fp);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					$version_info[$type][$entry] = $match[1];
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+									$version_info[$type][$entry] = $match[1];
+				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-					$version_info[$type][$entry] = '??';
+				else {
+									$version_info[$type][$entry] = '??';
+				}
 			}
 		}
 		$this_dir->close();
@@ -241,11 +259,13 @@ 
 			list ($name, $language) = explode('.', $entry);
 
 			// 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];
+			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];
+			}
 			// 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] = '??';
+			}
 		}
 	}
 	$this_dir->close();
@@ -260,8 +280,9 @@ 
 		ksort($version_info['tasks_versions']);
 
 		// For languages sort each language too.
-		foreach ($version_info['default_language_versions'] as $language => $dummy)
-			ksort($version_info['default_language_versions'][$language]);
+		foreach ($version_info['default_language_versions'] as $language => $dummy) {
+					ksort($version_info['default_language_versions'][$language]);
+		}
 	}
 	return $version_info;
 }
@@ -303,27 +324,31 @@ 
 	$settingsArray = trim(file_get_contents($boarddir . '/Settings.php'));
 
 	// Break it up based on \r or \n, and then clean out extra characters.
-	if (strpos($settingsArray, "\n") !== false)
-		$settingsArray = explode("\n", $settingsArray);
-	elseif (strpos($settingsArray, "\r") !== false)
-		$settingsArray = explode("\r", $settingsArray);
-	else
-		return;
+	if (strpos($settingsArray, "\n") !== false) {
+			$settingsArray = explode("\n", $settingsArray);
+	} elseif (strpos($settingsArray, "\r") !== false) {
+			$settingsArray = explode("\r", $settingsArray);
+	} else {
+			return;
+	}
 
 	// Presumably, the file has to have stuff in it for this function to be called :P.
-	if (count($settingsArray) < 10)
-		return;
+	if (count($settingsArray) < 10) {
+			return;
+	}
 
 	// remove any /r's that made there way in here
-	foreach ($settingsArray as $k => $dummy)
-		$settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n";
+	foreach ($settingsArray as $k => $dummy) {
+			$settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n";
+	}
 
 	// go line by line and see whats changing
 	for ($i = 0, $n = count($settingsArray); $i < $n; $i++)
 	{
 		// Don't trim or bother with it if it's not a variable.
-		if (substr($settingsArray[$i], 0, 1) != '$')
-			continue;
+		if (substr($settingsArray[$i], 0, 1) != '$') {
+					continue;
+		}
 
 		$settingsArray[$i] = trim($settingsArray[$i]) . "\n";
 
@@ -335,8 +360,7 @@ 
 			{
 				updateDbLastError($val);
 				unset($config_vars[$var]);
-			}
-			elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
+			} elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
 			{
 				$comment = strstr(substr($settingsArray[$i], strpos($settingsArray[$i], ';')), '#');
 				$settingsArray[$i] = '$' . $var . ' = ' . $val . ';' . ($comment == '' ? '' : "\t\t" . rtrim($comment)) . "\n";
@@ -347,34 +371,39 @@ 
 		}
 
 		// End of the file ... maybe
-		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>')
-			$end = $i;
+		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>') {
+					$end = $i;
+		}
 	}
 
 	// This should never happen, but apparently it is happening.
-	if (empty($end) || $end < 10)
-		$end = count($settingsArray) - 1;
+	if (empty($end) || $end < 10) {
+			$end = count($settingsArray) - 1;
+	}
 
 	// Still more variables to go?  Then lets add them at the end.
 	if (!empty($config_vars))
 	{
-		if (trim($settingsArray[$end]) == '?' . '>')
-			$settingsArray[$end++] = '';
-		else
-			$end++;
+		if (trim($settingsArray[$end]) == '?' . '>') {
+					$settingsArray[$end++] = '';
+		} else {
+					$end++;
+		}
 
 		// Add in any newly defined vars that were passed
-		foreach ($config_vars as $var => $val)
-			$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+		foreach ($config_vars as $var => $val) {
+					$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+		}
 
 		$settingsArray[$end] = '?' . '>';
+	} else {
+			$settingsArray[$end] = trim($settingsArray[$end]);
 	}
-	else
-		$settingsArray[$end] = trim($settingsArray[$end]);
 
 	// Sanity error checking: the file needs to be at least 12 lines.
-	if (count($settingsArray) < 12)
-		return;
+	if (count($settingsArray) < 12) {
+			return;
+	}
 
 	// Try to avoid a few pitfalls:
 	//  - like a possible race condition,
@@ -382,8 +411,9 @@ 
 	//
 	// Check before you act: if cache is enabled, we can do a simple write test
 	// to validate that we even write things on this filesystem.
-	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
-		$cachedir = $boarddir . '/cache';
+	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
+			$cachedir = $boarddir . '/cache';
+	}
 
 	$test_fp = @fopen($cachedir . '/settings_update.tmp', "w+");
 	if ($test_fp)
@@ -419,16 +449,18 @@ 
 			// Well this is not good at all, lets see if we can save this
 			$context['settings_message'] = 'settings_error';
 
-			if (file_exists($boarddir . '/Settings_bak.php'))
-				@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
+			if (file_exists($boarddir . '/Settings_bak.php')) {
+							@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
+			}
 		}
 	}
 
 	// Even though on normal installations the filemtime should prevent this being used by the installer incorrectly
 	// it seems that there are times it might not. So let's MAKE it dump the cache.
-	if (function_exists('opcache_invalidate'))
-		opcache_invalidate($boarddir . '/Settings.php', true);
-}
+	if (function_exists('opcache_invalidate')) {
+			opcache_invalidate($boarddir . '/Settings.php', true);
+	}
+	}
 
 /**
  * Saves the time of the last db error for the error log
@@ -454,8 +486,9 @@ 
 	global $options, $context, $smcFunc, $settings, $user_info;
 
 	// This must exist!
-	if (!isset($context['admin_preferences']))
-		return false;
+	if (!isset($context['admin_preferences'])) {
+			return false;
+	}
 
 	// This is what we'll be saving.
 	$options['admin_preferences'] = json_encode($context['admin_preferences']);
@@ -519,8 +552,9 @@ 
 	$emails_sent = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($prefs[$row['id_member']]['announcements']))
-			continue;
+		if (empty($prefs[$row['id_member']]['announcements'])) {
+					continue;
+		}
 
 		// Stick their particulars in the replacement data.
 		$replacements['IDMEMBER'] = $row['id_member'];
@@ -539,11 +573,12 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Any additional users we must email this to?
-	if (!empty($additional_recipients))
-		foreach ($additional_recipients as $recipient)
+	if (!empty($additional_recipients)) {
+			foreach ($additional_recipients as $recipient)
 		{
 			if (in_array($recipient['email'], $emails_sent))
 				continue;
+	}
 
 			$replacements['IDMEMBER'] = $recipient['id'];
 			$replacements['REALNAME'] = $recipient['name'];

Sources/Topic.php

Braces +31 added lines, -21 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Locks a topic... either by way of a moderator or the topic starter.
@@ -32,8 +33,9 @@ 
 	global $topic, $user_info, $sourcedir, $board, $smcFunc;
 
 	// Just quit if there's no topic to lock.
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -55,23 +57,28 @@ 
 
 	// Can you lock topics here, mister?
 	$user_lock = !allowedTo('lock_any');
-	if ($user_lock && $starter == $user_info['id'])
-		isAllowedTo('lock_own');
-	else
-		isAllowedTo('lock_any');
+	if ($user_lock && $starter == $user_info['id']) {
+			isAllowedTo('lock_own');
+	} else {
+			isAllowedTo('lock_any');
+	}
 
 	// Locking with high privileges.
-	if ($locked == '0' && !$user_lock)
-		$locked = '1';
+	if ($locked == '0' && !$user_lock) {
+			$locked = '1';
+	}
 	// Locking with low privileges.
-	elseif ($locked == '0')
-		$locked = '2';
+	elseif ($locked == '0') {
+			$locked = '2';
+	}
 	// Unlocking - make sure you don't unlock what you can't.
-	elseif ($locked == '2' || ($locked == '1' && !$user_lock))
-		$locked = '0';
+	elseif ($locked == '2' || ($locked == '1' && !$user_lock)) {
+			$locked = '0';
+	}
 	// You cannot unlock this!
-	else
-		fatal_lang_error('locked_by_admin', 'user');
+	else {
+			fatal_lang_error('locked_by_admin', 'user');
+	}
 
 	// Actually lock the topic in the database with the new value.
 	$smcFunc['db_query']('', '
@@ -85,8 +92,9 @@ 
 	);
 
 	// If they are allowed a "moderator" permission, log it in the moderator log.
-	if (!$user_lock)
-		logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	if (!$user_lock) {
+			logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	}
 	// Notify people that this topic has been locked?
 	sendNotifications($topic, empty($locked) ? 'unlock' : 'lock');
 
@@ -112,8 +120,9 @@ 
 	isAllowedTo('make_sticky');
 
 	// You can't sticky a board or something!
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -147,8 +156,9 @@ 
 	// Log this sticky action - always a moderator thing.
 	logAction(empty($is_sticky) ? 'sticky' : 'unsticky', array('topic' => $topic, 'board' => $board));
 	// Notify people that this topic has been stickied?
-	if (empty($is_sticky))
-		sendNotifications($topic, 'sticky');
+	if (empty($is_sticky)) {
+			sendNotifications($topic, 'sticky');
+	}
 
 	// Take them back to the now stickied topic.
 	redirectexit('topic=' . $topic . '.' . $_REQUEST['start'] . ';moderate');

Sources/Subs-BoardIndex.php

Braces +60 added lines, -47 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Fetches a list of boards and (optional) categories including
@@ -37,11 +38,12 @@ 
 	require_once($sourcedir . '/Subs-Boards.php');
 
 	// For performance, track the latest post while going through the boards.
-	if (!empty($boardIndexOptions['set_latest_post']))
-		$latest_post = array(
+	if (!empty($boardIndexOptions['set_latest_post'])) {
+			$latest_post = array(
 			'timestamp' => 0,
 			'ref' => 0,
 		);
+	}
 
 	// Find all boards and categories, as well as related information.  This will be sorted by the natural order of boards and categories, which we control.
 	$result_boards = $smcFunc['db_query']('boardindex_fetch_boards', '
@@ -74,10 +76,11 @@ 
 	);
 
 	// Start with an empty array.
-	if ($boardIndexOptions['include_categories'])
-		$categories = array();
-	else
-		$this_category = array();
+	if ($boardIndexOptions['include_categories']) {
+			$categories = array();
+	} else {
+			$this_category = array();
+	}
 	$boards = array();
 
 	// Run through the categories and boards (or only boards)....
@@ -88,8 +91,9 @@ 
 		$row_board['is_read'] = !empty($row_board['is_read']) || $ignoreThisBoard ? '1' : '0';
 
 		// Add parent boards to the $boards list later used to fetch moderators
-		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'])
-			$boards[] = $row_board['id_board'];
+		if ($row_board['id_parent'] == $boardIndexOptions['parent_id']) {
+					$boards[] = $row_board['id_board'];
+		}
 
 		if ($boardIndexOptions['include_categories'])
 		{
@@ -111,8 +115,9 @@ 
 			}
 
 			// If this board has new posts in it (and isn't the recycle bin!) then the category is new.
-			if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board'])
-				$categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']) && $row_board['poster_name'] != '';
+			if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board']) {
+							$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.
 			$categories[$row_board['id_cat']]['show_unread'] = !empty($categories[$row_board['id_cat']]['show_unread']) ? 1 : !$row_board['is_redirect'];
@@ -160,14 +165,12 @@ 
 				{
 					$this_category[$row_board['id_board']]['board_class'] = 'redirect';
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['redirect_board'];
-				}
-				elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest'])
+				} elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest'])
 				{
 					// If we're showing to guests, we want to give them the idea that something interesting is going on!
 					$this_category[$row_board['id_board']]['board_class'] = 'on';
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['new_posts'];
-				}
-				else
+				} else
 				{
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['old_posts'];
 				}
@@ -218,14 +221,16 @@ 
 		// Child of a child... just add it on...
 		elseif (!empty($boardIndexOptions['countChildPosts']))
 		{
-			if (!isset($parent_map))
-				$parent_map = array();
+			if (!isset($parent_map)) {
+							$parent_map = array();
+			}
 
-			if (!isset($parent_map[$row_board['id_parent']]))
-				foreach ($this_category as $id => $board)
+			if (!isset($parent_map[$row_board['id_parent']])) {
+							foreach ($this_category as $id => $board)
 				{
 					if (!isset($board['children'][$row_board['id_parent']]))
 						continue;
+			}
 
 					$parent_map[$row_board['id_parent']] = array(&$this_category[$id], &$this_category[$id]['children'][$row_board['id_parent']]);
 					$parent_map[$row_board['id_board']] = array(&$this_category[$id], &$this_category[$id]['children'][$row_board['id_parent']]);
@@ -246,8 +251,9 @@ 
 			continue;
 		}
 		// Found a child of a child - skip.
-		else
-			continue;
+		else {
+					continue;
+		}
 
 		// Prepare the subject, and make sure it's not too long.
 		censorText($row_board['subject']);
@@ -268,12 +274,13 @@ 
 			'topic' => $row_board['id_topic']
 		);
 
-		if (!empty($settings['avatars_on_boardIndex']))
-			$this_last_post['member']['avatar'] = set_avatar_data(array(
+		if (!empty($settings['avatars_on_boardIndex'])) {
+					$this_last_post['member']['avatar'] = set_avatar_data(array(
 				'avatar' => $row_board['avatar'],
 				'email' => $row_board['email_address'],
 				'filename' => !empty($row['member_filename']) ? $row_board['member_filename'] : '',
 			));
+		}
 
 		// Provide the href and link.
 		if ($row_board['subject'] != '')
@@ -285,8 +292,7 @@ 
 			link, href, subject, start (where they should go for the first unread post.),
 			and member. (which has id, name, link, href, username in it.) */
 			$this_last_post['last_post_message'] = sprintf($txt['last_post_message'], $this_last_post['member']['link'], $this_last_post['link'], $this_last_post['time']);
-		}
-		else
+		} else
 		{
 			$this_last_post['href'] = '';
 			$this_last_post['link'] = $txt['not_applicable'];
@@ -294,8 +300,9 @@ 
 		}
 
 		// Set the last post in the parent board.
-		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'] || ($isChild && !empty($row_board['poster_time']) && $this_category[$row_board['id_parent']]['last_post']['timestamp'] < forum_time(true, $row_board['poster_time'])))
-			$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'] || ($isChild && !empty($row_board['poster_time']) && $this_category[$row_board['id_parent']]['last_post']['timestamp'] < forum_time(true, $row_board['poster_time']))) {
+					$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+		}
 		// Just in the child...?
 		if ($isChild)
 		{
@@ -305,15 +312,17 @@ 
 			$this_category[$row_board['id_parent']]['children'][$row_board['id_board']]['new'] &= $row_board['poster_name'] != '';
 		}
 		// No last post for this board?  It's not new then, is it..?
-		elseif ($row_board['poster_name'] == '')
-			$this_category[$row_board['id_board']]['new'] = false;
+		elseif ($row_board['poster_name'] == '') {
+					$this_category[$row_board['id_board']]['new'] = false;
+		}
 
 		// Determine a global most recent topic.
-		if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard)
-			$latest_post = array(
+		if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard) {
+					$latest_post = array(
 				'timestamp' => $row_board['poster_time'],
 				'ref' => &$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'],
 			);
+		}
 	}
 	$smcFunc['db_free_result']($result_boards);
 
@@ -330,8 +339,9 @@ 
 				if (!empty($moderators[$board['id']]))
 				{
 					$categories[$k]['boards'][$j]['moderators'] = $moderators[$board['id']];
-					foreach ($moderators[$board['id']] as $moderator)
-						$categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link'];
+					foreach ($moderators[$board['id']] as $moderator) {
+											$categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link'];
+					}
 				}
 				if (!empty($groups[$board['id']]))
 				{
@@ -344,16 +354,16 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		foreach ($this_category as $k => $board)
 		{
 			if (!empty($moderators[$board['id']]))
 			{
 				$this_category[$k]['moderators'] = $moderators[$board['id']];
-				foreach ($moderators[$board['id']] as $moderator)
-					$this_category[$k]['link_moderators'][] = $moderator['link'];
+				foreach ($moderators[$board['id']] as $moderator) {
+									$this_category[$k]['link_moderators'][] = $moderator['link'];
+				}
 			}
 			if (!empty($groups[$board['id']]))
 			{
@@ -367,20 +377,23 @@ 
 		}
 	}
 
-	if ($boardIndexOptions['include_categories'])
-		sortCategories($categories);
-	else
-		sortBoards($this_category);
+	if ($boardIndexOptions['include_categories']) {
+			sortCategories($categories);
+	} else {
+			sortBoards($this_category);
+	}
 
 	// By now we should know the most recent post...if we wanna know it that is.
-	if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref']))
-		$context['latest_post'] = $latest_post['ref'];
+	if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref'])) {
+			$context['latest_post'] = $latest_post['ref'];
+	}
 
 	// I can't remember why but trying to make a ternary to get this all in one line is actually a Very Bad Idea.
-	if ($boardIndexOptions['include_categories'])
-		call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories));
-	else
-		call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category));
+	if ($boardIndexOptions['include_categories']) {
+			call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories));
+	} else {
+			call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category));
+	}
 
 	return $boardIndexOptions['include_categories'] ? $categories : $this_category;
 }

Sources/tasks/GroupAct-Notify.php

Braces +6 added lines, -4 removed lines

@@ -132,8 +132,9 @@ 
 						'GROUPNAME' => $user['group_name'],
 					);
 
-					if (!empty($custom_reason))
-						$replacements['REASON'] = $custom_reason;
+					if (!empty($custom_reason)) {
+											$replacements['REASON'] = $custom_reason;
+					}
 
 					$emaildata = loadEmailTemplate($email_template_name, $replacements, $user['language']);
 
@@ -142,8 +143,8 @@ 
 			}
 
 			// Insert the alerts if any
-			if (!empty($alert_rows))
-				$smcFunc['db_insert']('',
+			if (!empty($alert_rows)) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}user_alerts',
 					array(
 						'alert_time' => 'int', 'id_member' => 'int', 'content_type' => 'string',
@@ -152,6 +153,7 @@ 
 					$alert_rows,
 					array()
 				);
+			}
 		}
 
 		return true;

Sources/tasks/EventNew-Notify.php

Braces +11 added lines, -8 removed lines

@@ -32,8 +32,9 @@ 
 		$members = membersAllowedTo('calendar_view');
 
 		// Don't alert the event creator
-		if (!empty($this->_details['sender_id']))
-			$members = array_diff($members, array($this->_details['sender_id']));
+		if (!empty($this->_details['sender_id'])) {
+					$members = array_diff($members, array($this->_details['sender_id']));
+		}
 
 		// Having successfully figured this out, now let's get the preferences of everyone.
 		require_once($sourcedir . '/Subs-Notify.php');
@@ -44,10 +45,11 @@ 
 		if (!empty($this->_details['sender_id']) && empty($this->_details['sender_name']))
 		{
 			loadMemberData($this->_details['sender_id'], 'minimal');
-			if (!empty($user_profile[$this->_details['sender_id']]))
-				$this->_details['sender_name'] = $user_profile[$this->_details['sender_id']]['real_name'];
-			else
-				$this->_details['sender_id'] = 0;
+			if (!empty($user_profile[$this->_details['sender_id']])) {
+							$this->_details['sender_name'] = $user_profile[$this->_details['sender_id']]['real_name'];
+			} else {
+							$this->_details['sender_id'] = 0;
+			}
 		}
 
 		// So now we find out who wants what.
@@ -59,9 +61,10 @@ 
 
 		foreach ($prefs as $member => $pref_option)
 		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['event_new'] & $bitvalue)
+			foreach ($alert_bits as $type => $bitvalue) {
+							if ($pref_option['event_new'] & $bitvalue)
 					$notifies[$type][] = $member;
+			}
 		}
 
 		// Firstly, anyone who wants alerts.

Sources/tasks/MsgReportReply-Notify.php

Braces +21 added lines, -14 removed lines

@@ -40,8 +40,9 @@ 
 				'last_comment' => $this->_details['comment_id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$possible_members[] = $row[0];
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$possible_members[] = $row[0];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Presumably, there are some people?
@@ -50,8 +51,9 @@ 
 			$possible_members = array_flip(array_flip($possible_members));
 			$possible_members = array_diff($possible_members, array($this->_details['sender_id']));
 		}
-		if (empty($possible_members))
-			return true;
+		if (empty($possible_members)) {
+					return true;
+		}
 
 		// We need to know who can moderate this board - and therefore who can see this report.
 		// First up, people who have moderate_board in the board this topic was in.
@@ -67,8 +69,9 @@ 
 				'current_board' => $this->_details['board_id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Thirdly, anyone assigned to be a moderator of this group as a group->board moderator.
@@ -85,8 +88,9 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// So now we have two lists: the people who replied to a report in the past,
@@ -108,8 +112,9 @@ 
 		{
 			foreach ($alert_bits as $type => $bitvalue)
 			{
-				if ($pref_option['msg_report_reply'] & $bitvalue)
-					$notifies[$type][] = $member;
+				if ($pref_option['msg_report_reply'] & $bitvalue) {
+									$notifies[$type][] = $member;
+				}
 			}
 		}
 
@@ -170,8 +175,9 @@ 
 			);
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($row['lngfile']))
-					$row['lngfile'] = $language;
+				if (empty($row['lngfile'])) {
+									$row['lngfile'] = $language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -203,8 +209,9 @@ 
 				$emaildata = loadEmailTemplate('reply_to_moderator', $replacements, empty($modSettings['userLanguage']) ? $language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
-					sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'rptrpy' . $this->_details['comment_id'], $emaildata['is_html'], 3);
+				foreach ($recipients as $id_member => $email_address) {
+									sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'rptrpy' . $this->_details['comment_id'], $emaildata['is_html'], 3);
+				}
 			}
 		}
 

Sources/tasks/Birthday-Notify.php

Braces +6 added lines, -4 removed lines

@@ -51,8 +51,9 @@ 
 		$birthdays = array();
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
-			if (!isset($birthdays[$row['lngfile']]))
-				$birthdays[$row['lngfile']] = array();
+			if (!isset($birthdays[$row['lngfile']])) {
+							$birthdays[$row['lngfile']] = array();
+			}
 			$birthdays[$row['lngfile']][$row['id_member']] = array(
 				'name' => $row['real_name'],
 				'email' => $row['email_address']
@@ -117,8 +118,8 @@ 
 			AddMailQueue(true);
 
 			// Insert the alerts if any
-			if (!empty($alert_rows))
-				$smcFunc['db_insert']('',
+			if (!empty($alert_rows)) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}user_alerts',
 					array(
 						'alert_time' => 'int', 'id_member' => 'int', 'content_type' => 'string',
@@ -127,6 +128,7 @@ 
 					$alert_rows,
 					array()
 				);
+			}
 		}
 
 		return true;

Sources/tasks/MemberReport-Notify.php

Braces +9 added lines, -6 removed lines

@@ -46,9 +46,10 @@ 
 
 		foreach ($prefs as $member => $pref_option)
 		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['member_report'] & $bitvalue)
+			foreach ($alert_bits as $type => $bitvalue) {
+							if ($pref_option['member_report'] & $bitvalue)
 					$notifies[$type][] = $member;
+			}
 		}
 
 		// Firstly, anyone who wants alerts.
@@ -109,8 +110,9 @@ 
 			);
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($row['lngfile']))
-					$row['lngfile'] = $language;
+				if (empty($row['lngfile'])) {
+									$row['lngfile'] = $language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -129,8 +131,9 @@ 
 				$emaildata = loadEmailTemplate('report_member_profile', $replacements, empty($modSettings['userLanguage']) ? $language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
-					sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'ureport' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				foreach ($recipients as $id_member => $email_address) {
+									sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'ureport' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				}
 			}
 		}