SimpleMachines / SMF2.1

Sources/ManagePosts.php

Indentation -1 removed lines

@@ -273,7 +273,6 @@
  * Modify any setting related to topics.
  * Requires the admin_forum permission.
  * Accessed from ?action=admin;area=postsettings;sa=topics.
-
  * @param bool $return_config Whether or not to return the config_vars array (used for admin search)
  * @return void|array Returns nothing or returns $config_vars if $return_config is true
  * @uses Admin template, edit_topic_settings sub-template.

Braces +39 added lines, -29 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main entrance point for the 'Posts and topics' screen.
@@ -98,23 +99,23 @@ 
 		{
 			$_POST['censortext'] = explode("\n", strtr($_POST['censortext'], array("\r" => '')));
 
-			foreach ($_POST['censortext'] as $c)
-				list ($censored_vulgar[], $censored_proper[]) = array_pad(explode('=', trim($c)), 2, '');
-		}
-		elseif (isset($_POST['censor_vulgar'], $_POST['censor_proper']))
+			foreach ($_POST['censortext'] as $c) {
+							list ($censored_vulgar[], $censored_proper[]) = array_pad(explode('=', trim($c)), 2, '');
+			}
+		} elseif (isset($_POST['censor_vulgar'], $_POST['censor_proper']))
 		{
 			if (is_array($_POST['censor_vulgar']))
 			{
 				foreach ($_POST['censor_vulgar'] as $i => $value)
 				{
-					if (trim(strtr($value, '*', ' ')) == '')
-						unset($_POST['censor_vulgar'][$i], $_POST['censor_proper'][$i]);
+					if (trim(strtr($value, '*', ' ')) == '') {
+											unset($_POST['censor_vulgar'][$i], $_POST['censor_proper'][$i]);
+					}
 				}
 
 				$censored_vulgar = $_POST['censor_vulgar'];
 				$censored_proper = $_POST['censor_proper'];
-			}
-			else
+			} else
 			{
 				$censored_vulgar = explode("\n", strtr($_POST['censor_vulgar'], array("\r" => '')));
 				$censored_proper = explode("\n", strtr($_POST['censor_proper'], array("\r" => '')));
@@ -151,12 +152,14 @@ 
 	$context['censored_words'] = array();
 	for ($i = 0, $n = count($censor_vulgar); $i < $n; $i++)
 	{
-		if (empty($censor_vulgar[$i]))
-			continue;
+		if (empty($censor_vulgar[$i])) {
+					continue;
+		}
 
 		// Skip it, it's either spaces or stars only.
-		if (trim(strtr($censor_vulgar[$i], '*', ' ')) == '')
-			continue;
+		if (trim(strtr($censor_vulgar[$i], '*', ' ')) == '') {
+					continue;
+		}
 
 		$context['censored_words'][$smcFunc['htmlspecialchars'](trim($censor_vulgar[$i]))] = isset($censor_proper[$i]) ? $smcFunc['htmlspecialchars']($censor_proper[$i]) : '';
 	}
@@ -187,10 +190,11 @@ 
 
 	// Make an inline conditional a little shorter...
 	$can_spell_check = false;
-	if (function_exists('pspell_new'))
-		$can_spell_check = true;
-	elseif (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv')))
-		$can_spell_check = true;
+	if (function_exists('pspell_new')) {
+			$can_spell_check = true;
+	} elseif (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv'))) {
+			$can_spell_check = true;
+	}
 
 	// All the settings...
 	$config_vars = array(
@@ -221,8 +225,9 @@ 
 
 	call_integration_hook('integrate_modify_post_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// We'll want this for our easy save.
 	require_once($sourcedir . '/ManageServer.php');
@@ -242,17 +247,20 @@ 
 			db_extend('packages');
 
 			$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-			foreach ($colData as $column)
-				if ($column['name'] == 'body')
+			foreach ($colData as $column) {
+							if ($column['name'] == 'body')
 					$body_type = $column['type'];
+			}
 
-			if (isset($body_type) && ($_POST['max_messageLength'] > 65535 || $_POST['max_messageLength'] == 0) && $body_type == 'text')
-				fatal_lang_error('convert_to_mediumtext', false, array($scripturl . '?action=admin;area=maintain;sa=database'));
+			if (isset($body_type) && ($_POST['max_messageLength'] > 65535 || $_POST['max_messageLength'] == 0) && $body_type == 'text') {
+							fatal_lang_error('convert_to_mediumtext', false, array($scripturl . '?action=admin;area=maintain;sa=database'));
+			}
 		}
 
 		// If we're changing the post preview length let's check its valid
-		if (!empty($_POST['preview_characters']))
-			$_POST['preview_characters'] = (int) min(max(0, $_POST['preview_characters']), 512);
+		if (!empty($_POST['preview_characters'])) {
+					$_POST['preview_characters'] = (int) min(max(0, $_POST['preview_characters']), 512);
+		}
 
 		call_integration_hook('integrate_save_post_settings');
 
@@ -313,8 +321,9 @@ 
 
 	call_integration_hook('integrate_modify_topic_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template ready.
 	require_once($sourcedir . '/ManageServer.php');
@@ -367,8 +376,9 @@ 
 		array('int', 'drafts_autosave_frequency', 'postinput' => $txt['manageposts_seconds'], 'subtext' => $txt['drafts_autosave_frequency_subnote']),
 	);
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template ready.
 	require_once($sourcedir . '/ManageServer.php');

Sources/DbSearch-mysql.php

Braces +13 added lines, -10 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  *  Add the file functions to the $smcFunc array.
@@ -23,14 +24,15 @@ 
 {
 	global $smcFunc;
 
-	if (!isset($smcFunc['db_search_query']) || $smcFunc['db_search_query'] != 'smf_db_query')
-		$smcFunc += array(
+	if (!isset($smcFunc['db_search_query']) || $smcFunc['db_search_query'] != 'smf_db_query') {
+			$smcFunc += array(
 			'db_search_query' => 'smf_db_query',
 			'db_search_support' => 'smf_db_search_support',
 			'db_create_word_search' => 'smf_db_create_word_search',
 			'db_support_ignore' => true,
 		);
-}
+	}
+	}
 
 /**
  * This function will tell you whether this database type supports this search type.
@@ -54,12 +56,13 @@ 
 {
 	global $smcFunc;
 
-	if ($size == 'small')
-		$size = 'smallint(5)';
-	elseif ($size == 'medium')
-		$size = 'mediumint(8)';
-	else
-		$size = 'int(10)';
+	if ($size == 'small') {
+			$size = 'smallint(5)';
+	} elseif ($size == 'medium') {
+			$size = 'mediumint(8)';
+	} else {
+			$size = 'int(10)';
+	}
 
 	$smcFunc['db_query']('', '
 		CREATE TABLE {db_prefix}log_search_words (

Sources/Notify.php

Braces +23 added lines, -20 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Turn off/on notification for a particular board.
@@ -34,8 +35,9 @@ 
 	is_not_guest();
 
 	// You have to specify a board to turn notifications on!
-	if (empty($board))
-		fatal_lang_error('no_board', false);
+	if (empty($board)) {
+			fatal_lang_error('no_board', false);
+	}
 
 	// No subaction: find out what to do.
 	if (isset($_GET['mode']))
@@ -48,16 +50,16 @@ 
 		require_once($sourcedir . '/Subs-Notify.php');
 		setNotifyPrefs($user_info['id'], array('board_notify_' . $board => $alertPref));
 
-		if ($mode > 1)
-			// Turn notification on.  (note this just blows smoke if it's already on.)
+		if ($mode > 1) {
+					// Turn notification on.  (note this just blows smoke if it's already on.)
 			$smcFunc['db_insert']('ignore',
 				'{db_prefix}log_notify',
 				array('id_member' => 'int', 'id_board' => 'int'),
 				array($user_info['id'], $board),
 				array('id_member', 'id_board')
 			);
-		else
-			$smcFunc['db_query']('', '
+		} else {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}log_notify
 				WHERE id_member = {int:current_member}
 				AND id_board = {int:current_board}',
@@ -66,6 +68,7 @@ 
 					'current_member' => $user_info['id'],
 				)
 			);
+		}
 
 	}
 
@@ -81,10 +84,10 @@ 
 			),
 		);
 		$context['sub_template'] = 'generic_xml';
+	} else {
+			redirectexit('board=' . $board . '.' . $_REQUEST['start']);
+	}
 	}
-	else
-		redirectexit('board=' . $board . '.' . $_REQUEST['start']);
-}
 
 /**
  * Turn off/on unread replies subscription for a topic as well as sets individual topic's alert preferences
@@ -108,8 +111,9 @@ 
 			$mode = (int) $_GET['mode'];
 			$alertPref = $mode <= 1 ? 0 : ($mode == 2 ? 1 : 3);
 
-			if (empty($mode))
-				$mode = 1;
+			if (empty($mode)) {
+							$mode = 1;
+			}
 
 			$request = $smcFunc['db_query']('', '
 				SELECT id_member, id_topic, id_msg, unwatched
@@ -132,8 +136,7 @@ 
 					'id_msg' => 0,
 					'unwatched' => empty($mode) ? 1 : 0,
 				);
-			}
-			else
+			} else
 			{
 				$insert = false;
 				$log['unwatched'] = empty($mode) ? 1 : 0;
@@ -160,9 +163,8 @@ 
 					array($user_info['id'], $log['id_topic']),
 					array('id_member', 'id_board')
 				);
-			}
-			else
-				$smcFunc['db_query']('', '
+			} else {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}log_notify
 					WHERE id_topic = {int:topic}
 						AND id_member = {int:member}',
@@ -170,6 +172,7 @@ 
 						'topic' => $log['id_topic'],
 						'member' => $user_info['id'],
 					));
+			}
 
 		}
 	}
@@ -186,9 +189,9 @@ 
 			),
 		);
 		$context['sub_template'] = 'generic_xml';
+	} else {
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	}
 	}
-	else
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
-}
 
 ?>
\ No newline at end of file

Sources/Attachments.php

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
 		// Just send a generic message.
 		else
 			$this->setResponse(array(
-				'text' => $this->_sa == 'add' ? 'attach_error_title' :   'attached_file_deleted_error',
+				'text' => $this->_sa == 'add' ? 'attach_error_title' : 'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
@@ -404,7 +404,7 @@ 
 			// Gotta urlencode the filename.
 			if ($this->_attachResults)
 				foreach ($this->_attachResults as $k => $v)
-					$this->_attachResults[$k]['name'] =  urlencode($this->_attachResults[$k]['name']);
+					$this->_attachResults[$k]['name'] = urlencode($this->_attachResults[$k]['name']);
 
 			$this->_response = array(
 				'files' => $this->_attachResults ? $this->_attachResults : false,
@@ -431,7 +431,7 @@ 
 			ob_start();
 
 		// Set the header.
-		header('Content-Type: application/json; charset='. $context['character_set'] .'');
+		header('Content-Type: application/json; charset=' . $context['character_set'] . '');
 
 		echo json_encode($this->_response ? $this->_response : array());
 

Braces +102 added lines, -75 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class Attachments
 {
@@ -70,16 +71,18 @@ 
 
 		$this->_sa = !empty($_REQUEST['sa']) ? $smcFunc['htmlspecialchars']($smcFunc['htmltrim']($_REQUEST['sa'])) : false;
 
-		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions))
-			$this->{$this->_sa}();
+		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions)) {
+					$this->{$this->_sa}();
+		}
 
 		// Just send a generic message.
-		else
-			$this->setResponse(array(
+		else {
+					$this->setResponse(array(
 				'text' => $this->_sa == 'add' ? 'attach_error_title' :   'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Back to the future, oh, to the browser!
 		$this->sendResponse();
@@ -95,12 +98,13 @@ 
 		$attachID = !empty($_REQUEST['attach']) && is_numeric($_REQUEST['attach']) ? (int) $_REQUEST['attach'] : 0;
 
 		// Need something to work with.
-		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID])))
-			return $this->setResponse(array(
+		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID]))) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Lets pass some params and see what happens :P
 		$affectedMessage = removeAttachments(array('id_attach' => $attachID), '', true, true);
@@ -119,19 +123,21 @@ 
 	public function add()
 	{
 		// You gotta be able to post attachments.
-		if (!$this->_canPostAttachment)
-			return $this->setResponse(array(
+		if (!$this->_canPostAttachment) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_cannot',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Process them at once!
 		$this->processAttachments();
 
 		// The attachments was created and moved the the right folder, time to update the DB.
-		if (!empty($_SESSION['temp_attachments']))
-			$this->createAtttach();
+		if (!empty($_SESSION['temp_attachments'])) {
+					$this->createAtttach();
+		}
 
 		// Set the response.
 		$this->setResponse();
@@ -144,8 +150,9 @@ 
 	{
 		global $context, $modSettings, $smcFunc, $user_info, $txt;
 
-		if (!isset($_FILES['attachment']['name']))
-			$_FILES['attachment']['tmp_name'] = array();
+		if (!isset($_FILES['attachment']['name'])) {
+					$_FILES['attachment']['tmp_name'] = array();
+		}
 
 		// If there are attachments, calculate the total size and how many.
 		$context['attachments']['total_size'] = 0;
@@ -155,25 +162,30 @@ 
 		if (isset($_REQUEST['msg']))
 		{
 			$context['attachments']['quantity'] = count($context['current_attachments']);
-			foreach ($context['current_attachments'] as $attachment)
-				$context['attachments']['total_size'] += $attachment['size'];
+			foreach ($context['current_attachments'] as $attachment) {
+							$context['attachments']['total_size'] += $attachment['size'];
+			}
 		}
 
 		// A bit of house keeping first.
-		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1)
-			unset($_SESSION['temp_attachments']);
+		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1) {
+					unset($_SESSION['temp_attachments']);
+		}
 
 		// Our infamous SESSION var, we are gonna have soo much fun with it!
-		if (!isset($_SESSION['temp_attachments']))
-			$_SESSION['temp_attachments'] = array();
+		if (!isset($_SESSION['temp_attachments'])) {
+					$_SESSION['temp_attachments'] = array();
+		}
 
 		// Make sure we're uploading to the right place.
-		if (!empty($modSettings['automanage_attachments']))
-			automanage_attachments_check_directory();
+		if (!empty($modSettings['automanage_attachments'])) {
+					automanage_attachments_check_directory();
+		}
 
 		// Is the attachments folder actually there?
-		if (!empty($context['dir_creation_error']))
-			$this->_generalErrors[] = $context['dir_creation_error'];
+		if (!empty($context['dir_creation_error'])) {
+					$this->_generalErrors[] = $context['dir_creation_error'];
+		}
 
 		// The current attach folder ha some issues...
 		elseif (!is_dir($this->_attchDir))
@@ -198,13 +210,12 @@ 
 			);
 			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-
-		else
-			$context['attachments'] = array(
+		} else {
+					$context['attachments'] = array(
 				'quantity' => 0,
 				'total_size' => 0,
 			);
+		}
 
 		// Check for other general errors here.
 
@@ -212,9 +223,10 @@ 
 		if (!empty($this->_generalErrors))
 		{
 			// And delete the files 'cos they ain't going nowhere.
-			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+							if (file_exists($_FILES['attachment']['tmp_name'][$n]))
 					unlink($_FILES['attachment']['tmp_name'][$n]);
+			}
 
 			$_FILES['attachment']['tmp_name'] = array();
 
@@ -225,26 +237,29 @@ 
 		// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
 		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 		{
-			if ($_FILES['attachment']['name'][$n] == '')
-				continue;
+			if ($_FILES['attachment']['name'][$n] == '') {
+							continue;
+			}
 
 			// First, let's first check for PHP upload errors.
 			$errors = array();
 			if (!empty($_FILES['attachment']['error'][$n]))
 			{
-				if ($_FILES['attachment']['error'][$n] == 2)
-					$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
-
-				else
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				if ($_FILES['attachment']['error'][$n] == 2) {
+									$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+				} else {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				}
 
 				// Log this one, because...
-				if ($_FILES['attachment']['error'][$n] == 6)
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				if ($_FILES['attachment']['error'][$n] == 6) {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				}
 
 				// Weird, no errors were cached, still fill out a generic one.
-				if (empty($errors))
-					$errors[] = 'attach_php_error';
+				if (empty($errors)) {
+									$errors[] = 'attach_php_error';
+				}
 			}
 
 			// Try to move and rename the file before doing any more checks on it.
@@ -256,8 +271,9 @@ 
 			{
 				// The reported MIME type of the attachment might not be reliable.
 				// Fortunately, PHP 5.3+ lets us easily verify the real MIME type.
-				if (function_exists('mime_content_type'))
-					$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+				if (function_exists('mime_content_type')) {
+									$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+				}
 
 				$_SESSION['temp_attachments'][$attachID] = array(
 					'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])),
@@ -269,16 +285,18 @@ 
 				);
 
 				// Move the file to the attachments folder with a temp name for now.
-				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-					smf_chmod($destName, 0644);
+				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
+									smf_chmod($destName, 0644);
+				}
 
 				// This is madness!!
 				else
 				{
 					// File couldn't be moved.
 					$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
-					if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-						unlink($_FILES['attachment']['tmp_name'][$n]);
+					if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+											unlink($_FILES['attachment']['tmp_name'][$n]);
+					}
 				}
 			}
 
@@ -291,13 +309,15 @@ 
 					'errors' => $errors,
 				);
 
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 
 			// If there's no errors to this point. We still do need to apply some additional checks before we are finished.
-			if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
-				attachmentChecks($attachID);
+			if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
+							attachmentChecks($attachID);
+			}
 		}
 
 		// Mod authors, finally a hook to hang an alternate attachment upload system upon
@@ -344,14 +364,15 @@ 
 
 					$_SESSION['already_attached'][$attachmentOptions['attachID']] = $attachmentOptions['attachID'];
 
-					if (!empty($attachmentOptions['thumb']))
-						$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
+					if (!empty($attachmentOptions['thumb'])) {
+											$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
+					}
 
-					if ($this->_msg)
-						assignAttachments($_SESSION['already_attached'], $this->_msg);
+					if ($this->_msg) {
+											assignAttachments($_SESSION['already_attached'], $this->_msg);
+					}
 				}
-			}
-			else
+			} else
 			{
 				// Sort out the errors for display and delete any associated files.
 				$log_these = array('attachments_no_create', 'attachments_no_write', 'attach_timeout', 'ran_out_of_space', 'cant_access_upload_path', 'attach_0_byte_file');
@@ -363,14 +384,16 @@ 
 					if (!is_array($error))
 					{
 						$attachmentOptions['errors'][] = $txt[$error];
-						if (in_array($error, $log_these))
-							log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						if (in_array($error, $log_these)) {
+													log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						}
+					} else {
+											$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 					}
-					else
-						$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 				}
-				if (file_exists($attachment['tmp_name']))
-					unlink($attachment['tmp_name']);
+				if (file_exists($attachment['tmp_name'])) {
+									unlink($attachment['tmp_name']);
+				}
 			}
 
 			// Regardless of errors, pass the results.
@@ -378,8 +401,9 @@ 
 		}
 
 		// Temp save this on the db.
-		if (!empty($_SESSION['already_attached']))
-			$this->_attachSuccess = $_SESSION['already_attached'];
+		if (!empty($_SESSION['already_attached'])) {
+					$this->_attachSuccess = $_SESSION['already_attached'];
+		}
 
 		unset($_SESSION['temp_attachments']);
 	}
@@ -399,14 +423,16 @@ 
 		if ($this->_sa == 'add')
 		{
 			// Is there any generic errors? made some sense out of them!
-			if ($this->_generalErrors)
-				foreach ($this->_generalErrors as $k => $v)
+			if ($this->_generalErrors) {
+							foreach ($this->_generalErrors as $k => $v)
 					$this->_generalErrors[$k] = (is_array($v) ? vsprintf($txt[$v[0]], $v[1]) : $txt[$v]);
+			}
 
 			// Gotta urlencode the filename.
-			if ($this->_attachResults)
-				foreach ($this->_attachResults as $k => $v)
+			if ($this->_attachResults) {
+							foreach ($this->_attachResults as $k => $v)
 					$this->_attachResults[$k]['name'] =  urlencode($this->_attachResults[$k]['name']);
+			}
 
 			$this->_response = array(
 				'files' => $this->_attachResults ? $this->_attachResults : false,
@@ -415,9 +441,10 @@ 
 		}
 
 		// Rest of us mere mortals gets no special treatment...
-		elseif (!empty($data))
-			if (!empty($data['text']) && !empty($txt[$data['text']]))
+		elseif (!empty($data)) {
+					if (!empty($data['text']) && !empty($txt[$data['text']]))
 				$this->_response['text'] = $txt[$data['text']];
+		}
 	}
 
 	protected function sendResponse()
@@ -426,11 +453,11 @@ 
 
 		ob_end_clean();
 
-		if (!empty($modSettings['CompressedOutput']))
-			@ob_start('ob_gzhandler');
-
-		else
-			ob_start();
+		if (!empty($modSettings['CompressedOutput'])) {
+					@ob_start('ob_gzhandler');
+		} else {
+					ob_start();
+		}
 
 		// Set the header.
 		header('Content-Type: application/json; charset='. $context['character_set'] .'');

Sources/CacheAPI-zend.php

Braces +15 added lines, -11 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -29,8 +30,9 @@ 
 
 		$supported = function_exists('zend_shm_cache_fetch') || function_exists('output_cache_get');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -42,10 +44,11 @@ 
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// Zend's pricey stuff.
-		if (function_exists('zend_shm_cache_fetch'))
-			return zend_shm_cache_fetch('SMF::' . $key);
-		elseif (function_exists('output_cache_get'))
-			return output_cache_get($key, $ttl);
+		if (function_exists('zend_shm_cache_fetch')) {
+					return zend_shm_cache_fetch('SMF::' . $key);
+		} elseif (function_exists('output_cache_get')) {
+					return output_cache_get($key, $ttl);
+		}
 	}
 
 	/**
@@ -55,10 +58,11 @@ 
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
-		if (function_exists('zend_shm_cache_store'))
-			return zend_shm_cache_store('SMF::' . $key, $value, $ttl);
-		elseif (function_exists('output_cache_put'))
-			return output_cache_put($key, $value);
+		if (function_exists('zend_shm_cache_store')) {
+					return zend_shm_cache_store('SMF::' . $key, $value, $ttl);
+		} elseif (function_exists('output_cache_put')) {
+					return output_cache_put($key, $value);
+		}
 	}
 
 	/**

Sources/SearchAPI-Custom.php

Braces +48 added lines, -34 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Used for the "custom search index" option
@@ -54,8 +55,9 @@ 
 			return;
 		}
 
-		if (empty($modSettings['search_custom_index_config']))
-			return;
+		if (empty($modSettings['search_custom_index_config'])) {
+					return;
+		}
 
 		$this->indexSettings = smf_json_decode($modSettings['search_custom_index_config'], true);
 
@@ -118,21 +120,23 @@ 
 
 		$subwords = text2words($word, $this->min_word_length, true);
 
-		if (empty($modSettings['search_force_index']))
-			$wordsSearch['words'][] = $word;
+		if (empty($modSettings['search_force_index'])) {
+					$wordsSearch['words'][] = $word;
+		}
 
 		// Excluded phrases don't benefit from being split into subwords.
-		if (count($subwords) > 1 && $isExcluded)
-			return;
-		else
+		if (count($subwords) > 1 && $isExcluded) {
+					return;
+		} else
 		{
 			foreach ($subwords as $subword)
 			{
 				if ($smcFunc['strlen']($subword) >= $this->min_word_length && !in_array($subword, $this->bannedWords))
 				{
 					$wordsSearch['indexed_words'][] = $subword;
-					if ($isExcluded)
-						$wordsExclude[] = $subword;
+					if ($isExcluded) {
+											$wordsExclude[] = $subword;
+					}
 				}
 			}
 		}
@@ -153,8 +157,9 @@ 
 		$query_where = array();
 		$query_params = $search_data['params'];
 
-		if ($query_params['id_search'])
-			$query_select['id_search'] = '{int:id_search}';
+		if ($query_params['id_search']) {
+					$query_select['id_search'] = '{int:id_search}';
+		}
 
 		$count = 0;
 		foreach ($words['words'] as $regularWord)
@@ -163,30 +168,37 @@ 
 			$query_params['complex_body_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($regularWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $regularWord), '\\\'') . '[[:>:]]';
 		}
 
-		if ($query_params['user_query'])
-			$query_where[] = '{raw:user_query}';
-		if ($query_params['board_query'])
-			$query_where[] = 'm.id_board {raw:board_query}';
+		if ($query_params['user_query']) {
+					$query_where[] = '{raw:user_query}';
+		}
+		if ($query_params['board_query']) {
+					$query_where[] = 'm.id_board {raw:board_query}';
+		}
 
-		if ($query_params['topic'])
-			$query_where[] = 'm.id_topic = {int:topic}';
-		if ($query_params['min_msg_id'])
-			$query_where[] = 'm.id_msg >= {int:min_msg_id}';
-		if ($query_params['max_msg_id'])
-			$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		if ($query_params['topic']) {
+					$query_where[] = 'm.id_topic = {int:topic}';
+		}
+		if ($query_params['min_msg_id']) {
+					$query_where[] = 'm.id_msg >= {int:min_msg_id}';
+		}
+		if ($query_params['max_msg_id']) {
+					$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		}
 
 		$count = 0;
-		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_phrases'] as $phrase)
+		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_phrases'] as $phrase)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : ' RLIKE ') . '{string:exclude_subject_phrase_' . $count . '}';
+		}
 				$query_params['exclude_subject_phrase_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($phrase, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $phrase), '\\\'') . '[[:>:]]';
 			}
 		$count = 0;
-		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_subject_words'] as $excludedWord)
+		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_subject_words'] as $excludedWord)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : ' RLIKE ') . '{string:exclude_subject_words_' . $count . '}';
+		}
 				$query_params['exclude_subject_words_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($excludedWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $excludedWord), '\\\'') . '[[:>:]]';
 			}
 
@@ -199,8 +211,7 @@ 
 			{
 				$query_left_join[] = '{db_prefix}log_search_words AS lsw' . $numTables . ' ON (lsw' . $numTables . '.id_word = ' . $indexedWord . ' AND lsw' . $numTables . '.id_msg = m.id_msg)';
 				$query_where[] = '(lsw' . $numTables . '.id_word IS NULL)';
-			}
-			else
+			} else
 			{
 				$query_inner_join[] = '{db_prefix}log_search_words AS lsw' . $numTables . ' ON (lsw' . $numTables . '.id_msg = ' . ($prev_join === 0 ? 'm' : 'lsw' . $prev_join) . '.id_msg)';
 				$query_where[] = 'lsw' . $numTables . '.id_word = ' . $indexedWord;
@@ -236,16 +247,18 @@ 
 		$customIndexSettings = smf_json_decode($modSettings['search_custom_index_config'], true);
 
 		$inserts = array();
-		foreach (text2words($msgOptions['body'], $customIndexSettings['bytes_per_word'], true) as $word)
-			$inserts[] = array($word, $msgOptions['id']);
+		foreach (text2words($msgOptions['body'], $customIndexSettings['bytes_per_word'], true) as $word) {
+					$inserts[] = array($word, $msgOptions['id']);
+		}
 
-		if (!empty($inserts))
-			$smcFunc['db_insert']('ignore',
+		if (!empty($inserts)) {
+					$smcFunc['db_insert']('ignore',
 				'{db_prefix}log_search_words',
 				array('id_word' => 'int', 'id_msg' => 'int'),
 				$inserts,
 				array('id_word', 'id_msg')
 			);
+		}
 	}
 
 	/**
@@ -288,8 +301,9 @@ 
 			if (!empty($inserted_words))
 			{
 				$inserts = array();
-				foreach ($inserted_words as $word)
-					$inserts[] = array($word, $msgOptions['id']);
+				foreach ($inserted_words as $word) {
+									$inserts[] = array($word, $msgOptions['id']);
+				}
 				$smcFunc['db_insert']('insert',
 					'{db_prefix}log_search_words',
 					array('id_word' => 'string', 'id_msg' => 'int'),

Sources/ViewQuery.php

Braces +34 added lines, -26 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Show the database queries for debugging
@@ -30,8 +31,9 @@ 
 	global $scripturl, $settings, $context, $db_connection, $boarddir, $smcFunc, $txt, $db_show_debug;
 
 	// We should have debug mode enabled, as well as something to display!
-	if (!isset($db_show_debug) || $db_show_debug !== true || !isset($_SESSION['debug']))
-		fatal_lang_error('no_access', false);
+	if (!isset($db_show_debug) || $db_show_debug !== true || !isset($_SESSION['debug'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Don't allow except for administrators.
 	isAllowedTo('admin_forum');
@@ -41,10 +43,11 @@ 
 	{
 		$_SESSION['view_queries'] = $_SESSION['view_queries'] == 1 ? 0 : 1;
 
-		if (strpos($_SESSION['old_url'], 'action=viewquery') !== false)
-			redirectexit();
-		else
-			redirectexit($_SESSION['old_url']);
+		if (strpos($_SESSION['old_url'], 'action=viewquery') !== false) {
+					redirectexit();
+		} else {
+					redirectexit($_SESSION['old_url']);
+		}
 	}
 
 	call_integration_hook('integrate_egg_nog');
@@ -83,26 +86,28 @@ 
 		foreach ($query as $line)
 		{
 			preg_match('/^(\t*)/', $line, $temp);
-			if (strlen($temp[0]) < $min_indent || $min_indent == 0)
-				$min_indent = strlen($temp[0]);
+			if (strlen($temp[0]) < $min_indent || $min_indent == 0) {
+							$min_indent = strlen($temp[0]);
+			}
+		}
+		foreach ($query as $l => $dummy) {
+					$query[$l] = substr($dummy, $min_indent);
 		}
-		foreach ($query as $l => $dummy)
-			$query[$l] = substr($dummy, $min_indent);
 		$query_data['q'] = implode("\n", $query);
 
 		// Make the filenames look a bit better.
-		if (isset($query_data['f']))
-			$query_data['f'] = preg_replace('~^' . preg_quote($boarddir, '~') . '~', '...', $query_data['f']);
+		if (isset($query_data['f'])) {
+					$query_data['f'] = preg_replace('~^' . preg_quote($boarddir, '~') . '~', '...', $query_data['f']);
+		}
 
 		$is_select_query = substr(trim($query_data['q']), 0, 6) == 'SELECT';
-		if ($is_select_query)
-			$select = $query_data['q'];
-		elseif (preg_match('~^INSERT(?: IGNORE)? INTO \w+(?:\s+\([^)]+\))?\s+(SELECT .+)$~s', trim($query_data['q']), $matches) != 0)
+		if ($is_select_query) {
+					$select = $query_data['q'];
+		} elseif (preg_match('~^INSERT(?: IGNORE)? INTO \w+(?:\s+\([^)]+\))?\s+(SELECT .+)$~s', trim($query_data['q']), $matches) != 0)
 		{
 			$is_select_query = true;
 			$select = $matches[1];
-		}
-		elseif (preg_match('~^CREATE TEMPORARY TABLE .+?(SELECT .+)$~s', trim($query_data['q']), $matches) != 0)
+		} elseif (preg_match('~^CREATE TEMPORARY TABLE .+?(SELECT .+)$~s', trim($query_data['q']), $matches) != 0)
 		{
 			$is_select_query = true;
 			$select = $matches[1];
@@ -110,10 +115,11 @@ 
 		// Temporary tables created in earlier queries are not explainable.
 		if ($is_select_query)
 		{
-			foreach (array('log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages') as $tmp)
-				if (strpos($select, $tmp) !== false)
+			foreach (array('log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages') as $tmp) {
+							if (strpos($select, $tmp) !== false)
 				{
 					$is_select_query = false;
+			}
 					break;
 				}
 		}
@@ -124,13 +130,15 @@ 
 				', nl2br(str_replace("\t", '&nbsp;&nbsp;&nbsp;', $smcFunc['htmlspecialchars']($query_data['q']))), '
 			</a><br>';
 
-		if (!empty($query_data['f']) && !empty($query_data['l']))
-			echo sprintf($txt['debug_query_in_line'], $query_data['f'], $query_data['l']);
+		if (!empty($query_data['f']) && !empty($query_data['l'])) {
+					echo sprintf($txt['debug_query_in_line'], $query_data['f'], $query_data['l']);
+		}
 
-		if (isset($query_data['s'], $query_data['t']) && isset($txt['debug_query_which_took_at']))
-			echo sprintf($txt['debug_query_which_took_at'], round($query_data['t'], 8), round($query_data['s'], 8));
-		else
-			echo sprintf($txt['debug_query_which_took'], round($query_data['t'], 8));
+		if (isset($query_data['s'], $query_data['t']) && isset($txt['debug_query_which_took_at'])) {
+					echo sprintf($txt['debug_query_which_took_at'], round($query_data['t'], 8), round($query_data['s'], 8));
+		} else {
+					echo sprintf($txt['debug_query_which_took'], round($query_data['t'], 8));
+		}
 
 		echo '
 		</div>';

Sources/Printpage.php

Braces +30 added lines, -23 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Format a topic to be printer friendly.
@@ -32,8 +33,9 @@ 
 	global $board_info, $smcFunc, $modSettings;
 
 	// Redirect to the boardindex if no valid topic id is provided.
-	if (empty($topic))
-		redirectexit();
+	if (empty($topic)) {
+			redirectexit();
+	}
 
 	if (!empty($modSettings['disable_print_topic']))
 	{
@@ -59,8 +61,9 @@ 
 		)
 	);
 	// Redirect to the boardindex if no valid topic id is provided.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		redirectexit();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			redirectexit();
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -134,20 +137,21 @@ 
 				foreach ($guestinfo as $i => $guestvoted)
 				{
 					$guestvoted = explode(',', $guestvoted);
-					if ($guestvoted[0] == $row['id_poll'])
-						break;
+					if ($guestvoted[0] == $row['id_poll']) {
+											break;
+					}
 				}
 				// Has the poll been reset since guest voted?
 				if ($pollinfo['reset_poll'] > $guestvoted[1])
 				{
 					// Remove the poll info from the cookie to allow guest to vote again
 					unset($guestinfo[$i]);
-					if (!empty($guestinfo))
-						$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
-					else
-						unset($_COOKIE['guest_poll_vote']);
-				}
-				else
+					if (!empty($guestinfo)) {
+											$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
+					} else {
+											unset($_COOKIE['guest_poll_vote']);
+					}
+				} else
 				{
 					// What did they vote for?
 					unset($guestvoted[0], $guestvoted[1]);
@@ -233,8 +237,9 @@ 
 	$context['poster_name'] = $row['poster_name'];
 	$context['post_time'] = timeformat($row['poster_time'], false);
 	$context['parent_boards'] = array();
-	foreach ($board_info['parent_boards'] as $parent)
-		$context['parent_boards'][] = $parent['name'];
+	foreach ($board_info['parent_boards'] as $parent) {
+			$context['parent_boards'][] = $parent['name'];
+	}
 
 	// Split the topics up so we can print them.
 	$request = $smcFunc['db_query']('', '
@@ -266,8 +271,9 @@ 
 			'id_msg' => $row['id_msg'],
 		);
 
-		if (!isset($context['topic_subject']))
-			$context['topic_subject'] = $row['subject'];
+		if (!isset($context['topic_subject'])) {
+					$context['topic_subject'] = $row['subject'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -275,8 +281,9 @@ 
 	if (isset($_REQUEST['images']) && !empty($modSettings['attachmentEnable']) && allowedTo('view_attachments'))
 	{
 		$messages = array();
-		foreach ($context['posts'] as $temp)
-			$messages[] = $temp['id_msg'];
+		foreach ($context['posts'] as $temp) {
+					$messages[] = $temp['id_msg'];
+		}
 
 		// build the request
 		$request = $smcFunc['db_query']('', '
@@ -295,8 +302,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			$temp[$row['id_attach']] = $row;
-			if (!isset($context['printattach'][$row['id_msg']]))
-				$context['printattach'][$row['id_msg']] = array();
+			if (!isset($context['printattach'][$row['id_msg']])) {
+							$context['printattach'][$row['id_msg']] = array();
+			}
 		}
 		$smcFunc['db_free_result']($request);
 		ksort($temp);
@@ -313,8 +321,7 @@ 
 						$row['height'] = floor($row['height'] * ($modSettings['max_image_width'] / $row['width']));
 						$row['width'] = $modSettings['max_image_width'];
 					}
-				}
-				elseif (!empty($modSettings['max_image_width']))
+				} elseif (!empty($modSettings['max_image_width']))
 				{
 					if ($row['height'] > $modSettings['max_image_height'])
 					{

Sources/CacheAPI-memcache.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 			$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)
+			if (strpos($server, '/') !== false)
 				$host = $server;
 			else
 			{

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) {