SimpleMachines / SMF2.1

Sources/Subs-Attachments.php

Braces +297 added lines, -224 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Check if the current directory is still valid or not.
@@ -28,22 +29,24 @@ 
 	global $smcFunc, $boarddir, $modSettings, $context;
 
 	// Not pretty, but since we don't want folders created for every post. It'll do unless a better solution can be found.
-	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin')
-		$doit = true;
-	elseif (empty($modSettings['automanage_attachments']))
-		return;
-	elseif (!isset($_FILES))
-		return;
-	elseif (isset($_FILES['attachment']))
-		foreach ($_FILES['attachment']['tmp_name'] as $dummy)
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin') {
+			$doit = true;
+	} elseif (empty($modSettings['automanage_attachments'])) {
+			return;
+	} elseif (!isset($_FILES)) {
+			return;
+	} elseif (isset($_FILES['attachment'])) {
+			foreach ($_FILES['attachment']['tmp_name'] as $dummy)
 			if (!empty($dummy))
 			{
 				$doit = true;
+	}
 				break;
 			}
 
-	if (!isset($doit))
-		return;
+	if (!isset($doit)) {
+			return;
+	}
 
 	$year = date('Y');
 	$month = date('m');
@@ -54,21 +57,25 @@ 
 
 	if (!empty($modSettings['attachment_basedirectories']) && !empty($modSettings['use_subdirectories_for_attachments']))
 	{
-			if (!is_array($modSettings['attachment_basedirectories']))
-				$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+			if (!is_array($modSettings['attachment_basedirectories'])) {
+							$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+			}
 			$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
+	} else {
+			$base_dir = 0;
 	}
-	else
-		$base_dir = 0;
 
 	if ($modSettings['automanage_attachments'] == 1)
 	{
-		if (!isset($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = array();
-		if (!is_array($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
-		if (!isset($modSettings['last_attachments_directory'][$base_dir]))
-			$modSettings['last_attachments_directory'][$base_dir] = 0;
+		if (!isset($modSettings['last_attachments_directory'])) {
+					$modSettings['last_attachments_directory'] = array();
+		}
+		if (!is_array($modSettings['last_attachments_directory'])) {
+					$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
+		}
+		if (!isset($modSettings['last_attachments_directory'][$base_dir])) {
+					$modSettings['last_attachments_directory'][$base_dir] = 0;
+		}
 	}
 
 	$basedirectory = (!empty($modSettings['use_subdirectories_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
@@ -97,12 +104,14 @@ 
 			$updir = '';
 	}
 
-	if (!is_array($modSettings['attachmentUploadDir']))
-		$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
-	if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir))
-		$outputCreation = automanage_attachments_create_directory($updir);
-	elseif (in_array($updir, $modSettings['attachmentUploadDir']))
-		$outputCreation = true;
+	if (!is_array($modSettings['attachmentUploadDir'])) {
+			$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+	}
+	if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir)) {
+			$outputCreation = automanage_attachments_create_directory($updir);
+	} elseif (in_array($updir, $modSettings['attachmentUploadDir'])) {
+			$outputCreation = true;
+	}
 
 	if ($outputCreation)
 	{
@@ -139,8 +148,9 @@ 
 		$count = count($tree);
 
 		$directory = attachments_init_dir($tree, $count);
-		if ($directory === false)
-			return false;
+		if ($directory === false) {
+					return false;
+		}
 	}
 
 	$directory .= DIRECTORY_SEPARATOR . array_shift($tree);
@@ -168,8 +178,9 @@ 
 	}
 
 	// Everything seems fine...let's create the .htaccess
-	if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess'))
-		secureDirectory($updir, true);
+	if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess')) {
+			secureDirectory($updir, true);
+	}
 
 	$sep = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? '\/' : DIRECTORY_SEPARATOR;
 	$updir = rtrim($updir, $sep);
@@ -201,8 +212,9 @@ 
 {
 	global $smcFunc, $modSettings, $boarddir;
 
-	if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1))
-		return;
+	if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1)) {
+			return;
+	}
 
 	$basedirectory = !empty($modSettings['use_subdirectories_for_attachments']) ? $modSettings['basedirectory_for_attachments'] : $boarddir;
 	// Just to be sure: I don't want directory separators at the end
@@ -214,13 +226,14 @@ 
 	{
 		$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
 		$base_dir = !empty($modSettings['automanage_attachments']) ? $base_dir : 0;
+	} else {
+			$base_dir = 0;
 	}
-	else
-		$base_dir = 0;
 
 	// Get the last attachment directory for that base directory
-	if (empty($modSettings['last_attachments_directory'][$base_dir]))
-		$modSettings['last_attachments_directory'][$base_dir] = 0;
+	if (empty($modSettings['last_attachments_directory'][$base_dir])) {
+			$modSettings['last_attachments_directory'][$base_dir] = 0;
+	}
 	// And increment it.
 	$modSettings['last_attachments_directory'][$base_dir]++;
 
@@ -235,10 +248,10 @@ 
 		$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
 
 		return true;
+	} else {
+			return false;
+	}
 	}
-	else
-		return false;
-}
 
 /**
  * Split a path into a list of all directories and subdirectories
@@ -256,12 +269,13 @@ 
 			* in Windows we need to explode for both \ and /
 			* while in linux should be safe to explode only for / (aka DIRECTORY_SEPARATOR)
 	*/
-	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
-		$tree = preg_split('#[\\\/]#', $directory);
-	else
+	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+			$tree = preg_split('#[\\\/]#', $directory);
+	} else
 	{
-		if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR)
-			return false;
+		if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR) {
+					return false;
+		}
 
 		$tree = explode(DIRECTORY_SEPARATOR, trim($directory, DIRECTORY_SEPARATOR));
 	}
@@ -285,10 +299,11 @@ 
 		 //Better be sure that the first part of the path is actually a drive letter...
 		 //...even if, I should check this in the admin page...isn't it?
 		 //...NHAAA Let's leave space for users' complains! :P
-		if (preg_match('/^[a-z]:$/i', $tree[0]))
-			$directory = array_shift($tree);
-		else
-			return false;
+		if (preg_match('/^[a-z]:$/i', $tree[0])) {
+					$directory = array_shift($tree);
+		} else {
+					return false;
+		}
 
 		$count--;
 	}
@@ -303,18 +318,20 @@ 
 	global $context, $modSettings, $smcFunc, $txt, $user_info;
 
 	// 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();
+	}
 
-	if (!is_array($modSettings['attachmentUploadDir']))
-		$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+	if (!is_array($modSettings['attachmentUploadDir'])) {
+			$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+	}
 
 	$context['attach_dir'] = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 
 	// Is the attachments folder actualy there?
-	if (!empty($context['dir_creation_error']))
-		$initial_error = $context['dir_creation_error'];
-	elseif (!is_dir($context['attach_dir']))
+	if (!empty($context['dir_creation_error'])) {
+			$initial_error = $context['dir_creation_error'];
+	} elseif (!is_dir($context['attach_dir']))
 	{
 		$initial_error = 'attach_folder_warning';
 		log_error(sprintf($txt['attach_folder_admin_warning'], $context['attach_dir']), 'critical');
@@ -337,12 +354,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,
 			);
+		}
 	}
 
 	// Hmm. There are still files in session.
@@ -352,39 +369,44 @@ 
 		// Let's try to keep them. But...
 		$ignore_temp = true;
 		// If new files are being added. We can't ignore those
-		foreach ($_FILES['attachment']['tmp_name'] as $dummy)
-			if (!empty($dummy))
+		foreach ($_FILES['attachment']['tmp_name'] as $dummy) {
+					if (!empty($dummy))
 			{
 				$ignore_temp = false;
+		}
 				break;
 			}
 
 		// Need to make space for the new files. So, bye bye.
 		if (!$ignore_temp)
 		{
-			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-				if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
+			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+							if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
 					unlink($attachment['tmp_name']);
+			}
 
 			$context['we_are_history'] = $txt['error_temp_attachments_flushed'];
 			$_SESSION['temp_attachments'] = array();
 		}
 	}
 
-	if (!isset($_FILES['attachment']['name']))
-		$_FILES['attachment']['tmp_name'] = array();
+	if (!isset($_FILES['attachment']['name'])) {
+			$_FILES['attachment']['tmp_name'] = array();
+	}
 
-	if (!isset($_SESSION['temp_attachments']))
-		$_SESSION['temp_attachments'] = array();
+	if (!isset($_SESSION['temp_attachments'])) {
+			$_SESSION['temp_attachments'] = array();
+	}
 
 	// Remember where we are at. If it's anywhere at all.
-	if (!$ignore_temp)
-		$_SESSION['temp_attachments']['post'] = array(
+	if (!$ignore_temp) {
+			$_SESSION['temp_attachments']['post'] = array(
 			'msg' => !empty($_REQUEST['msg']) ? $_REQUEST['msg'] : 0,
 			'last_msg' => !empty($_REQUEST['last_msg']) ? $_REQUEST['last_msg'] : 0,
 			'topic' => !empty($topic) ? $topic : 0,
 			'board' => !empty($board) ? $board : 0,
 		);
+	}
 
 	// If we have an initial error, lets just display it.
 	if (!empty($initial_error))
@@ -392,9 +414,10 @@ 
 		$_SESSION['temp_attachments']['initial_error'] = $initial_error;
 
 		// 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();
 	}
@@ -402,21 +425,24 @@ 
 	// 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']));
-			elseif ($_FILES['attachment']['error'][$n] == 6)
-				log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
-			else
-				log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
-			if (empty($errors))
-				$errors[] = 'attach_php_error';
+			if ($_FILES['attachment']['error'][$n] == 2) {
+							$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+			} elseif ($_FILES['attachment']['error'][$n] == 6) {
+							log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+			} else {
+							log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+			}
+			if (empty($errors)) {
+							$errors[] = 'attach_php_error';
+			}
 		}
 
 		// Try to move and rename the file before doing any more checks on it.
@@ -426,8 +452,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])),
@@ -439,16 +466,16 @@ 
 			);
 
 			// 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);
-			else
+			if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
+							smf_chmod($destName, 0644);
+			} else
 			{
 				$_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]);
+				}
 			}
-		}
-		else
+		} else
 		{
 			$_SESSION['temp_attachments'][$attachID] = array(
 				'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])),
@@ -456,12 +483,14 @@ 
 				'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
 	// Upload to the current attachment folder with the file name $attachID or 'post_tmp_' . $user_info['id'] . '_' . md5(mt_rand())
@@ -488,21 +517,20 @@ 
 	global $modSettings, $context, $sourcedir, $smcFunc;
 
 	// No data or missing data .... Not necessarily needed, but in case a mod author missed something.
-	if (empty($_SESSION['temp_attachments'][$attachID]))
-		$error = '$_SESSION[\'temp_attachments\'][$attachID]';
-
-	elseif (empty($attachID))
-		$error = '$attachID';
-
-	elseif (empty($context['attachments']))
-		$error = '$context[\'attachments\']';
-
-	elseif (empty($context['attach_dir']))
-		$error = '$context[\'attach_dir\']';
+	if (empty($_SESSION['temp_attachments'][$attachID])) {
+			$error = '$_SESSION[\'temp_attachments\'][$attachID]';
+	} elseif (empty($attachID)) {
+			$error = '$attachID';
+	} elseif (empty($context['attachments'])) {
+			$error = '$context[\'attachments\']';
+	} elseif (empty($context['attach_dir'])) {
+			$error = '$context[\'attach_dir\']';
+	}
 
 	// Let's get their attention.
-	if (!empty($error))
-		fatal_lang_error('attach_check_nag', 'debug', array($error));
+	if (!empty($error)) {
+			fatal_lang_error('attach_check_nag', 'debug', array($error));
+	}
 
 	// Just in case this slipped by the first checks, we stop it here and now
 	if ($_SESSION['temp_attachments'][$attachID]['size'] == 0)
@@ -531,8 +559,9 @@ 
 			$size = @getimagesize($_SESSION['temp_attachments'][$attachID]['tmp_name']);
 			if (!(empty($size)) && ($size[2] != $old_format))
 			{
-				if (isset($context['validImageTypes'][$size[2]]))
-					$_SESSION['temp_attachments'][$attachID]['type'] = 'image/' . $context['validImageTypes'][$size[2]];
+				if (isset($context['validImageTypes'][$size[2]])) {
+									$_SESSION['temp_attachments'][$attachID]['type'] = 'image/' . $context['validImageTypes'][$size[2]];
+				}
 			}
 		}
 	}
@@ -586,42 +615,48 @@ 
 				// Or, let the user know that it ain't gonna happen.
 				else
 				{
-					if (isset($context['dir_creation_error']))
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
-					else
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					if (isset($context['dir_creation_error'])) {
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
+					} else {
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					}
 				}
+			} else {
+							$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
 			}
-			else
-				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
 		}
 	}
 
 	// Is the file too big?
 	$context['attachments']['total_size'] += $_SESSION['temp_attachments'][$attachID]['size'];
-	if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	}
 
 	// Check the total upload size for this post...
-	if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	}
 
 	// Have we reached the maximum number of files we are allowed?
 	$context['attachments']['quantity']++;
 
 	// Set a max limit if none exists
-	if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50)
-		$modSettings['attachmentNumPerPostLimit'] = 50;
+	if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50) {
+			$modSettings['attachmentNumPerPostLimit'] = 50;
+	}
 
-	if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit'])
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit']) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	}
 
 	// File extension check
 	if (!empty($modSettings['attachmentCheckExtensions']))
 	{
 		$allowed = explode(',', strtolower($modSettings['attachmentExtensions']));
-		foreach ($allowed as $k => $dummy)
-			$allowed[$k] = trim($dummy);
+		foreach ($allowed as $k => $dummy) {
+					$allowed[$k] = trim($dummy);
+		}
 
 		if (!in_array(strtolower(substr(strrchr($_SESSION['temp_attachments'][$attachID]['name'], '.'), 1)), $allowed))
 		{
@@ -633,10 +668,12 @@ 
 	// Undo the math if there's an error
 	if (!empty($_SESSION['temp_attachments'][$attachID]['errors']))
 	{
-		if (isset($context['dir_size']))
-			$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
-		if (isset($context['dir_files']))
-			$context['dir_files']--;
+		if (isset($context['dir_size'])) {
+					$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
+		}
+		if (isset($context['dir_files'])) {
+					$context['dir_files']--;
+		}
 		$context['attachments']['total_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
 		$context['attachments']['quantity']--;
 		return false;
@@ -668,12 +705,14 @@ 
 	if (empty($attachmentOptions['mime_type']) && $attachmentOptions['width'])
 	{
 		// Got a proper mime type?
-		if (!empty($size['mime']))
-			$attachmentOptions['mime_type'] = $size['mime'];
+		if (!empty($size['mime'])) {
+					$attachmentOptions['mime_type'] = $size['mime'];
+		}
 
 		// Otherwise a valid one?
-		elseif (isset($context['validImageTypes'][$size[2]]))
-			$attachmentOptions['mime_type'] = 'image/' . $context['validImageTypes'][$size[2]];
+		elseif (isset($context['validImageTypes'][$size[2]])) {
+					$attachmentOptions['mime_type'] = 'image/' . $context['validImageTypes'][$size[2]];
+		}
 	}
 
 	// It is possible we might have a MIME type that isn't actually an image but still have a size.
@@ -685,15 +724,17 @@ 
 	}
 
 	// Get the hash if no hash has been given yet.
-	if (empty($attachmentOptions['file_hash']))
-		$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], false, null, true);
+	if (empty($attachmentOptions['file_hash'])) {
+			$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], false, null, true);
+	}
 
 	// Assuming no-one set the extension let's take a look at it.
 	if (empty($attachmentOptions['fileext']))
 	{
 		$attachmentOptions['fileext'] = strtolower(strrpos($attachmentOptions['name'], '.') !== false ? substr($attachmentOptions['name'], strrpos($attachmentOptions['name'], '.') + 1) : '');
-		if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name'])
-			$attachmentOptions['fileext'] = '';
+		if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name']) {
+					$attachmentOptions['fileext'] = '';
+		}
 	}
 
 	// Last chance to change stuff!
@@ -702,8 +743,9 @@ 
 	// Make sure the folder is valid...
 	$tmp = is_array($modSettings['attachmentUploadDir']) ? $modSettings['attachmentUploadDir'] : $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
 	$folders = array_keys($tmp);
-	if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders))
-		$attachmentOptions['id_folder'] = $modSettings['currentAttachmentUploadDir'];
+	if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders)) {
+			$attachmentOptions['id_folder'] = $modSettings['currentAttachmentUploadDir'];
+	}
 
 	$attachmentOptions['id'] = $smcFunc['db_insert']('',
 		'{db_prefix}attachments',
@@ -734,8 +776,8 @@ 
 	rename($attachmentOptions['tmp_name'], $attachmentOptions['destination']);
 
 	// If it's not approved then add to the approval queue.
-	if (!$attachmentOptions['approved'])
-		$smcFunc['db_insert']('',
+	if (!$attachmentOptions['approved']) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}approval_queue',
 			array(
 				'id_attach' => 'int', 'id_msg' => 'int',
@@ -745,9 +787,11 @@ 
 			),
 			array()
 		);
+	}
 
-	if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height'])))
-		return true;
+	if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height']))) {
+			return true;
+	}
 
 	// Like thumbnails, do we?
 	if (!empty($modSettings['attachmentThumbWidth']) && !empty($modSettings['attachmentThumbHeight']) && ($attachmentOptions['width'] > $modSettings['attachmentThumbWidth'] || $attachmentOptions['height'] > $modSettings['attachmentThumbHeight']))
@@ -758,13 +802,15 @@ 
 			$size = @getimagesize($attachmentOptions['destination'] . '_thumb');
 			list ($thumb_width, $thumb_height) = $size;
 
-			if (!empty($size['mime']))
-				$thumb_mime = $size['mime'];
-			elseif (isset($context['validImageTypes'][$size[2]]))
-				$thumb_mime = 'image/' . $context['validImageTypes'][$size[2]];
+			if (!empty($size['mime'])) {
+							$thumb_mime = $size['mime'];
+			} elseif (isset($context['validImageTypes'][$size[2]])) {
+							$thumb_mime = 'image/' . $context['validImageTypes'][$size[2]];
+			}
 			// Lord only knows how this happened...
-			else
-				$thumb_mime = '';
+			else {
+							$thumb_mime = '';
+			}
 
 			$thumb_filename = $attachmentOptions['name'] . '_thumb';
 			$thumb_size = filesize($attachmentOptions['destination'] . '_thumb');
@@ -844,15 +890,17 @@ 
 	global $smcFunc;
 
 	// Oh, come on!
-	if (empty($attachIDs) || empty($msgID))
-		return false;
+	if (empty($attachIDs) || empty($msgID)) {
+			return false;
+	}
 
 	// "I see what is right and approve, but I do what is wrong."
 	call_integration_hook('integrate_assign_attachments', array(&$attachIDs, &$msgID));
 
 	// One last check
-	if (empty($attachIDs))
-		return false;
+	if (empty($attachIDs)) {
+			return false;
+	}
 
 	// Perform.
 	$smcFunc['db_query']('', '
@@ -880,8 +928,9 @@ 
 	global $board, $modSettings, $context, $scripturl, $smcFunc;
 
 	// Meh...
-	if (empty($attachID))
-		return 'attachments_no_data_loaded';
+	if (empty($attachID)) {
+			return 'attachments_no_data_loaded';
+	}
 
 	// Make it easy.
 	$msgID = !empty($_REQUEST['msg']) ? (int) $_REQUEST['msg'] : 0;
@@ -890,20 +939,23 @@ 
 	$externalParse = call_integration_hook('integrate_pre_parseAttachBBC', array($attachID, $msgID));
 
 	// "I am innocent of the blood of this just person: see ye to it."
-	if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse)))
-		return $externalParse;
+	if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse))) {
+			return $externalParse;
+	}
 
 	//Are attachments enable?
-	if (empty($modSettings['attachmentEnable']))
-		return 'attachments_not_enable';
+	if (empty($modSettings['attachmentEnable'])) {
+			return 'attachments_not_enable';
+	}
 
 	// Previewing much? no msg ID has been set yet.
 	if (!empty($context['preview_message']))
 	{
 		$allAttachments = getAttachsByMsg(0);
 
-		if (empty($allAttachments[0][$attachID]))
-			return 'attachments_no_data_loaded';
+		if (empty($allAttachments[0][$attachID])) {
+					return 'attachments_no_data_loaded';
+		}
 
 		$attachLoaded = loadAttachmentContext(0, $allAttachments);
 
@@ -915,57 +967,66 @@ 
 		$attachContext['link'] = '<a href="' . $scripturl . '?action=dlattach;attach=' . $attachID . ';type=preview' . (empty($attachContext['is_image']) ? ';file' : '') . '">' . $smcFunc['htmlspecialchars']($attachContext['name']) . '</a>';
 
 		// Fix the thumbnail too, if the image has one.
-		if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb']))
-			$attachContext['thumbnail']['href'] = $scripturl . '?action=dlattach;attach=' . $attachContext['thumbnail']['id'] . ';image;type=preview';
+		if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb'])) {
+					$attachContext['thumbnail']['href'] = $scripturl . '?action=dlattach;attach=' . $attachContext['thumbnail']['id'] . ';image;type=preview';
+		}
 
 		return $attachContext;
 	}
 
 	// There is always the chance someone else has already done our dirty work...
 	// If so, all pertinent checks were already done. Hopefully...
-	if (!empty($context['current_attachments']) && !empty($context['current_attachments'][$attachID]))
-		return $context['current_attachments'][$attachID];
+	if (!empty($context['current_attachments']) && !empty($context['current_attachments'][$attachID])) {
+			return $context['current_attachments'][$attachID];
+	}
 
 	// If we are lucky enough to be in $board's scope then check it!
-	if (!empty($board) && !allowedTo('view_attachments', $board))
-		return 'attachments_not_allowed_to_see';
+	if (!empty($board) && !allowedTo('view_attachments', $board)) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	// Get the message info associated with this particular attach ID.
 	$attachInfo = getAttachMsgInfo($attachID);
 
 	// There is always the chance this attachment no longer exists or isn't associated to a message anymore...
-	if (empty($attachInfo) || empty($attachInfo['msg']))
-		return 'attachments_no_msg_associated';
+	if (empty($attachInfo) || empty($attachInfo['msg'])) {
+			return 'attachments_no_msg_associated';
+	}
 
 	// Hold it! got the info now check if you can see this attachment.
-	if (!allowedTo('view_attachments', $attachInfo['board']))
-		return 'attachments_not_allowed_to_see';
+	if (!allowedTo('view_attachments', $attachInfo['board'])) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	$allAttachments = getAttachsByMsg($attachInfo['msg']);
 	$attachContext = $allAttachments[$attachInfo['msg']][$attachID];
 
 	// No point in keep going further.
-	if (!allowedTo('view_attachments', $attachContext['board']))
-		return 'attachments_not_allowed_to_see';
+	if (!allowedTo('view_attachments', $attachContext['board'])) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	// Load this particular attach's context.
-	if (!empty($attachContext))
-		$attachLoaded = loadAttachmentContext($attachContext['id_msg'], $allAttachments);
+	if (!empty($attachContext)) {
+			$attachLoaded = loadAttachmentContext($attachContext['id_msg'], $allAttachments);
+	}
 
 	// One last check, you know, gotta be paranoid...
-	else
-		return 'attachments_no_data_loaded';
+	else {
+			return 'attachments_no_data_loaded';
+	}
 
 	// This is the last "if" I promise!
-	if (empty($attachLoaded))
-		return 'attachments_no_data_loaded';
-
-	else
-		$attachContext = $attachLoaded[$attachID];
+	if (empty($attachLoaded)) {
+			return 'attachments_no_data_loaded';
+	} else {
+			$attachContext = $attachLoaded[$attachID];
+	}
 
 	// You may or may not want to show this under the post.
-	if (!empty($modSettings['dont_show_attach_under_post']) && !isset($context['show_attach_under_post'][$attachID]))
-		$context['show_attach_under_post'][$attachID] = $attachID;
+	if (!empty($modSettings['dont_show_attach_under_post']) && !isset($context['show_attach_under_post'][$attachID])) {
+			$context['show_attach_under_post'][$attachID] = $attachID;
+	}
 
 	// Last minute changes?
 	call_integration_hook('integrate_post_parseAttachBBC', array(&$attachContext));
@@ -985,8 +1046,9 @@ 
 {
 	global $smcFunc, $modSettings;
 
-	if (empty($attachIDs))
-		return array();
+	if (empty($attachIDs)) {
+			return array();
+	}
 
 	$return = array();
 
@@ -1002,11 +1064,12 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) != 1)
-		return array();
+	if ($smcFunc['db_num_rows']($request) != 1) {
+			return array();
+	}
 
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$return[$row['id_attach']] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$return[$row['id_attach']] = array(
 			'name' => $smcFunc['htmlspecialchars']($row['filename']),
 			'size' => $row['size'],
 			'attachID' => $row['id_attach'],
@@ -1015,6 +1078,7 @@ 
 			'mime_type' => $row['mime_type'],
 			'thumb' => $row['id_thumb'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $return;
@@ -1031,8 +1095,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($attachID))
-		return array();
+	if (empty($attachID)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT a.id_msg AS msg, m.id_topic AS topic, m.id_board AS board
@@ -1045,8 +1110,9 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) != 1)
-		return array();
+	if ($smcFunc['db_num_rows']($request) != 1) {
+			return array();
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
@@ -1087,8 +1153,9 @@ 
 		$temp = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id']))
-				continue;
+			if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id'])) {
+							continue;
+			}
 
 			$temp[$row['id_attach']] = $row;
 		}
@@ -1117,8 +1184,9 @@ 
 {
 	global $modSettings, $txt, $scripturl, $sourcedir, $smcFunc;
 
-	if (empty($attachments) || empty($attachments[$id_msg]))
-		return array();
+	if (empty($attachments) || empty($attachments[$id_msg])) {
+			return array();
+	}
 
 	// Set up the attachment info - based on code by Meriadoc.
 	$attachmentData = array();
@@ -1142,11 +1210,13 @@ 
 			);
 
 			// If something is unapproved we'll note it so we can sort them.
-			if (!$attachment['approved'])
-				$have_unapproved = true;
+			if (!$attachment['approved']) {
+							$have_unapproved = true;
+			}
 
-			if (!$attachmentData[$i]['is_image'])
-				continue;
+			if (!$attachmentData[$i]['is_image']) {
+							continue;
+			}
 
 			$attachmentData[$i]['real_width'] = $attachment['width'];
 			$attachmentData[$i]['width'] = $attachment['width'];
@@ -1167,11 +1237,11 @@ 
 						// So what folder are we putting this image in?
 						if (!empty($modSettings['currentAttachmentUploadDir']))
 						{
-							if (!is_array($modSettings['attachmentUploadDir']))
-								$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+							if (!is_array($modSettings['attachmentUploadDir'])) {
+															$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+							}
 							$id_folder_thumb = $modSettings['currentAttachmentUploadDir'];
-						}
-						else
+						} else
 						{
 							$id_folder_thumb = 1;
 						}
@@ -1185,10 +1255,11 @@ 
 						$thumb_ext = isset($context['validImageTypes'][$size[2]]) ? $context['validImageTypes'][$size[2]] : '';
 
 						// Figure out the mime type.
-						if (!empty($size['mime']))
-							$thumb_mime = $size['mime'];
-						else
-							$thumb_mime = 'image/' . $thumb_ext;
+						if (!empty($size['mime'])) {
+													$thumb_mime = $size['mime'];
+						} else {
+													$thumb_mime = 'image/' . $thumb_ext;
+						}
 
 						$thumb_filename = $attachment['filename'] . '_thumb';
 						$thumb_hash = getAttachmentFilename($thumb_filename, false, null, true);
@@ -1235,11 +1306,12 @@ 
 				}
 			}
 
-			if (!empty($attachment['id_thumb']))
-				$attachmentData[$i]['thumbnail'] = array(
+			if (!empty($attachment['id_thumb'])) {
+							$attachmentData[$i]['thumbnail'] = array(
 					'id' => $attachment['id_thumb'],
 					'href' => $scripturl . '?action=dlattach;topic=' . $attachment['topic'] . '.0;attach=' . $attachment['id_thumb'] . ';image',
 				);
+			}
 			$attachmentData[$i]['thumbnail']['has_thumb'] = !empty($attachment['id_thumb']);
 
 			// If thumbnails are disabled, check the maximum size of the image.
@@ -1249,30 +1321,31 @@ 
 				{
 					$attachmentData[$i]['width'] = $modSettings['max_image_width'];
 					$attachmentData[$i]['height'] = floor($attachment['height'] * $modSettings['max_image_width'] / $attachment['width']);
-				}
-				elseif (!empty($modSettings['max_image_width']))
+				} elseif (!empty($modSettings['max_image_width']))
 				{
 					$attachmentData[$i]['width'] = floor($attachment['width'] * $modSettings['max_image_height'] / $attachment['height']);
 					$attachmentData[$i]['height'] = $modSettings['max_image_height'];
 				}
-			}
-			elseif ($attachmentData[$i]['thumbnail']['has_thumb'])
+			} elseif ($attachmentData[$i]['thumbnail']['has_thumb'])
 			{
 				// If the image is too large to show inline, make it a popup.
-				if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height'])))
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
-				else
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height']))) {
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
+				} else {
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				}
 			}
 
-			if (!$attachmentData[$i]['thumbnail']['has_thumb'])
-				$attachmentData[$i]['downloads']++;
+			if (!$attachmentData[$i]['thumbnail']['has_thumb']) {
+							$attachmentData[$i]['downloads']++;
+			}
 		}
 	}
 
 	// Do we need to instigate a sort?
-	if ($have_unapproved)
-		usort($attachmentData, 'approved_attach_sort');
+	if ($have_unapproved) {
+			usort($attachmentData, 'approved_attach_sort');
+	}
 
 	return $attachmentData;
 }

Sources/RemoveTopic.php

Braces +267 added lines, -200 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /*	The contents of this file handle the deletion of topics, posts, and related
 	paraphernalia.  It has the following functions:
@@ -37,8 +38,9 @@ 
 	require_once($sourcedir . '/Subs-Post.php');
 
 	// Trying to fool us around, are we?
-	if (empty($topic))
-		redirectexit();
+	if (empty($topic)) {
+			redirectexit();
+	}
 
 	removeDeleteConcurrence();
 
@@ -55,20 +57,23 @@ 
 	list ($starter, $subject, $approved, $locked) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
-	if ($starter == $user_info['id'] && !allowedTo('remove_any'))
-		isAllowedTo('remove_own');
-	else
-		isAllowedTo('remove_any');
+	if ($starter == $user_info['id'] && !allowedTo('remove_any')) {
+			isAllowedTo('remove_own');
+	} else {
+			isAllowedTo('remove_any');
+	}
 
 	// Can they see the topic?
-	if ($modSettings['postmod_active'] && !$approved && $starter != $user_info['id'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$approved && $starter != $user_info['id']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Ok, we got that far, but is it locked?
 	if ($locked)
 	{
-		if (!($locked == 1 && $starter == $user_info['id'] || allowedTo('lock_any')))
-			fatal_lang_error('cannot_remove_locked', 'user');
+		if (!($locked == 1 && $starter == $user_info['id'] || allowedTo('lock_any'))) {
+					fatal_lang_error('cannot_remove_locked', 'user');
+		}
 	}
 
 	// Notify people that this topic has been removed.
@@ -77,8 +82,9 @@ 
 	removeTopics($topic);
 
 	// Note, only log topic ID in native form if it's not gone forever.
-	if (allowedTo('remove_any') || (allowedTo('remove_own') && $starter == $user_info['id']))
-		logAction('remove', array((empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $board ? 'topic' : 'old_topic_id') => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
+	if (allowedTo('remove_any') || (allowedTo('remove_own') && $starter == $user_info['id'])) {
+			logAction('remove', array((empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $board ? 'topic' : 'old_topic_id') => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
+	}
 
 	redirectexit('board=' . $board . '.0');
 }
@@ -96,8 +102,9 @@ 
 	$_REQUEST['msg'] = (int) $_REQUEST['msg'];
 
 	// Is $topic set?
-	if (empty($topic) && isset($_REQUEST['topic']))
-		$topic = (int) $_REQUEST['topic'];
+	if (empty($topic) && isset($_REQUEST['topic'])) {
+			$topic = (int) $_REQUEST['topic'];
+	}
 
 	removeDeleteConcurrence();
 
@@ -116,44 +123,48 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Verify they can see this!
-	if ($modSettings['postmod_active'] && !$approved && !empty($poster) && $poster != $user_info['id'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$approved && !empty($poster) && $poster != $user_info['id']) {
+			isAllowedTo('approve_posts');
+	}
 
 	if ($poster == $user_info['id'])
 	{
 		if (!allowedTo('delete_own'))
 		{
-			if ($starter == $user_info['id'] && !allowedTo('delete_any'))
-				isAllowedTo('delete_replies');
-			elseif (!allowedTo('delete_any'))
-				isAllowedTo('delete_own');
+			if ($starter == $user_info['id'] && !allowedTo('delete_any')) {
+							isAllowedTo('delete_replies');
+			} elseif (!allowedTo('delete_any')) {
+							isAllowedTo('delete_own');
+			}
+		} elseif (!allowedTo('delete_any') && ($starter != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $post_time + $modSettings['edit_disable_time'] * 60 < time()) {
+					fatal_lang_error('modify_post_time_passed', false);
 		}
-		elseif (!allowedTo('delete_any') && ($starter != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $post_time + $modSettings['edit_disable_time'] * 60 < time())
-			fatal_lang_error('modify_post_time_passed', false);
+	} elseif ($starter == $user_info['id'] && !allowedTo('delete_any')) {
+			isAllowedTo('delete_replies');
+	} else {
+			isAllowedTo('delete_any');
 	}
-	elseif ($starter == $user_info['id'] && !allowedTo('delete_any'))
-		isAllowedTo('delete_replies');
-	else
-		isAllowedTo('delete_any');
 
 	// If the full topic was removed go back to the board.
 	$full_topic = removeMessage($_REQUEST['msg']);
 
-	if (allowedTo('delete_any') && (!allowedTo('delete_own') || $poster != $user_info['id']))
-		logAction('delete', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+	if (allowedTo('delete_any') && (!allowedTo('delete_own') || $poster != $user_info['id'])) {
+			logAction('delete', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+	}
 
 	// We want to redirect back to recent action.
-	if (isset($_REQUEST['modcenter']))
-		redirectexit('action=moderate;area=reportedposts;done');
-	elseif (isset($_REQUEST['recent']))
-		redirectexit('action=recent');
-	elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u']))
-		redirectexit('action=profile;u=' . $_REQUEST['u'] . ';area=showposts;start=' . $_REQUEST['start']);
-	elseif ($full_topic)
-		redirectexit('board=' . $board . '.0');
-	else
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
-}
+	if (isset($_REQUEST['modcenter'])) {
+			redirectexit('action=moderate;area=reportedposts;done');
+	} elseif (isset($_REQUEST['recent'])) {
+			redirectexit('action=recent');
+	} elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u'])) {
+			redirectexit('action=profile;u=' . $_REQUEST['u'] . ';area=showposts;start=' . $_REQUEST['start']);
+	} elseif ($full_topic) {
+			redirectexit('board=' . $board . '.0');
+	} else {
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	}
+	}
 
 /**
  * So long as you are sure... all old posts will be gone.
@@ -167,8 +178,9 @@ 
 	checkSession('post', 'admin');
 
 	// No boards at all?  Forget it then :/.
-	if (empty($_POST['boards']))
-		redirectexit('action=admin;area=maintain;sa=topics');
+	if (empty($_POST['boards'])) {
+			redirectexit('action=admin;area=maintain;sa=topics');
+	}
 
 	// This should exist, but we can make sure.
 	$_POST['delete_type'] = isset($_POST['delete_type']) ? $_POST['delete_type'] : 'nothing';
@@ -222,8 +234,9 @@ 
 		$condition_params
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[] = $row['id_topic'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[] = $row['id_topic'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	removeTopics($topics, false, true);
@@ -247,11 +260,13 @@ 
 	global $sourcedir, $modSettings, $smcFunc;
 
 	// Nothing to do?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 	// Only a single topic.
-	if (is_numeric($topics))
-		$topics = array($topics);
+	if (is_numeric($topics)) {
+			$topics = array($topics);
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -276,8 +291,9 @@ 
 		);
 		if ($smcFunc['db_num_rows']($requestMembers) > 0)
 		{
-			while ($rowMembers = $smcFunc['db_fetch_assoc']($requestMembers))
-				updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+			while ($rowMembers = $smcFunc['db_fetch_assoc']($requestMembers)) {
+							updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+			}
 		}
 		$smcFunc['db_free_result']($requestMembers);
 	}
@@ -303,8 +319,9 @@ 
 			$recycleTopics = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (function_exists('apache_reset_timeout'))
-					@apache_reset_timeout();
+				if (function_exists('apache_reset_timeout')) {
+									@apache_reset_timeout();
+				}
 
 				$recycleTopics[] = $row['id_topic'];
 
@@ -346,20 +363,22 @@ 
 
 			// Topics that were recycled don't need to be deleted, so subtract them.
 			$topics = array_diff($topics, $recycleTopics);
+		} else {
+					$smcFunc['db_free_result']($request);
 		}
-		else
-			$smcFunc['db_free_result']($request);
 	}
 
 	// Still topics left to delete?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 
 	// Callback for search APIs to do their thing
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if ($searchAPI->supportsMethod('topicsRemoved'))
-		$searchAPI->topicsRemoved($topics);
+	if ($searchAPI->supportsMethod('topicsRemoved')) {
+			$searchAPI->topicsRemoved($topics);
+	}
 
 	$adjustBoards = array();
 
@@ -391,10 +410,11 @@ 
 		$adjustBoards[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 
 		// 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'];
+		if ($row['approved']) {
+					$adjustBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
+		} else {
+					$adjustBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -403,8 +423,9 @@ 
 		// Decrease the posts/topics...
 		foreach ($adjustBoards as $stats)
 		{
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
@@ -438,8 +459,9 @@ 
 		)
 	);
 	$polls = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$polls[] = $row['id_poll'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$polls[] = $row['id_poll'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($polls))
@@ -492,8 +514,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$words = array_merge($words, text2words($row['body'], $customIndexSettings['bytes_per_word'], true));
 			$messages[] = $row['id_msg'];
@@ -501,8 +524,8 @@ 
 		$smcFunc['db_free_result']($request);
 		$words = array_unique($words);
 
-		if (!empty($words) && !empty($messages))
-			$smcFunc['db_query']('', '
+		if (!empty($words) && !empty($messages)) {
+					$smcFunc['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})',
@@ -511,6 +534,7 @@ 
 					'message_list' => $messages,
 				)
 			);
+		}
 	}
 
 	// Delete anything related to the topic.
@@ -569,8 +593,9 @@ 
 
 	require_once($sourcedir . '/Subs-Post.php');
 	$updates = array();
-	foreach ($adjustBoards as $stats)
-		$updates[] = $stats['id_board'];
+	foreach ($adjustBoards as $stats) {
+			$updates[] = $stats['id_board'];
+	}
 	updateLastMessages($updates);
 }
 
@@ -587,8 +612,9 @@ 
 {
 	global $board, $sourcedir, $modSettings, $user_info, $smcFunc;
 
-	if (empty($message) || !is_numeric($message))
-		return false;
+	if (empty($message) || !is_numeric($message)) {
+			return false;
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -607,8 +633,9 @@ 
 			'id_msg' => $message,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return false;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return false;
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -629,54 +656,57 @@ 
 				{
 					if ($row['id_member_poster'] == $user_info['id'])
 					{
-						if (!$delete_replies)
-							fatal_lang_error('cannot_delete_replies', 'permission');
+						if (!$delete_replies) {
+													fatal_lang_error('cannot_delete_replies', 'permission');
+						}
+					} else {
+											fatal_lang_error('cannot_delete_own', 'permission');
 					}
-					else
-						fatal_lang_error('cannot_delete_own', 'permission');
+				} elseif (($row['id_member_poster'] != $user_info['id'] || !$delete_replies) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
+									fatal_lang_error('modify_post_time_passed', false);
 				}
-				elseif (($row['id_member_poster'] != $user_info['id'] || !$delete_replies) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-					fatal_lang_error('modify_post_time_passed', false);
-			}
-			elseif ($row['id_member_poster'] == $user_info['id'])
+			} elseif ($row['id_member_poster'] == $user_info['id'])
 			{
-				if (!$delete_replies)
-					fatal_lang_error('cannot_delete_replies', 'permission');
+				if (!$delete_replies) {
+									fatal_lang_error('cannot_delete_replies', 'permission');
+				}
+			} else {
+							fatal_lang_error('cannot_delete_any', 'permission');
 			}
-			else
-				fatal_lang_error('cannot_delete_any', 'permission');
 		}
 
 		// Can't delete an unapproved message, if you can't see it!
 		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !(in_array(0, $delete_any) || in_array($row['id_board'], $delete_any)))
 		{
 			$approve_posts = boardsAllowedTo('approve_posts');
-			if (!in_array(0, $approve_posts) && !in_array($row['id_board'], $approve_posts))
-				return false;
+			if (!in_array(0, $approve_posts) && !in_array($row['id_board'], $approve_posts)) {
+							return false;
+			}
 		}
-	}
-	else
+	} else
 	{
 		// Check permissions to delete this message.
 		if ($row['id_member'] == $user_info['id'])
 		{
 			if (!allowedTo('delete_own'))
 			{
-				if ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any'))
-					isAllowedTo('delete_replies');
-				elseif (!allowedTo('delete_any'))
-					isAllowedTo('delete_own');
+				if ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any')) {
+									isAllowedTo('delete_replies');
+				} elseif (!allowedTo('delete_any')) {
+									isAllowedTo('delete_own');
+				}
+			} elseif (!allowedTo('delete_any') && ($row['id_member_poster'] != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
+							fatal_lang_error('modify_post_time_passed', false);
 			}
-			elseif (!allowedTo('delete_any') && ($row['id_member_poster'] != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-				fatal_lang_error('modify_post_time_passed', false);
+		} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any')) {
+					isAllowedTo('delete_replies');
+		} else {
+					isAllowedTo('delete_any');
 		}
-		elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any'))
-			isAllowedTo('delete_replies');
-		else
-			isAllowedTo('delete_any');
 
-		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !allowedTo('delete_own'))
-			isAllowedTo('approve_posts');
+		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !allowedTo('delete_own')) {
+					isAllowedTo('approve_posts');
+		}
 	}
 
 	// Delete the *whole* topic, but only if the topic consists of one message.
@@ -692,31 +722,34 @@ 
 				$remove_own = in_array(0, $remove_own) || in_array($row['id_board'], $remove_own);
 			}
 
-			if ($row['id_member'] != $user_info['id'] && !$remove_any)
-				fatal_lang_error('cannot_remove_any', 'permission');
-			elseif (!$remove_any && !$remove_own)
-				fatal_lang_error('cannot_remove_own', 'permission');
-		}
-		else
+			if ($row['id_member'] != $user_info['id'] && !$remove_any) {
+							fatal_lang_error('cannot_remove_any', 'permission');
+			} elseif (!$remove_any && !$remove_own) {
+							fatal_lang_error('cannot_remove_own', 'permission');
+			}
+		} else
 		{
 			// Check permissions to delete a whole topic.
-			if ($row['id_member'] != $user_info['id'])
-				isAllowedTo('remove_any');
-			elseif (!allowedTo('remove_any'))
-				isAllowedTo('remove_own');
+			if ($row['id_member'] != $user_info['id']) {
+							isAllowedTo('remove_any');
+			} elseif (!allowedTo('remove_any')) {
+							isAllowedTo('remove_own');
+			}
 		}
 
 		// ...if there is only one post.
-		if (!empty($row['num_replies']))
-			fatal_lang_error('delFirstPost', false);
+		if (!empty($row['num_replies'])) {
+					fatal_lang_error('delFirstPost', false);
+		}
 
 		removeTopics($row['id_topic']);
 		return true;
 	}
 
 	// Deleting a recycled message can not lower anyone's post count.
-	if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
-		$decreasePostCount = false;
+	if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
+			$decreasePostCount = false;
+	}
 
 	// This is the last post, update the last post on the board.
 	if ($row['id_last_msg'] == $message)
@@ -755,8 +788,8 @@ 
 		);
 	}
 	// Only decrease post counts.
-	else
-		$smcFunc['db_query']('', '
+	else {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}topics
 			SET ' . ($row['approved'] ? '
 				num_replies = CASE WHEN num_replies = {int:no_replies} THEN 0 ELSE num_replies - 1 END' : '
@@ -768,6 +801,7 @@ 
 				'id_topic' => $row['id_topic'],
 			)
 		);
+	}
 
 	// Default recycle to false.
 	$recycle = false;
@@ -787,8 +821,9 @@ 
 				'recycle_board' => $modSettings['recycle_board'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('recycle_no_valid_board');
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('recycle_no_valid_board');
+		}
 		list ($isRead, $last_board_msg) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -807,8 +842,8 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Insert a new topic in the recycle board if $id_recycle_topic is empty.
-		if (empty($id_recycle_topic))
-			$id_topic = $smcFunc['db_insert']('',
+		if (empty($id_recycle_topic)) {
+					$id_topic = $smcFunc['db_insert']('',
 				'{db_prefix}topics',
 				array(
 					'id_board' => 'int', 'id_member_started' => 'int', 'id_member_updated' => 'int', 'id_first_msg' => 'int',
@@ -821,6 +856,7 @@ 
 				array('id_topic'),
 				1
 			);
+		}
 
 		// Capture the ID of the new topic...
 		$topicID = empty($id_recycle_topic) ? $id_topic : $id_recycle_topic;
@@ -858,22 +894,24 @@ 
 			);
 
 			// Mark recycled topic as read.
-			if (!$user_info['is_guest'])
-				$smcFunc['db_insert']('replace',
+			if (!$user_info['is_guest']) {
+							$smcFunc['db_insert']('replace',
 					'{db_prefix}log_topics',
 					array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
 					array($topicID, $user_info['id'], $modSettings['maxMsgID'], 0),
 					array('id_topic', 'id_member')
 				);
+			}
 
 			// Mark recycle board as seen, if it was marked as seen before.
-			if (!empty($isRead) && !$user_info['is_guest'])
-				$smcFunc['db_insert']('replace',
+			if (!empty($isRead) && !$user_info['is_guest']) {
+							$smcFunc['db_insert']('replace',
 					'{db_prefix}log_boards',
 					array('id_board' => 'int', 'id_member' => 'int', 'id_msg' => 'int'),
 					array($modSettings['recycle_board'], $user_info['id'], $modSettings['maxMsgID']),
 					array('id_board', 'id_member')
 				);
+			}
 
 			// Add one topic and post to the recycle bin board.
 			$smcFunc['db_query']('', '
@@ -891,8 +929,8 @@ 
 			);
 
 			// Lets increase the num_replies, and the first/last message ID as appropriate.
-			if (!empty($id_recycle_topic))
-				$smcFunc['db_query']('', '
+			if (!empty($id_recycle_topic)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET num_replies = num_replies + 1' .
 						($message > $last_topic_msg ? ', id_last_msg = {int:id_merged_msg}' : '') .
@@ -903,6 +941,7 @@ 
 						'id_merged_msg' => $message,
 					)
 				);
+			}
 
 			// Make sure this message isn't getting deleted later on.
 			$recycle = true;
@@ -912,8 +951,8 @@ 
 		}
 
 		// If it wasn't approved don't keep it in the queue.
-		if (!$row['approved'])
-			$smcFunc['db_query']('', '
+		if (!$row['approved']) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}approval_queue
 				WHERE id_msg = {int:id_msg}
 					AND id_attach = {int:id_attach}',
@@ -922,6 +961,7 @@ 
 					'id_attach' => 0,
 				)
 			);
+		}
 	}
 
 	$smcFunc['db_query']('', '
@@ -939,8 +979,9 @@ 
 
 	// If the poster was registered and the board this message was on incremented
 	// the member's posts when it was posted, decrease his or her post count.
-	if (!empty($row['id_member']) && $decreasePostCount && empty($row['count_posts']) && $row['approved'])
-		updateMemberData($row['id_member'], array('posts' => '-'));
+	if (!empty($row['id_member']) && $decreasePostCount && empty($row['count_posts']) && $row['approved']) {
+			updateMemberData($row['id_member'], array('posts' => '-'));
+	}
 
 	// Only remove posts if they're not recycled.
 	if (!$recycle)
@@ -948,8 +989,9 @@ 
 		// Callback for search APIs to do their thing
 		require_once($sourcedir . '/Search.php');
 		$searchAPI = findSearchAPI();
-		if ($searchAPI->supportsMethod('postRemoved'))
-			$searchAPI->postRemoved($message);
+		if ($searchAPI->supportsMethod('postRemoved')) {
+					$searchAPI->postRemoved($message);
+		}
 
 		// Remove the message!
 		$smcFunc['db_query']('', '
@@ -964,8 +1006,8 @@ 
 		{
 			$customIndexSettings = $smcFunc['json_decode']($modSettings['search_custom_index_config'], true);
 			$words = text2words($row['body'], $customIndexSettings['bytes_per_word'], true);
-			if (!empty($words))
-				$smcFunc['db_query']('', '
+			if (!empty($words)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}log_search_words
 					WHERE id_word IN ({array_int:word_list})
 						AND id_msg = {int:id_msg}',
@@ -974,6 +1016,7 @@ 
 						'id_msg' => $message,
 					)
 				);
+			}
 		}
 
 		// Delete attachment(s) if they exist.
@@ -997,10 +1040,11 @@ 
 
 	// And now to update the last message of each board we messed with.
 	require_once($sourcedir . '/Subs-Post.php');
-	if ($recycle)
-		updateLastMessages(array($row['id_board'], $modSettings['recycle_board']));
-	else
-		updateLastMessages($row['id_board']);
+	if ($recycle) {
+			updateLastMessages(array($row['id_board'], $modSettings['recycle_board']));
+	} else {
+			updateLastMessages($row['id_board']);
+	}
 
 	// Close any moderation reports for this message.
 	$smcFunc['db_query']('', '
@@ -1033,8 +1077,9 @@ 
 	checkSession('get');
 
 	// Is recycled board enabled?
-	if (empty($modSettings['recycle_enable']))
-		fatal_lang_error('restored_disabled', 'critical');
+	if (empty($modSettings['recycle_enable'])) {
+			fatal_lang_error('restored_disabled', 'critical');
+	}
 
 	// Can we be in here?
 	isAllowedTo('move_any', $modSettings['recycle_board']);
@@ -1049,8 +1094,9 @@ 
 	if (!empty($_REQUEST['msgs']))
 	{
 		$msgs = explode(',', $_REQUEST['msgs']);
-		foreach ($msgs as $k => $msg)
-			$msgs[$k] = (int) $msg;
+		foreach ($msgs as $k => $msg) {
+					$msgs[$k] = (int) $msg;
+		}
 
 		// Get the id_previous_board and id_previous_topic.
 		$request = $smcFunc['db_query']('', '
@@ -1084,8 +1130,8 @@ 
 			}
 
 			$previous_topics[] = $row['id_previous_topic'];
-			if (empty($actioned_messages[$row['id_previous_topic']]))
-				$actioned_messages[$row['id_previous_topic']] = array(
+			if (empty($actioned_messages[$row['id_previous_topic']])) {
+							$actioned_messages[$row['id_previous_topic']] = array(
 					'msgs' => array(),
 					'count_posts' => $row['count_posts'],
 					'subject' => $row['subject'],
@@ -1095,17 +1141,20 @@ 
 					'current_board' => $row['id_board'],
 					'members' => array(),
 				);
+			}
 
 			$actioned_messages[$row['id_previous_topic']]['msgs'][$row['id_msg']] = $row['subject'];
-			if ($row['id_member'])
-				$actioned_messages[$row['id_previous_topic']]['members'][] = $row['id_member'];
+			if ($row['id_member']) {
+							$actioned_messages[$row['id_previous_topic']]['members'][] = $row['id_member'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
 		// Check for topics we are going to fully restore.
-		foreach ($actioned_messages as $topic => $data)
-			if (in_array($topic, $topics_to_restore))
+		foreach ($actioned_messages as $topic => $data) {
+					if (in_array($topic, $topics_to_restore))
 				unset($actioned_messages[$topic]);
+		}
 
 		// Load any previous topics to check they exist.
 		if (!empty($previous_topics))
@@ -1120,11 +1169,12 @@ 
 				)
 			);
 			$previous_topics = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$previous_topics[$row['id_topic']] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$previous_topics[$row['id_topic']] = array(
 					'board' => $row['id_board'],
 					'subject' => $row['subject'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -1146,11 +1196,11 @@ 
 				// Log em.
 				logAction('restore_posts', array('topic' => $topic, 'subject' => $previous_topics[$topic]['subject'], 'board' => empty($data['previous_board']) ? $data['possible_prev_board'] : $data['previous_board']));
 				$messages = array_merge(array_keys($data['msgs']), $messages);
-			}
-			else
+			} else
 			{
-				foreach ($data['msgs'] as $msg)
-					$unfound_messages[$msg['id']] = $msg['subject'];
+				foreach ($data['msgs'] as $msg) {
+									$unfound_messages[$msg['id']] = $msg['subject'];
+				}
 			}
 		}
 	}
@@ -1159,8 +1209,9 @@ 
 	if (!empty($_REQUEST['topics']))
 	{
 		$topics = explode(',', $_REQUEST['topics']);
-		foreach ($topics as $id)
-			$topics_to_restore[] = (int) $id;
+		foreach ($topics as $id) {
+					$topics_to_restore[] = (int) $id;
+		}
 	}
 
 	if (!empty($topics_to_restore))
@@ -1214,8 +1265,9 @@ 
 					)
 				);
 
-				while ($member = $smcFunc['db_fetch_assoc']($request2))
-					updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+				while ($member = $smcFunc['db_fetch_assoc']($request2)) {
+									updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+				}
 				$smcFunc['db_free_result']($request2);
 			}
 
@@ -1226,8 +1278,9 @@ 
 	}
 
 	// Didn't find some things?
-	if (!empty($unfound_messages))
-		fatal_lang_error('restore_not_found', false, array(implode('<br>', $unfound_messages)));
+	if (!empty($unfound_messages)) {
+			fatal_lang_error('restore_not_found', false, array(implode('<br>', $unfound_messages)));
+	}
 
 	// Just send them to the index if they get here.
 	redirectexit();
@@ -1247,12 +1300,14 @@ 
 	//!!! This really needs to be rewritten to take a load of messages from ANY topic, it's also inefficient.
 
 	// Is it an array?
-	if (!is_array($msgs))
-		$msgs = array($msgs);
+	if (!is_array($msgs)) {
+			$msgs = array($msgs);
+	}
 
 	// Lets make sure they are int.
-	foreach ($msgs as $key => $msg)
-		$msgs[$key] = (int) $msg;
+	foreach ($msgs as $key => $msg) {
+			$msgs[$key] = (int) $msg;
+	}
 
 	// Get the source information.
 	$request = $smcFunc['db_query']('', '
@@ -1295,8 +1350,9 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateMemberData($row['id_member'], array('posts' => '+'));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateMemberData($row['id_member'], array('posts' => '+'));
+		}
 	}
 
 	// Time to move the messages.
@@ -1332,13 +1388,15 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_first_msg'] < $target_topic_data['id_first_msg'])
-			$target_topic_data['id_first_msg'] = $row['id_first_msg'];
+		if ($row['id_first_msg'] < $target_topic_data['id_first_msg']) {
+					$target_topic_data['id_first_msg'] = $row['id_first_msg'];
+		}
 		$target_topic_data['id_last_msg'] = $row['id_last_msg'];
-		if (!$row['approved'])
-			$target_topic_data['unapproved_posts'] = $row['message_count'];
-		else
-			$target_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+		if (!$row['approved']) {
+					$target_topic_data['unapproved_posts'] = $row['message_count'];
+		} else {
+					$target_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1397,13 +1455,15 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['id_first_msg'] < $source_topic_data['id_first_msg'])
-				$source_topic_data['id_first_msg'] = $row['id_first_msg'];
+			if ($row['id_first_msg'] < $source_topic_data['id_first_msg']) {
+							$source_topic_data['id_first_msg'] = $row['id_first_msg'];
+			}
 			$source_topic_data['id_last_msg'] = $row['id_last_msg'];
-			if (!$row['approved'])
-				$source_topic_data['unapproved_posts'] = $row['message_count'];
-			else
-				$source_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+			if (!$row['approved']) {
+							$source_topic_data['unapproved_posts'] = $row['message_count'];
+			} else {
+							$source_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -1467,10 +1527,12 @@ 
 
 	// Subject cache?
 	$cache_updates = array();
-	if ($target_first_msg != $target_topic_data['id_first_msg'])
-		$cache_updates[] = $target_topic_data['id_first_msg'];
-	if (!empty($source_topic_data['id_first_msg']) && $from_first_msg != $source_topic_data['id_first_msg'])
-		$cache_updates[] = $source_topic_data['id_first_msg'];
+	if ($target_first_msg != $target_topic_data['id_first_msg']) {
+			$cache_updates[] = $target_topic_data['id_first_msg'];
+	}
+	if (!empty($source_topic_data['id_first_msg']) && $from_first_msg != $source_topic_data['id_first_msg']) {
+			$cache_updates[] = $source_topic_data['id_first_msg'];
+	}
 
 	if (!empty($cache_updates))
 	{
@@ -1482,8 +1544,9 @@ 
 				'first_messages' => $cache_updates,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateStats('subject', $row['id_topic'], $row['subject']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateStats('subject', $row['id_topic'], $row['subject']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1499,22 +1562,26 @@ 
 	global $modSettings, $board, $scripturl, $context;
 
 	// No recycle no need to go further
-	if (empty($modSettings['recycle_enable']) || empty($modSettings['recycle_board']))
-		return false;
+	if (empty($modSettings['recycle_enable']) || empty($modSettings['recycle_board'])) {
+			return false;
+	}
 
 	// If it's confirmed go on and delete (from recycle)
-	if (isset($_GET['confirm_delete']))
-		return true;
+	if (isset($_GET['confirm_delete'])) {
+			return true;
+	}
 
-	if (empty($board))
-		return false;
+	if (empty($board)) {
+			return false;
+	}
 
-	if ($modSettings['recycle_board'] != $board)
-		return true;
-	elseif (isset($_REQUEST['msg']))
-		$confirm_url = $scripturl . '?action=deletemsg;confirm_delete;topic=' . $context['current_topic'] . '.0;msg=' . $_REQUEST['msg'] . ';' . $context['session_var'] . '=' . $context['session_id'];
-	else
-		$confirm_url = $scripturl . '?action=removetopic2;confirm_delete;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id'];
+	if ($modSettings['recycle_board'] != $board) {
+			return true;
+	} elseif (isset($_REQUEST['msg'])) {
+			$confirm_url = $scripturl . '?action=deletemsg;confirm_delete;topic=' . $context['current_topic'] . '.0;msg=' . $_REQUEST['msg'] . ';' . $context['session_var'] . '=' . $context['session_id'];
+	} else {
+			$confirm_url = $scripturl . '?action=removetopic2;confirm_delete;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id'];
+	}
 
 	fatal_lang_error('post_already_deleted', false, array($confirm_url));
 }

Sources/Subs-ReportedContent.php

Braces +70 added lines, -58 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Updates a report with the given parameters. Logs each action via logAction()
@@ -28,19 +29,20 @@ 
 	global $smcFunc, $user_info, $context;
 
 	// Don't bother.
-	if (empty($action) || empty($report_id))
-		return false;
+	if (empty($action) || empty($report_id)) {
+			return false;
+	}
 
 	// Add the "_all" thingy.
-	if ($action == 'ignore')
-		$action = 'ignore_all';
+	if ($action == 'ignore') {
+			$action = 'ignore_all';
+	}
 
 	// We don't need the board query for reported members
 	if ($context['report_type'] == 'members')
 	{
 		$board_query = '';
-	}
-	else
+	} else
 	{
 		$board_query = ' AND ' . $user_info['mod_cache']['bq'];
 	}
@@ -76,17 +78,17 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$extra[$row['id_report']] = array(
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$extra[$row['id_report']] = array(
 				'report' => $row['id_report'],
 				'board' => $row['id_board'],
 				'message' => $row['id_msg'],
 				'topic' => $row['id_topic'],
 			);
+		}
 
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT id_report, id_member, membername
@@ -97,28 +99,32 @@ 
 			)
 		);
 
-		while($row = $smcFunc['db_fetch_assoc']($request))
-			$extra[$row['id_report']] = array(
+		while($row = $smcFunc['db_fetch_assoc']($request)) {
+					$extra[$row['id_report']] = array(
 				'report' => $row['id_report'],
 				'member' => $row['id_member'],
 			);
+		}
 
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Back to "ignore".
-	if ($action == 'ignore_all')
-		$action = 'ignore';
+	if ($action == 'ignore_all') {
+			$action = 'ignore';
+	}
 
 	$log_report = $action == 'ignore' ? (!empty($value) ? 'ignore' : 'unignore') : (!empty($value) ? 'close' : 'open');
 
-	if ($context['report_type'] == 'members')
-		$log_report .= '_user';
+	if ($context['report_type'] == 'members') {
+			$log_report .= '_user';
+	}
 
 	// Log this action.
-	if (!empty($extra))
-		foreach ($extra as $report)
+	if (!empty($extra)) {
+			foreach ($extra as $report)
 			logAction($log_report . '_report', $report);
+	}
 
 	// Time to update.
 	updateSettings(array('last_mod_report_action' => time()));
@@ -140,14 +146,12 @@ 
 	if ($context['report_type'] == 'members')
 	{
 		$and = 'lr.id_board = 0';
-	}
-	else
+	} else
 	{
 		if ($user_info['mod_cache']['bq'] == '1=1' || $user_info['mod_cache']['bq'] == '0=1')
 		{
 			$bq = $user_info['mod_cache']['bq'];
-		}
-		else
+		} else
 		{
 			$bq = 'lr.' . $user_info['mod_cache']['bq'];
 		}
@@ -203,8 +207,7 @@ 
 				'max' => 10,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT lr.id_report, lr.id_msg, lr.id_topic, lr.id_board, lr.id_member, lr.subject, lr.body,
@@ -252,8 +255,7 @@ 
 					'href' => $scripturl . '?action=profile;u=' . $row['id_user'],
 				),
 			);
-		}
-		else
+		} else
 		{
 			$report_boards_ids[] = $row['id_board'];
 			$extraDetails = array(
@@ -293,14 +295,16 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$board_names[$row['id_board']] = $row['name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$board_names[$row['id_board']] = $row['name'];
+		}
 
 		$smcFunc['db_free_result']($request);
 
-		foreach ($reports as $id_report => $report)
-			if (!empty($board_names[$report['topic']['id_board']]))
+		foreach ($reports as $id_report => $report) {
+					if (!empty($board_names[$report['topic']['id_board']]))
 				$reports[$id_report]['topic']['board_name'] = $board_names[$report['topic']['id_board']];
+		}
 	}
 
 	// Now get all the people who reported it.
@@ -350,10 +354,11 @@ 
 {
 	global $user_info, $smcFunc;
 
-	if ($type == 'members')
-		$bq = '';
-	else
-		$bq = '	AND ' . $user_info['mod_cache']['bq'];
+	if ($type == 'members') {
+			$bq = '';
+	} else {
+			$bq = '	AND ' . $user_info['mod_cache']['bq'];
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT COUNT(*)
@@ -392,8 +397,9 @@ 
 {
 	global $smcFunc, $user_info, $context;
 
-	if (empty($report_id))
-		return false;
+	if (empty($report_id)) {
+			return false;
+	}
 
 	// We don't need all this info if we're only getting user info
 	if ($context['report_type'] == 'members')
@@ -411,8 +417,7 @@ 
 				'id_report' => $report_id,
 			)
 		);
-	}
-	else
+	} else
 	{
 		// Get the report details, need this so we can limit access to a particular board.
 		$request = $smcFunc['db_query']('', '
@@ -431,8 +436,9 @@ 
 	}
 
 	// So did we find anything?
-	if (!$smcFunc['db_num_rows']($request))
-		return false;
+	if (!$smcFunc['db_num_rows']($request)) {
+			return false;
+	}
 
 	// Woohoo we found a report and they can see it!
 	$row = $smcFunc['db_fetch_assoc']($request);
@@ -451,8 +457,9 @@ 
 {
 	global $smcFunc, $scripturl, $user_info, $txt;
 
-	if (empty($report_id))
-		return false;
+	if (empty($report_id)) {
+			return false;
+	}
 
 	$report = array(
 		'comments' => array(),
@@ -533,8 +540,9 @@ 
 {
 	global $smcFunc, $user_info;
 
-	if (empty($comment_id))
-		return false;
+	if (empty($comment_id)) {
+			return false;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_comment, id_notice, log_time, body, id_member
@@ -551,8 +559,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Add the permission
-	if (!empty($comment))
-		$comment['can_edit'] = allowedTo('admin_forum') || (($user_info['id'] == $comment['id_member']));
+	if (!empty($comment)) {
+			$comment['can_edit'] = allowedTo('admin_forum') || (($user_info['id'] == $comment['id_member']));
+	}
 
 	return $comment;
 }
@@ -568,8 +577,9 @@ 
 {
 	global $smcFunc, $user_info, $context;
 
-	if (empty($data))
-		return false;
+	if (empty($data)) {
+			return false;
+	}
 
 	$data = array_merge(array($user_info['id'], $user_info['name'], 'reportc', ''), $data);
 
@@ -598,8 +608,7 @@ 
 			'comment_id' => $last_comment,
 			'time' => time(),
 		);
-	}
-	else
+	} else
 	{
 		$prefix = 'Msg';
 		$data = array(
@@ -615,14 +624,15 @@ 
 	}
 
 	// And get ready to notify people.
-	if (!empty($report))
-		$smcFunc['db_insert']('insert',
+	if (!empty($report)) {
+			$smcFunc['db_insert']('insert',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			array('$sourcedir/tasks/' . $prefix . 'ReportReply-Notify.php', $prefix . 'ReportReply_Notify_Background', $smcFunc['json_encode']($data), 0),
 			array('id_task')
 		);
-}
+	}
+	}
 
 /**
  * Saves the new information whenever a moderator comment is edited.
@@ -635,8 +645,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($comment_id) || empty($edited_comment))
-		return false;
+	if (empty($comment_id) || empty($edited_comment)) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}log_comments
@@ -659,8 +670,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($comment_id))
-		return false;
+	if (empty($comment_id)) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}log_comments

Sources/Subs-Themes.php

Braces +67 added lines, -46 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Gets a single theme's info.
@@ -27,8 +28,9 @@ 
 	global $smcFunc, $modSettings;
 
 	// No data, no fun!
-	if (empty($id))
-		return false;
+	if (empty($id)) {
+			return false;
+	}
 
 	// Make sure $id is an int.
 	$id = (int) $id;
@@ -171,8 +173,9 @@ 
 	global $smcFunc, $sourcedir, $forum_version, $txt, $scripturl, $context;
 	global $explicit_images;
 
-	if (empty($path))
-		return false;
+	if (empty($path)) {
+			return false;
+	}
 
 	$xml_data = array();
 	$explicit_images = false;
@@ -229,9 +232,10 @@ 
 	);
 
 	// Assign the values to be stored.
-	foreach ($xml_elements as $var => $name)
-		if (!empty($theme_info_xml[$name]))
+	foreach ($xml_elements as $var => $name) {
+			if (!empty($theme_info_xml[$name]))
 			$xml_data[$var] = $theme_info_xml[$name];
+	}
 
 	// Add the supported versions.
 	$xml_data['install_for'] = $install_versions;
@@ -243,8 +247,9 @@ 
 		$explicit_images = true;
 	}
 
-	if (!empty($theme_info_xml['extra']))
-		$xml_data += $smcFunc['json_decode']($theme_info_xml['extra'], true);
+	if (!empty($theme_info_xml['extra'])) {
+			$xml_data += $smcFunc['json_decode']($theme_info_xml['extra'], true);
+	}
 
 	return $xml_data;
 }
@@ -262,12 +267,14 @@ 
 	global $settings, $explicit_images;
 
 	// External use? no problem!
-	if ($to_install)
-		$context['to_install'] = $to_install;
+	if ($to_install) {
+			$context['to_install'] = $to_install;
+	}
 
 	// One last check.
-	if (empty($context['to_install']['theme_dir']) || basename($context['to_install']['theme_dir']) == 'Themes')
-		fatal_lang_error('theme_install_invalid_dir', false);
+	if (empty($context['to_install']['theme_dir']) || basename($context['to_install']['theme_dir']) == 'Themes') {
+			fatal_lang_error('theme_install_invalid_dir', false);
+	}
 
 	// OK, is this a newer version of an already installed theme?
 	if (!empty($context['to_install']['version']))
@@ -291,8 +298,8 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Got something, lets figure it out what to do next.
-		if (!empty($to_update) && !empty($to_update['version']))
-			switch (compareVersions($context['to_install']['version'], $to_update['version']))
+		if (!empty($to_update) && !empty($to_update['version'])) {
+					switch (compareVersions($context['to_install']['version'], $to_update['version']))
 			{
 				case 1: // Got a newer version, update the old entry.
 					$smcFunc['db_query']('', '
@@ -306,6 +313,7 @@ 
 							'id_theme' => $to_update['id_theme'],
 						)
 					);
+		}
 
 					// Done with the update, tell the user about it.
 					$context['to_install']['updated'] = true;
@@ -371,13 +379,15 @@ 
 				$context['to_install']['base_theme_url'] = $temp['theme_url'];
 				$context['to_install']['base_theme_dir'] = $temp['theme_dir'];
 
-				if (empty($explicit_images) && !empty($context['to_install']['base_theme_url']))
-					$context['to_install']['theme_url'] = $context['to_install']['base_theme_url'];
+				if (empty($explicit_images) && !empty($context['to_install']['base_theme_url'])) {
+									$context['to_install']['theme_url'] = $context['to_install']['base_theme_url'];
+				}
 			}
 
 			// Nope, sorry, couldn't find any theme already installed.
-			else
-				fatal_lang_error('package_get_error_theme_no_based_on_found', false, $context['to_install']['based_on']);
+			else {
+							fatal_lang_error('package_get_error_theme_no_based_on_found', false, $context['to_install']['based_on']);
+			}
 		}
 
 		unset($context['to_install']['based_on']);
@@ -400,16 +410,18 @@ 
 	call_integration_hook('integrate_theme_install', array(&$context['to_install'], $id_theme));
 
 	$inserts = array();
-	foreach ($context['to_install'] as $var => $val)
-		$inserts[] = array($id_theme, $var, $val);
+	foreach ($context['to_install'] as $var => $val) {
+			$inserts[] = array($id_theme, $var, $val);
+	}
 
-	if (!empty($inserts))
-		$smcFunc['db_insert']('insert',
+	if (!empty($inserts)) {
+			$smcFunc['db_insert']('insert',
 			'{db_prefix}themes',
 			array('id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
 			$inserts,
 			array('id_theme', 'variable')
 		);
+	}
 
 	// Update the known and enable Theme's settings.
 	$known = strtr($modSettings['knownThemes'] . ',' . $id_theme, array(',,' => ','));
@@ -428,21 +440,24 @@ 
  */
 function remove_dir($path)
 {
-	if (empty($path))
-		return false;
+	if (empty($path)) {
+			return false;
+	}
 
 	if (is_dir($path))
 	{
 		$objects = scandir($path);
 
-		foreach ($objects as $object)
-			if ($object != '.' && $object != '..')
+		foreach ($objects as $object) {
+					if ($object != '.' && $object != '..')
 			{
 				if (filetype($path . '/' . $object) == 'dir')
 					remove_dir($path . '/' . $object);
+		}
 
-				else
-					unlink($path . '/' . $object);
+				else {
+									unlink($path . '/' . $object);
+				}
 			}
 	}
 
@@ -461,8 +476,9 @@ 
 	global $smcFunc, $modSettings;
 
 	// Can't delete the default theme, sorry!
-	if (empty($themeID) || $themeID == 1)
-		return false;
+	if (empty($themeID) || $themeID == 1) {
+			return false;
+	}
 
 	$known = explode(',', $modSettings['knownThemes']);
 	$enable = explode(',', $modSettings['enableThemes']);
@@ -512,8 +528,9 @@ 
 	updateSettings(array('enableThemes' => $enable, 'knownThemes' => $known));
 
 	// Fix it if the theme was the overall default theme.
-	if ($modSettings['theme_guests'] == $themeID)
-		updateSettings(array('theme_guests' => '1'));
+	if ($modSettings['theme_guests'] == $themeID) {
+			updateSettings(array('theme_guests' => '1'));
+	}
 
 	return true;
 }
@@ -530,13 +547,15 @@ 
 	global $scripturl, $txt, $context;
 
 	// Is it even a directory?
-	if (!is_dir($path))
-		fatal_lang_error('error_invalid_dir', 'critical');
+	if (!is_dir($path)) {
+			fatal_lang_error('error_invalid_dir', 'critical');
+	}
 
 	$dir = dir($path);
 	$entries = array();
-	while ($entry = $dir->read())
-		$entries[] = $entry;
+	while ($entry = $dir->read()) {
+			$entries[] = $entry;
+	}
 	$dir->close();
 
 	natcasesort($entries);
@@ -547,11 +566,12 @@ 
 	foreach ($entries as $entry)
 	{
 		// Skip all dot files, including .htaccess.
-		if (substr($entry, 0, 1) == '.' || $entry == 'CVS')
-			continue;
+		if (substr($entry, 0, 1) == '.' || $entry == 'CVS') {
+					continue;
+		}
 
-		if (is_dir($path . '/' . $entry))
-			$listing1[] = array(
+		if (is_dir($path . '/' . $entry)) {
+					$listing1[] = array(
 				'filename' => $entry,
 				'is_writable' => is_writable($path . '/' . $entry),
 				'is_directory' => true,
@@ -561,13 +581,14 @@ 
 				'href' => $scripturl . '?action=admin;area=theme;th=' . $_GET['th'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=edit;directory=' . $relative . $entry,
 				'size' => '',
 			);
-		else
+		} else
 		{
 			$size = filesize($path . '/' . $entry);
-			if ($size > 2048 || $size == 1024)
-				$size = comma_format($size / 1024) . ' ' . $txt['themeadmin_edit_kilobytes'];
-			else
-				$size = comma_format($size) . ' ' . $txt['themeadmin_edit_bytes'];
+			if ($size > 2048 || $size == 1024) {
+							$size = comma_format($size / 1024) . ' ' . $txt['themeadmin_edit_kilobytes'];
+			} else {
+							$size = comma_format($size) . ' ' . $txt['themeadmin_edit_bytes'];
+			}
 
 			$listing2[] = array(
 				'filename' => $entry,

Sources/SearchAPI-Custom.php

Braces +48 added lines, -34 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-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 = $smcFunc['json_decode']($modSettings['search_custom_index_config'], true);
 
@@ -117,21 +119,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;
+					}
 				}
 			}
 		}
@@ -152,8 +156,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)
@@ -162,30 +167,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), '\\\'') . '[[:>:]]';
 			}
 
@@ -198,8 +210,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;
@@ -235,16 +246,18 @@ 
 		$customIndexSettings = $smcFunc['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')
 			);
+		}
 	}
 
 	/**
@@ -287,8 +300,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/Drafts.php

Braces +75 added lines, -53 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 loadLanguage('Drafts');
 
@@ -33,8 +34,9 @@ 
 	global $context, $user_info, $smcFunc, $modSettings, $board;
 
 	// can you be, should you be ... here?
-	if (empty($modSettings['drafts_post_enabled']) || !allowedTo('post_draft') || !isset($_POST['save_draft']) || !isset($_POST['id_draft']))
-		return false;
+	if (empty($modSettings['drafts_post_enabled']) || !allowedTo('post_draft') || !isset($_POST['save_draft']) || !isset($_POST['id_draft'])) {
+			return false;
+	}
 
 	// read in what they sent us, if anything
 	$id_draft = (int) $_POST['id_draft'];
@@ -46,14 +48,16 @@ 
 		$context['draft_saved_on'] = $draft_info['poster_time'];
 
 		// since we were called from the autosave function, send something back
-		if (!empty($id_draft))
-			XmlDraft($id_draft);
+		if (!empty($id_draft)) {
+					XmlDraft($id_draft);
+		}
 
 		return true;
 	}
 
-	if (!isset($_POST['message']))
-		$_POST['message'] = isset($_POST['quickReply']) ? $_POST['quickReply'] : '';
+	if (!isset($_POST['message'])) {
+			$_POST['message'] = isset($_POST['quickReply']) ? $_POST['quickReply'] : '';
+	}
 
 	// prepare any data from the form
 	$topic_id = empty($_REQUEST['topic']) ? 0 : (int) $_REQUEST['topic'];
@@ -66,8 +70,9 @@ 
 
 	// message and subject still need a bit more work
 	preparsecode($draft['body']);
-	if ($smcFunc['strlen']($draft['subject']) > 100)
-		$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	if ($smcFunc['strlen']($draft['subject']) > 100) {
+			$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	}
 
 	// Modifying an existing draft, like hitting the save draft button or autosave enabled?
 	if (!empty($id_draft) && !empty($draft_info))
@@ -148,9 +153,9 @@ 
 		{
 			$context['draft_saved'] = true;
 			$context['id_draft'] = $id_draft;
+		} else {
+					$post_errors[] = 'draft_not_saved';
 		}
-		else
-			$post_errors[] = 'draft_not_saved';
 
 		// cleanup
 		unset($_POST['save_draft']);
@@ -180,8 +185,9 @@ 
 	global $context, $user_info, $smcFunc, $modSettings;
 
 	// PM survey says ... can you stay or must you go
-	if (empty($modSettings['drafts_pm_enabled']) || !allowedTo('pm_draft') || !isset($_POST['save_draft']))
-		return false;
+	if (empty($modSettings['drafts_pm_enabled']) || !allowedTo('pm_draft') || !isset($_POST['save_draft'])) {
+			return false;
+	}
 
 	// read in what you sent us
 	$id_pm_draft = (int) $_POST['id_pm_draft'];
@@ -193,8 +199,9 @@ 
 		$context['draft_saved_on'] = $draft_info['poster_time'];
 
 		// Send something back to the javascript caller
-		if (!empty($id_draft))
-			XmlDraft($id_draft);
+		if (!empty($id_draft)) {
+					XmlDraft($id_draft);
+		}
 
 		return true;
 	}
@@ -204,9 +211,9 @@ 
 	{
 		$recipientList['to'] = isset($_POST['recipient_to']) ? explode(',', $_POST['recipient_to']) : array();
 		$recipientList['bcc'] = isset($_POST['recipient_bcc']) ? explode(',', $_POST['recipient_bcc']) : array();
+	} elseif (!empty($draft_info['to_list']) && empty($recipientList)) {
+			$recipientList = $smcFunc['json_decode']($draft_info['to_list'], true);
 	}
-	elseif (!empty($draft_info['to_list']) && empty($recipientList))
-		$recipientList = $smcFunc['json_decode']($draft_info['to_list'], true);
 
 	// prepare the data we got from the form
 	$reply_id = empty($_POST['replied_to']) ? 0 : (int) $_POST['replied_to'];
@@ -215,8 +222,9 @@ 
 
 	// message and subject always need a bit more work
 	preparsecode($draft['body']);
-	if ($smcFunc['strlen']($draft['subject']) > 100)
-		$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	if ($smcFunc['strlen']($draft['subject']) > 100) {
+			$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	}
 
 	// Modifying an existing PM draft?
 	if (!empty($id_pm_draft) && !empty($draft_info))
@@ -280,9 +288,9 @@ 
 		{
 			$context['draft_saved'] = true;
 			$context['id_pm_draft'] = $id_pm_draft;
+		} else {
+					$post_errors[] = 'draft_not_saved';
 		}
-		else
-			$post_errors[] = 'draft_not_saved';
 	}
 
 	// if we were called from the autosave function, send something back
@@ -315,8 +323,9 @@ 
 	$type = (int) $type;
 
 	// nothing to read, nothing to do
-	if (empty($id_draft))
-		return false;
+	if (empty($id_draft)) {
+			return false;
+	}
 
 	// load in this draft from the DB
 	$request = $smcFunc['db_query']('', '
@@ -337,8 +346,9 @@ 
 	);
 
 	// no results?
-	if (!$smcFunc['db_num_rows']($request))
-		return false;
+	if (!$smcFunc['db_num_rows']($request)) {
+			return false;
+	}
 
 	// load up the data
 	$draft_info = $smcFunc['db_fetch_assoc']($request);
@@ -358,8 +368,7 @@ 
 			$context['subject'] = !empty($draft_info['subject']) ? stripslashes($draft_info['subject']) : '';
 			$context['board'] = !empty($draft_info['id_board']) ? $draft_info['id_board'] : '';
 			$context['id_draft'] = !empty($draft_info['id_draft']) ? $draft_info['id_draft'] : 0;
-		}
-		elseif ($type === 1)
+		} elseif ($type === 1)
 		{
 			// one of those pm drafts? then set it up like we have an error
 			$_REQUEST['subject'] = !empty($draft_info['subject']) ? stripslashes($draft_info['subject']) : '';
@@ -395,12 +404,14 @@ 
 	global $user_info, $smcFunc;
 
 	// Only a single draft.
-	if (is_numeric($id_draft))
-		$id_draft = array($id_draft);
+	if (is_numeric($id_draft)) {
+			$id_draft = array($id_draft);
+	}
 
 	// can't delete nothing
-	if (empty($id_draft) || ($check && empty($user_info['id'])))
-		return false;
+	if (empty($id_draft) || ($check && empty($user_info['id']))) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}user_drafts
@@ -429,14 +440,16 @@ 
 	global $smcFunc, $scripturl, $context, $txt, $modSettings;
 
 	// Permissions
-	if (($draft_type === 0 && empty($context['drafts_save'])) || ($draft_type === 1 && empty($context['drafts_pm_save'])) || empty($member_id))
-		return false;
+	if (($draft_type === 0 && empty($context['drafts_save'])) || ($draft_type === 1 && empty($context['drafts_pm_save'])) || empty($member_id)) {
+			return false;
+	}
 
 	$context['drafts'] = array();
 
 	// has a specific draft has been selected?  Load it up if there is not a message already in the editor
-	if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message']))
-		ReadDraft((int) $_REQUEST['id_draft'], $draft_type, true, true);
+	if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message'])) {
+			ReadDraft((int) $_REQUEST['id_draft'], $draft_type, true, true);
+	}
 
 	// load the drafts this user has available
 	$request = $smcFunc['db_query']('', '
@@ -459,8 +472,9 @@ 
 	// add them to the draft array for display
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		// Post drafts
 		if ($draft_type === 0)
@@ -545,8 +559,9 @@ 
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = 10;
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = 10;
+	}
 
 	// Get the count of applicable drafts on the boards they can (still) see ...
 	// @todo .. should we just let them see their drafts even if they have lost board access ?
@@ -611,12 +626,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Censor....
-		if (empty($row['body']))
-			$row['body'] = '';
+		if (empty($row['body'])) {
+					$row['body'] = '';
+		}
 
 		$row['subject'] = $smcFunc['htmltrim']($row['subject']);
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		censorText($row['body']);
 		censorText($row['subject']);
@@ -648,8 +665,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If the drafts were retrieved in reverse order, get them right again.
-	if ($reverse)
-		$context['drafts'] = array_reverse($context['drafts'], true);
+	if ($reverse) {
+			$context['drafts'] = array_reverse($context['drafts'], true);
+	}
 
 	// Menu tab
 	$context[$context['profile_menu_name']]['tab_data'] = array(
@@ -707,8 +725,9 @@ 
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = 10;
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = 10;
+	}
 
 	// Get the count of applicable drafts
 	$request = $smcFunc['db_query']('', '
@@ -767,12 +786,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Censor....
-		if (empty($row['body']))
-			$row['body'] = '';
+		if (empty($row['body'])) {
+					$row['body'] = '';
+		}
 
 		$row['subject'] = $smcFunc['htmltrim']($row['subject']);
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		censorText($row['body']);
 		censorText($row['subject']);
@@ -827,8 +848,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// if the drafts were retrieved in reverse order, then put them in the right order again.
-	if ($reverse)
-		$context['drafts'] = array_reverse($context['drafts'], true);
+	if ($reverse) {
+			$context['drafts'] = array_reverse($context['drafts'], true);
+	}
 
 	// off to the template we go
 	$context['page_title'] = $txt['drafts'];

subscriptions.php

Braces +38 added lines, -28 removed lines

@@ -16,8 +16,9 @@ 
 
 // Start things rolling by getting SMF alive...
 $ssi_guest_access = true;
-if (!file_exists(dirname(__FILE__) . '/SSI.php'))
+if (!file_exists(dirname(__FILE__) . '/SSI.php')) {
 	die('Cannot find SSI.php');
+}
 
 require_once(dirname(__FILE__) . '/SSI.php');
 require_once($sourcedir . '/ManagePaid.php');
@@ -35,20 +36,22 @@ 
 }
 
 // I assume we're even active?
-if (empty($modSettings['paid_enabled']))
+if (empty($modSettings['paid_enabled'])) {
 	exit;
+}
 
 // If we have some custom people who find out about problems load them here.
 $notify_users = array();
 if (!empty($modSettings['paid_email_to']))
 {
-	foreach (explode(',', $modSettings['paid_email_to']) as $email)
-		$notify_users[] = array(
+	foreach (explode(',', $modSettings['paid_email_to']) as $email) {
+			$notify_users[] = array(
 			'email' => $email,
 			'name' => $txt['who_member'],
 			'id' => 0,
 		);
-}
+	}
+	}
 
 // We need to see whether we can find the correct payment gateway,
 // we'll going to go through all our gateway scripts and find out
@@ -65,8 +68,9 @@ 
 	}
 }
 
-if (empty($txnType))
+if (empty($txnType)) {
 	generateSubscriptionError($txt['paid_unknown_transaction_type']);
+}
 
 // Get the subscription and member ID amoungst others...
 @list($subscription_id, $member_id) = $gatewayClass->precheck();
@@ -76,8 +80,9 @@ 
 $member_id = (int) $member_id;
 
 // This would be bad...
-if (empty($member_id))
+if (empty($member_id)) {
 	generateSubscriptionError($txt['paid_empty_member']);
+}
 
 // Verify the member.
 $request = $smcFunc['db_query']('', '
@@ -89,8 +94,9 @@ 
 	)
 );
 // Didn't find them?
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_could_not_find_member'], $member_id));
+}
 $member_info = $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
 
@@ -105,8 +111,9 @@ 
 );
 
 // Didn't find it?
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_count_not_find_subscription'], $member_id, $subscription_id));
+}
 
 $subscription_info = $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
@@ -123,8 +130,9 @@ 
 		'current_member' => $member_id,
 	)
 );
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_count_not_find_subscription_log'], $member_id, $subscription_id));
+}
 $subscription_info += $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
 
@@ -139,8 +147,7 @@ 
 		removeSubscription($subscription_id, $member_id);
 		$subscription_act = time();
 		$status = 0;
-	}
-	else
+	} else
 	{
 		loadSubscriptions();
 		$subscription_act = $subscription_info['end_time'] - $context['subscriptions'][$subscription_id]['num_length'];
@@ -188,16 +195,18 @@ 
 	if (!$gatewayClass->isSubscription())
 	{
 		$real_details = $smcFunc['json_decode']($subscription_info['pending_details'], true);
-		if (empty($real_details))
-			generateSubscriptionError(sprintf($txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
+		if (empty($real_details)) {
+					generateSubscriptionError(sprintf($txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
+		}
 
 		// Now we just try to find anything pending.
 		// We don't really care which it is as security happens later.
 		foreach ($real_details as $id => $detail)
 		{
 			unset($real_details[$id]);
-			if ($detail[3] == 'payback' && $subscription_info['payments_pending'])
-				$subscription_info['payments_pending']--;
+			if ($detail[3] == 'payback' && $subscription_info['payments_pending']) {
+							$subscription_info['payments_pending']--;
+			}
 			break;
 		}
 
@@ -223,10 +232,11 @@ 
 		// This is a little harder, can we find the right duration?
 		foreach ($cost as $duration => $value)
 		{
-			if ($duration == 'fixed')
-				continue;
-			elseif ((float) $value == (float) $total_cost)
-				$found_duration = strtoupper(substr($duration, 0, 1));
+			if ($duration == 'fixed') {
+							continue;
+			} elseif ((float) $value == (float) $total_cost) {
+							$found_duration = strtoupper(substr($duration, 0, 1));
+			}
 		}
 
 		// If we have the duration then we're done.
@@ -235,8 +245,7 @@ 
 			$notify = true;
 			addSubscription($subscription_id, $member_id, $found_duration);
 		}
-	}
-	else
+	} else
 	{
 		$actual_cost = $cost['fixed'];
 
@@ -268,10 +277,10 @@ 
 // Maybe they're cancelling. Some subscriptions may require actively doing something, but PayPal doesn't, for example.
 elseif ($gatewayClass->isCancellation())
 {
-	if (method_exists($gatewayClass, 'performCancel'))
-		$gatewayClass->performCancel($subscription_id, $member_id, $subscription_info);
-}
-else
+	if (method_exists($gatewayClass, 'performCancel')) {
+			$gatewayClass->performCancel($subscription_id, $member_id, $subscription_info);
+	}
+	} else
 {
 	// Some other "valid" transaction such as:
 	//
@@ -308,8 +317,9 @@ 
 	// Maybe we can try to give them the post data?
 	if (!empty($_POST))
 	{
-		foreach ($_POST as $key => $val)
-			$text .= '<br>' . $smcFunc['htmlspecialchars']($key) . ': ' . $smcFunc['htmlspecialchars']($val);
+		foreach ($_POST as $key => $val) {
+					$text .= '<br>' . $smcFunc['htmlspecialchars']($key) . ': ' . $smcFunc['htmlspecialchars']($val);
+		}
 	}
 
 	// Then just log and die.

Sources/Recent.php

Braces +208 added lines, -170 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get the latest post made on the system
@@ -44,8 +45,9 @@ 
 			'is_approved' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return array();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return array();
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -54,8 +56,9 @@ 
 	censorText($row['body']);
 
 	$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled']), array('<br>' => '&#10;')));
-	if ($smcFunc['strlen']($row['body']) > 128)
-		$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+	if ($smcFunc['strlen']($row['body']) > 128) {
+			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+	}
 
 	// Send the data.
 	return array(
@@ -83,15 +86,17 @@ 
 
 	$context['is_redirect'] = false;
 
-	if (isset($_REQUEST['start']) && $_REQUEST['start'] > 95)
-		$_REQUEST['start'] = 95;
+	if (isset($_REQUEST['start']) && $_REQUEST['start'] > 95) {
+			$_REQUEST['start'] = 95;
+	}
 
 	$query_parameters = array();
 	if (!empty($_REQUEST['c']) && empty($board))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		if (count($_REQUEST['c']) == 1)
 		{
@@ -107,8 +112,9 @@ 
 			list ($name) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (empty($name))
-				fatal_lang_error('no_access', false);
+			if (empty($name)) {
+							fatal_lang_error('no_access', false);
+			}
 
 			$context['linktree'][] = array(
 				'url' => $scripturl . '#c' . (int) $_REQUEST['c'],
@@ -140,8 +146,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'b.id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -155,12 +162,12 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;c=' . implode(',', $_REQUEST['c']), $_REQUEST['start'], min(100, $total_cat_posts), 10, false);
-	}
-	elseif (!empty($_REQUEST['boards']))
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board, b.num_posts
@@ -184,8 +191,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'b.id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -199,8 +207,7 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;boards=' . implode(',', $_REQUEST['boards']), $_REQUEST['start'], min(100, $total_posts), 10, false);
-	}
-	elseif (!empty($board))
+	} elseif (!empty($board))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT num_posts, redirect
@@ -233,8 +240,7 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;board=' . $board . '.%1$d', $_REQUEST['start'], min(100, $total_posts), 10, true);
-	}
-	else
+	} else
 	{
 		$query_this_board = '{query_wanna_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
 					AND b.id_board != {int:recycle_board}' : ''). '
@@ -269,8 +275,9 @@ 
 	);
 
 	// If you selected a redirection board, don't try getting posts for it...
-	if ($context['is_redirect'])
-		$messages = 0;
+	if ($context['is_redirect']) {
+			$messages = 0;
+	}
 
 	$key = 'recent-' . $user_info['id'] . '-' . md5($smcFunc['json_encode'](array_diff_key($query_parameters, array('max_id_msg' => 0)))) . '-' . (int) $_REQUEST['start'];
 	if (!$context['is_redirect'] && (empty($modSettings['cache_enable']) || ($messages = cache_get_data($key, 120)) == null))
@@ -301,16 +308,18 @@ 
 				$query_this_board = str_replace('AND m.id_msg >= {int:max_id_msg}', '', $query_this_board);
 				$cache_results = true;
 				unset($query_parameters['max_id_msg']);
+			} else {
+							$done = true;
 			}
-			else
-				$done = true;
 		}
 		$messages = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$messages[] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$messages[] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
-		if (!empty($cache_results))
-			cache_put_data($key, $messages, 120);
+		if (!empty($cache_results)) {
+					cache_put_data($key, $messages, 120);
+		}
 	}
 
 	// Nothing here... Or at least, nothing you can see...
@@ -397,8 +406,9 @@ 
 			'css_class' => 'windowbg',
 		);
 
-		if ($user_info['id'] == $row['id_first_member'])
-			$board_ids['own'][$row['id_board']][] = $row['id_msg'];
+		if ($user_info['id'] == $row['id_first_member']) {
+					$board_ids['own'][$row['id_board']][] = $row['id_msg'];
+		}
 		$board_ids['any'][$row['id_board']][] = $row['id_msg'];
 	}
 	$smcFunc['db_free_result']($request);
@@ -424,20 +434,23 @@ 
 			$boards = boardsAllowedTo($permission);
 
 			// If 0 is the only thing in the array, they can do it everywhere!
-			if (!empty($boards) && $boards[0] == 0)
-				$boards = array_keys($board_ids[$type]);
+			if (!empty($boards) && $boards[0] == 0) {
+							$boards = array_keys($board_ids[$type]);
+			}
 
 			// Go through the boards, and look for posts they can do this on.
 			foreach ($boards as $board_id)
 			{
 				// Hmm, they have permission, but there are no topics from that board on this page.
-				if (!isset($board_ids[$type][$board_id]))
-					continue;
+				if (!isset($board_ids[$type][$board_id])) {
+									continue;
+				}
 
 				// Okay, looks like they can do it for these posts.
-				foreach ($board_ids[$type][$board_id] as $counter)
-					if ($type == 'any' || $context['posts'][$counter]['poster']['id'] == $user_info['id'])
+				foreach ($board_ids[$type][$board_id] as $counter) {
+									if ($type == 'any' || $context['posts'][$counter]['poster']['id'] == $user_info['id'])
 						$context['posts'][$counter][$allowed] = true;
+				}
 			}
 		}
 	}
@@ -480,17 +493,19 @@ 
 	$context['showing_all_topics'] = isset($_GET['all']);
 	$context['start'] = (int) $_REQUEST['start'];
 	$context['topics_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
-	if ($_REQUEST['action'] == 'unread')
-		$context['page_title'] = $context['showing_all_topics'] ? $txt['unread_topics_all'] : $txt['unread_topics_visit'];
-	else
-		$context['page_title'] = $txt['unread_replies'];
+	if ($_REQUEST['action'] == 'unread') {
+			$context['page_title'] = $context['showing_all_topics'] ? $txt['unread_topics_all'] : $txt['unread_topics_visit'];
+	} else {
+			$context['page_title'] = $txt['unread_replies'];
+	}
 
-	if ($context['showing_all_topics'] && !empty($context['load_average']) && !empty($modSettings['loadavg_allunread']) && $context['load_average'] >= $modSettings['loadavg_allunread'])
-		fatal_lang_error('loadavg_allunread_disabled', false);
-	elseif ($_REQUEST['action'] != 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unreadreplies']) && $context['load_average'] >= $modSettings['loadavg_unreadreplies'])
-		fatal_lang_error('loadavg_unreadreplies_disabled', false);
-	elseif (!$context['showing_all_topics'] && $_REQUEST['action'] == 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unread']) && $context['load_average'] >= $modSettings['loadavg_unread'])
-		fatal_lang_error('loadavg_unread_disabled', false);
+	if ($context['showing_all_topics'] && !empty($context['load_average']) && !empty($modSettings['loadavg_allunread']) && $context['load_average'] >= $modSettings['loadavg_allunread']) {
+			fatal_lang_error('loadavg_allunread_disabled', false);
+	} elseif ($_REQUEST['action'] != 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unreadreplies']) && $context['load_average'] >= $modSettings['loadavg_unreadreplies']) {
+			fatal_lang_error('loadavg_unreadreplies_disabled', false);
+	} elseif (!$context['showing_all_topics'] && $_REQUEST['action'] == 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unread']) && $context['load_average'] >= $modSettings['loadavg_unread']) {
+			fatal_lang_error('loadavg_unread_disabled', false);
+	}
 
 	// Parameters for the main query.
 	$query_parameters = array();
@@ -503,12 +518,14 @@ 
 		if (!empty($_REQUEST['boards']))
 		{
 			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-			foreach ($_REQUEST['boards'] as $b)
-				$boards[] = (int) $b;
+			foreach ($_REQUEST['boards'] as $b) {
+							$boards[] = (int) $b;
+			}
 		}
 
-		if (!empty($board))
-			$boards[] = (int) $board;
+		if (!empty($board)) {
+					$boards[] = (int) $board;
+		}
 
 		// The easiest thing is to just get all the boards they can see, but since we've specified the top of tree we ignore some of them
 		$request = $smcFunc['db_query']('', '
@@ -525,30 +542,31 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (in_array($row['id_parent'], $boards))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (in_array($row['id_parent'], $boards))
 				$boards[] = $row['id_board'];
+		}
 
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';boards=' . implode(',', $boards) . ';start=%d';
-	}
-	elseif (!empty($board))
+	} elseif (!empty($board))
 	{
 		$query_this_board = 'id_board = {int:board}';
 		$query_parameters['board'] = $board;
 		$context['querystring_board_limits'] = ';board=' . $board . '.%1$d';
-	}
-	elseif (!empty($_REQUEST['boards']))
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board
@@ -560,22 +578,24 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';boards=' . implode(',', $boards) . ';start=%1$d';
-	}
-	elseif (!empty($_REQUEST['c']))
+	} elseif (!empty($_REQUEST['c']))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		$see_board = isset($_REQUEST['action']) && $_REQUEST['action'] == 'unreadreplies' ? 'query_see_board' : 'query_wanna_see_board';
 		$request = $smcFunc['db_query']('', '
@@ -588,18 +608,19 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';c=' . implode(',', $_REQUEST['c']) . ';start=%1$d';
-	}
-	else
+	} else
 	{
 		$see_board = isset($_REQUEST['action']) && $_REQUEST['action'] == 'unreadreplies' ? 'query_see_board' : 'query_wanna_see_board';
 		// Don't bother to show deleted posts!
@@ -613,12 +634,14 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_available', false);
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_available', false);
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -680,13 +703,14 @@ 
 		'name' => $_REQUEST['action'] == 'unread' ? $txt['unread_topics_visit'] : $txt['unread_replies']
 	);
 
-	if ($context['showing_all_topics'])
-		$context['linktree'][] = array(
+	if ($context['showing_all_topics']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=' . $_REQUEST['action'] . ';all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits'],
 			'name' => $txt['unread_topics_all']
 		);
-	else
-		$txt['unread_topics_visit_none'] = strtr($txt['unread_topics_visit_none'], array('?action=unread;all' => '?action=unread;all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits']));
+	} else {
+			$txt['unread_topics_visit_none'] = strtr($txt['unread_topics_visit_none'], array('?action=unread;all' => '?action=unread;all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits']));
+	}
 
 	loadTemplate('Recent');
 	loadTemplate('MessageIndex');
@@ -694,8 +718,9 @@ 
 
 	// Setup the default topic icons... for checking they exist and the like ;)
 	$context['icon_sources'] = array();
-	foreach ($context['stable_icons'] as $icon)
-		$context['icon_sources'][$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$context['icon_sources'][$icon] = 'images_url';
+	}
 
 	$is_topics = $_REQUEST['action'] == 'unread';
 
@@ -725,8 +750,7 @@ 
 			);
 			list ($earliest_msg) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT MIN(lmr.id_msg)
@@ -742,14 +766,14 @@ 
 		}
 
 		// This is needed in case of topics marked unread.
-		if (empty($earliest_msg))
-			$earliest_msg = 0;
-		else
+		if (empty($earliest_msg)) {
+					$earliest_msg = 0;
+		} else
 		{
 			// Using caching, when possible, to ignore the below slow query.
-			if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time())
-				$earliest_msg2 = $_SESSION['cached_log_time'][1];
-			else
+			if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time()) {
+							$earliest_msg2 = $_SESSION['cached_log_time'][1];
+			} else
 			{
 				// This query is pretty slow, but it's needed to ensure nothing crucial is ignored.
 				$request = $smcFunc['db_query']('', '
@@ -764,8 +788,9 @@ 
 				$smcFunc['db_free_result']($request);
 
 				// In theory this could be zero, if the first ever post is unread, so fudge it ;)
-				if ($earliest_msg2 == 0)
-					$earliest_msg2 = -1;
+				if ($earliest_msg2 == 0) {
+									$earliest_msg2 = -1;
+				}
 
 				$_SESSION['cached_log_time'] = array(time(), $earliest_msg2);
 			}
@@ -803,9 +828,9 @@ 
 				'db_error_skip' => true,
 			))
 		) !== false;
+	} else {
+			$have_temp_table = false;
 	}
-	else
-		$have_temp_table = false;
 
 	if ($context['showing_all_topics'] && $have_temp_table)
 	{
@@ -851,14 +876,15 @@ 
 
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%1$d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%1$d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
+		} else {
+					$min_message = (int) $min_message;
 		}
-		else
-			$min_message = (int) $min_message;
 
 		$request = $smcFunc['db_query']('substring', '
 			SELECT ' . $select_clause . '
@@ -887,8 +913,7 @@ 
 				'limit' => $context['topics_per_page'],
 			))
 		);
-	}
-	elseif ($is_topics)
+	} elseif ($is_topics)
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*), MIN(t.id_last_msg)
@@ -939,14 +964,15 @@ 
 
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
+		} else {
+					$min_message = (int) $min_message;
 		}
-		else
-			$min_message = (int) $min_message;
 
 		$request = $smcFunc['db_query']('substring', '
 			SELECT ' . $select_clause . '
@@ -976,8 +1002,7 @@ 
 				'limit' => $context['topics_per_page'],
 			))
 		);
-	}
-	else
+	} else
 	{
 		if ($modSettings['totalMessages'] > 100000)
 		{
@@ -1029,8 +1054,8 @@ 
 			) !== false;
 
 			// If that worked, create a sample of the log_topics table too.
-			if ($have_temp_table)
-				$have_temp_table = $smcFunc['db_query']('', '
+			if ($have_temp_table) {
+							$have_temp_table = $smcFunc['db_query']('', '
 					CREATE TEMPORARY TABLE {db_prefix}log_topics_posted_in (
 						PRIMARY KEY (id_topic)
 					)
@@ -1043,6 +1068,7 @@ 
 						'db_error_skip' => true,
 					)
 				) !== false;
+			}
 		}
 
 		if (!empty($have_temp_table))
@@ -1058,8 +1084,7 @@ 
 			);
 			list ($num_topics) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('unread_fetch_topic_count', '
 				SELECT COUNT(DISTINCT t.id_topic), MIN(t.id_last_msg)
@@ -1100,15 +1125,16 @@ 
 		{
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
 		}
 
-		if (!empty($have_temp_table))
-			$request = $smcFunc['db_query']('', '
+		if (!empty($have_temp_table)) {
+					$request = $smcFunc['db_query']('', '
 				SELECT t.id_topic
 				FROM {db_prefix}topics_posted_in AS t
 					LEFT JOIN {db_prefix}log_topics_posted_in AS lt ON (lt.id_topic = t.id_topic)
@@ -1122,8 +1148,8 @@ 
 					'limit' => $context['topics_per_page'],
 				))
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'].'
 				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($_REQUEST['sort'], 'ms.') === false ? '' : '
@@ -1147,10 +1173,12 @@ 
 					'sort' => $_REQUEST['sort'],
 				))
 			);
+		}
 
 		$topics = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topics[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topics[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Sanity... where have you gone?
@@ -1158,10 +1186,11 @@ 
 		{
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
 		}
 
@@ -1195,8 +1224,9 @@ 
 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0')
-			continue;
+		if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0') {
+					continue;
+		}
 
 		$topic_ids[] = $row['id_topic'];
 
@@ -1204,11 +1234,13 @@ 
 		{
 			// Limit them to 128 characters - do this FIRST because it's a lot of wasted censoring otherwise.
 			$row['first_body'] = strip_tags(strtr(parse_bbc($row['first_body'], $row['first_smileys'], $row['id_first_msg']), array('<br>' => '&#10;')));
-			if ($smcFunc['strlen']($row['first_body']) > 128)
-				$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, 128) . '...';
+			if ($smcFunc['strlen']($row['first_body']) > 128) {
+							$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, 128) . '...';
+			}
 			$row['last_body'] = strip_tags(strtr(parse_bbc($row['last_body'], $row['last_smileys'], $row['id_last_msg']), array('<br>' => '&#10;')));
-			if ($smcFunc['strlen']($row['last_body']) > 128)
-				$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, 128) . '...';
+			if ($smcFunc['strlen']($row['last_body']) > 128) {
+							$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, 128) . '...';
+			}
 
 			// Censor the subject and message preview.
 			censorText($row['first_subject']);
@@ -1219,23 +1251,22 @@ 
 			{
 				$row['last_subject'] = $row['first_subject'];
 				$row['last_body'] = $row['first_body'];
-			}
-			else
+			} else
 			{
 				censorText($row['last_subject']);
 				censorText($row['last_body']);
 			}
-		}
-		else
+		} else
 		{
 			$row['first_body'] = '';
 			$row['last_body'] = '';
 			censorText($row['first_subject']);
 
-			if ($row['id_first_msg'] == $row['id_last_msg'])
-				$row['last_subject'] = $row['first_subject'];
-			else
-				censorText($row['last_subject']);
+			if ($row['id_first_msg'] == $row['id_last_msg']) {
+							$row['last_subject'] = $row['first_subject'];
+			} else {
+							censorText($row['last_subject']);
+			}
 		}
 
 		// Decide how many pages the topic should have.
@@ -1247,22 +1278,24 @@ 
 			$pages = constructPageIndex($scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $topic_length, $messages_per_page, true, false);
 
 			// If we can use all, show all.
-			if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages'])
-				$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+			if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages']) {
+							$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+			}
+		} else {
+					$pages = '';
 		}
 
-		else
-			$pages = '';
-
 		// We need to check the topic icons exist... you can never be too sure!
 		if (!empty($modSettings['messageIconChecks_enable']))
 		{
 			// First icon first... as you'd expect.
-			if (!isset($context['icon_sources'][$row['first_icon']]))
-				$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			if (!isset($context['icon_sources'][$row['first_icon']])) {
+							$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			}
 			// Last icon... last... duh.
-			if (!isset($context['icon_sources'][$row['last_icon']]))
-				$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			if (!isset($context['icon_sources'][$row['last_icon']])) {
+							$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			}
 		}
 
 		// Force the recycling icon if appropriate
@@ -1276,12 +1309,14 @@ 
 		$colorClass = 'windowbg';
 
 		// Sticky topics should get a different color, too.
-		if ($row['is_sticky'])
-			$colorClass .= ' sticky';
+		if ($row['is_sticky']) {
+					$colorClass .= ' sticky';
+		}
 
 		// Locked topics get special treatment as well.
-		if ($row['locked'])
-			$colorClass .= ' locked';
+		if ($row['locked']) {
+					$colorClass .= ' locked';
+		}
 
 		// And build the array.
 		$context['topics'][$row['id_topic']] = array(
@@ -1378,8 +1413,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
-			if (empty($context['topics'][$row['id_topic']]['is_posted_in']))
-				$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			if (empty($context['topics'][$row['id_topic']]['is_posted_in'])) {
+							$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -1394,28 +1430,30 @@ 
 			'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="'.  $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
-		if ($context['showCheckboxes'])
-			$context['recent_buttons']['markselectread'] = array(
+		if ($context['showCheckboxes']) {
+					$context['recent_buttons']['markselectread'] = array(
 				'text' => 'quick_mod_markread',
 				'image' => 'markselectedread.png',
 				'url' => 'javascript:document.quickModForm.submit();',
 			);
+		}
 
-		if (!empty($context['topics']) && !$context['showing_all_topics'])
-			$context['recent_buttons']['readall'] = array('text' => 'unread_topics_all', 'image' => 'markreadall.png', 'url' => $scripturl . '?action=unread;all' . $context['querystring_board_limits'], 'active' => true);
-	}
-	elseif (!$is_topics && isset($context['topics_to_mark']))
+		if (!empty($context['topics']) && !$context['showing_all_topics']) {
+					$context['recent_buttons']['readall'] = array('text' => 'unread_topics_all', 'image' => 'markreadall.png', 'url' => $scripturl . '?action=unread;all' . $context['querystring_board_limits'], 'active' => true);
+		}
+	} elseif (!$is_topics && isset($context['topics_to_mark']))
 	{
 		$context['recent_buttons'] = array(
 			'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="'. $txt['are_sure_mark_read']  .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
-		if ($context['showCheckboxes'])
-			$context['recent_buttons']['markselectread'] = array(
+		if ($context['showCheckboxes']) {
+					$context['recent_buttons']['markselectread'] = array(
 				'text' => 'quick_mod_markread',
 				'image' => 'markselectedread.png',
 				'url' => 'javascript:document.quickModForm.submit();',
 			);
+		}
 	}
 
 	// Allow mods to add additional buttons here

Sources/CacheAPI-memcached.php

Braces +17 added lines, -12 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -34,8 +35,9 @@ 
 
 		$supported = class_exists('memcached');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported && !empty($cache_memcached);
 	}
 
@@ -53,9 +55,9 @@ 
 		$currentServers = $this->memcached->getServerList();
 		foreach ($servers as $server)
 		{
-			if (strpos($server,'/') !== false)
-				$tempServer = array($server, 0);
-			else
+			if (strpos($server,'/') !== false) {
+							$tempServer = array($server, 0);
+			} else
 			{
 				$server = explode(':', $server);
 				$tempServer = array($server[0], isset($server[1]) ? $server[1] : 11211);
@@ -73,8 +75,9 @@ 
 			}
 
 			// Found it?
-			if (empty($foundServer))
-				$this->memcached->addServer($tempServer[0], $tempServer[1]);
+			if (empty($foundServer)) {
+							$this->memcached->addServer($tempServer[0], $tempServer[1]);
+			}
 		}
 
 		// Best guess is this worked.
@@ -91,8 +94,9 @@ 
 		$value = $this->memcached->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;
 	}
 
@@ -135,8 +139,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) {