SimpleMachines / SMF2.1

Sources/ManageMail.php

Braces +26 added lines, -18 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Main dispatcher. This function checks permissions and passes control through to the relevant section.
@@ -245,8 +246,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Private PM/email subjects and similar shouldn't be shown in the mailbox area.
-		if (!empty($row['private']))
-			$row['subject'] = $txt['personal_message'];
+		if (!empty($row['private'])) {
+					$row['subject'] = $txt['personal_message'];
+		}
 
 		$mails[] = $row;
 	}
@@ -300,8 +302,9 @@ 
 		$element = substr($key, strrpos($key, '_') + 1);
 		$processedBirthdayEmails[$index][$element] = $value;
 	}
-	foreach ($processedBirthdayEmails as $index => $dummy)
-		$emails[$index] = $index;
+	foreach ($processedBirthdayEmails as $index => $dummy) {
+			$emails[$index] = $index;
+	}
 
 	$config_vars = array(
 			// Mail queue stuff, this rocks ;)
@@ -322,8 +325,9 @@ 
 
 	call_integration_hook('integrate_modify_mail_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -398,9 +402,9 @@ 
 		);
 		list ($_GET['te']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
+	} else {
+			$_GET['te'] = (int) $_GET['te'];
 	}
-	else
-		$_GET['te'] = (int) $_GET['te'];
 
 	$_GET['sent'] = isset($_GET['sent']) ? (int) $_GET['sent'] : 0;
 
@@ -424,12 +428,14 @@ 
 
 	// Try get more time...
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Have we already used our maximum time?
-	if ((time() - $time_start) < 5)
-		return;
+	if ((time() - $time_start) < 5) {
+			return;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=mailqueue;sa=clear;te=' . $_GET['te'] . ';sent=' . $_GET['sent'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -459,8 +465,9 @@ 
 {
 	global $txt;
 
-	if ($time_diff < 0)
-		$time_diff = 0;
+	if ($time_diff < 0) {
+			$time_diff = 0;
+	}
 
 	// Just do a bit of an if fest...
 	if ($time_diff > 86400)
@@ -481,8 +488,9 @@ 
 		return sprintf($minutes == 1 ? $txt['mq_minute'] : $txt['mq_minutes'], $minutes);
 	}
 	// Otherwise must be second
-	else
-		return sprintf($time_diff == 1 ? $txt['mq_second'] : $txt['mq_seconds'], $time_diff);
-}
+	else {
+			return sprintf($time_diff == 1 ? $txt['mq_second'] : $txt['mq_seconds'], $time_diff);
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/ManageAttachments.php

Braces +429 added lines, -325 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main 'Attachments and Avatars' management function.
@@ -63,10 +64,11 @@ 
 	call_integration_hook('integrate_manage_attachments', array(&$subActions));
 
 	// Pick the correct sub-action.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $_REQUEST['sa'];
-	else
-		$context['sub_action'] = 'browse';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $_REQUEST['sa'];
+	} else {
+			$context['sub_action'] = 'browse';
+	}
 
 	// Default page title is good.
 	$context['page_title'] = $txt['attachments_avatars'];
@@ -94,20 +96,20 @@ 
 	$context['attachmentUploadDir'] = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 
 	// If not set, show a default path for the base directory
-	if (!isset($_GET['save']) && empty($modSettings['basedirectory_for_attachments']))
-		if (is_dir($modSettings['attachmentUploadDir'][1]))
+	if (!isset($_GET['save']) && empty($modSettings['basedirectory_for_attachments'])) {
+			if (is_dir($modSettings['attachmentUploadDir'][1]))
 			$modSettings['basedirectory_for_attachments'] = $modSettings['attachmentUploadDir'][1];
-
-	else
-		$modSettings['basedirectory_for_attachments'] = $context['attachmentUploadDir'];
+	} else {
+			$modSettings['basedirectory_for_attachments'] = $context['attachmentUploadDir'];
+	}
 
 	$context['valid_upload_dir'] = is_dir($context['attachmentUploadDir']) && is_writable($context['attachmentUploadDir']);
 
-	if (!empty($modSettings['automanage_attachments']))
-		$context['valid_basedirectory'] = !empty($modSettings['basedirectory_for_attachments']) && is_writable($modSettings['basedirectory_for_attachments']);
-
-	else
-		$context['valid_basedirectory'] = true;
+	if (!empty($modSettings['automanage_attachments'])) {
+			$context['valid_basedirectory'] = !empty($modSettings['basedirectory_for_attachments']) && is_writable($modSettings['basedirectory_for_attachments']);
+	} else {
+			$context['valid_basedirectory'] = true;
+	}
 
 	// A bit of razzle dazzle with the $txt strings. :)
 	$txt['attachment_path'] = $context['attachmentUploadDir'];
@@ -185,8 +187,9 @@ 
 
 	call_integration_hook('integrate_modify_attachment_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// These are very likely to come in handy! (i.e. without them we're doomed!)
 	require_once($sourcedir . '/ManagePermissions.php');
@@ -197,21 +200,24 @@ 
 	{
 		checkSession();
 
-		if (isset($_POST['attachmentUploadDir']))
-			unset($_POST['attachmentUploadDir']);
+		if (isset($_POST['attachmentUploadDir'])) {
+					unset($_POST['attachmentUploadDir']);
+		}
 
 		if (!empty($_POST['use_subdirectories_for_attachments']))
 		{
-			if (isset($_POST['use_subdirectories_for_attachments']) && empty($_POST['basedirectory_for_attachments']))
-				$_POST['basedirectory_for_attachments'] = (!empty($modSettings['basedirectory_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
+			if (isset($_POST['use_subdirectories_for_attachments']) && empty($_POST['basedirectory_for_attachments'])) {
+							$_POST['basedirectory_for_attachments'] = (!empty($modSettings['basedirectory_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
+			}
 
 			if (!empty($_POST['use_subdirectories_for_attachments']) && !empty($modSettings['attachment_basedirectories']))
 			{
-				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);
+				}
+			} else {
+							$modSettings['attachment_basedirectories'] = array();
 			}
-			else
-				$modSettings['attachment_basedirectories'] = array();
 
 			if (!empty($_POST['use_subdirectories_for_attachments']) && !empty($_POST['basedirectory_for_attachments']) && !in_array($_POST['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']))
 			{
@@ -219,8 +225,9 @@ 
 
 				if (!in_array($_POST['basedirectory_for_attachments'], $modSettings['attachmentUploadDir']))
 				{
-					if (!automanage_attachments_create_directory($_POST['basedirectory_for_attachments']))
-						$_POST['basedirectory_for_attachments'] = $modSettings['basedirectory_for_attachments'];
+					if (!automanage_attachments_create_directory($_POST['basedirectory_for_attachments'])) {
+											$_POST['basedirectory_for_attachments'] = $modSettings['basedirectory_for_attachments'];
+					}
 				}
 
 				if (!in_array($_POST['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']))
@@ -336,8 +343,9 @@ 
 
 	call_integration_hook('integrate_modify_avatar_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// We need this file for the settings template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -348,17 +356,21 @@ 
 		checkSession();
 
 		// These settings cannot be left empty!
-		if (empty($_POST['custom_avatar_dir']))
-			$_POST['custom_avatar_dir'] = $boarddir . '/custom_avatar';
+		if (empty($_POST['custom_avatar_dir'])) {
+					$_POST['custom_avatar_dir'] = $boarddir . '/custom_avatar';
+		}
 
-		if (empty($_POST['custom_avatar_url']))
-			$_POST['custom_avatar_url'] = $boardurl . '/custom_avatar';
+		if (empty($_POST['custom_avatar_url'])) {
+					$_POST['custom_avatar_url'] = $boardurl . '/custom_avatar';
+		}
 
-		if (empty($_POST['avatar_directory']))
-			$_POST['avatar_directory'] = $boarddir . '/avatars';
+		if (empty($_POST['avatar_directory'])) {
+					$_POST['avatar_directory'] = $boarddir . '/avatars';
+		}
 
-		if (empty($_POST['avatar_url']))
-			$_POST['avatar_url'] = $boardurl . '/avatars';
+		if (empty($_POST['avatar_url'])) {
+					$_POST['avatar_url'] = $boardurl . '/avatars';
+		}
 
 		call_integration_hook('integrate_save_avatar_settings');
 
@@ -406,11 +418,13 @@ 
 	$list_title = $txt['attachment_manager_browse_files'] . ': ';
 	foreach ($titles as $browse_type => $details)
 	{
-		if ($browse_type != 'attachments')
-			$list_title .= ' | ';
+		if ($browse_type != 'attachments') {
+					$list_title .= ' | ';
+		}
 
-		if ($context['browse_type'] == $browse_type)
-			$list_title .= '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;"> ';
+		if ($context['browse_type'] == $browse_type) {
+					$list_title .= '<img src="' . $settings['images_url'] . '/selected.png" alt="&gt;"> ';
+		}
 
 		$list_title .= '<a href="' . $scripturl . $details[0] . '">' . $details[1] . '</a>';
 	}
@@ -446,28 +460,33 @@ 
 						$link = '<a href="';
 
 						// In case of a custom avatar URL attachments have a fixed directory.
-						if ($rowData['attachment_type'] == 1)
-							$link .= sprintf('%1$s/%2$s', $modSettings['custom_avatar_url'], $rowData['filename']);
+						if ($rowData['attachment_type'] == 1) {
+													$link .= sprintf('%1$s/%2$s', $modSettings['custom_avatar_url'], $rowData['filename']);
+						}
 
 						// By default avatars are downloaded almost as attachments.
-						elseif ($context['browse_type'] == 'avatars')
-							$link .= sprintf('%1$s?action=dlattach;type=avatar;attach=%2$d', $scripturl, $rowData['id_attach']);
+						elseif ($context['browse_type'] == 'avatars') {
+													$link .= sprintf('%1$s?action=dlattach;type=avatar;attach=%2$d', $scripturl, $rowData['id_attach']);
+						}
 
 						// Normal attachments are always linked to a topic ID.
-						else
-							$link .= sprintf('%1$s?action=dlattach;topic=%2$d.0;attach=%3$d', $scripturl, $rowData['id_topic'], $rowData['id_attach']);
+						else {
+													$link .= sprintf('%1$s?action=dlattach;topic=%2$d.0;attach=%3$d', $scripturl, $rowData['id_topic'], $rowData['id_attach']);
+						}
 
 						$link .= '"';
 
 						// Show a popup on click if it's a picture and we know its dimensions.
-						if (!empty($rowData['width']) && !empty($rowData['height']))
-							$link .= sprintf(' onclick="return reqWin(this.href' . ($rowData['attachment_type'] == 1 ? '' : ' + \';image\'') . ', %1$d, %2$d, true);"', $rowData['width'] + 20, $rowData['height'] + 20);
+						if (!empty($rowData['width']) && !empty($rowData['height'])) {
+													$link .= sprintf(' onclick="return reqWin(this.href' . ($rowData['attachment_type'] == 1 ? '' : ' + \';image\'') . ', %1$d, %2$d, true);"', $rowData['width'] + 20, $rowData['height'] + 20);
+						}
 
 						$link .= sprintf('>%1$s</a>', preg_replace('~&amp;#(\\\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\\\1;', $smcFunc['htmlspecialchars']($rowData['filename'])));
 
 						// Show the dimensions.
-						if (!empty($rowData['width']) && !empty($rowData['height']))
-							$link .= sprintf(' <span class="smalltext">%1$dx%2$d</span>', $rowData['width'], $rowData['height']);
+						if (!empty($rowData['width']) && !empty($rowData['height'])) {
+													$link .= sprintf(' <span class="smalltext">%1$dx%2$d</span>', $rowData['width'], $rowData['height']);
+						}
 
 						return $link;
 					},
@@ -500,12 +519,14 @@ 
 					'function' => function($rowData) use ($scripturl, $smcFunc)
 					{
 						// In case of an attachment, return the poster of the attachment.
-						if (empty($rowData['id_member']))
-							return $smcFunc['htmlspecialchars']($rowData['poster_name']);
+						if (empty($rowData['id_member'])) {
+													return $smcFunc['htmlspecialchars']($rowData['poster_name']);
+						}
 
 						// Otherwise it must be an avatar, return the link to the owner of it.
-						else
-							return sprintf('<a href="%1$s?action=profile;u=%2$d">%3$s</a>', $scripturl, $rowData['id_member'], $rowData['poster_name']);
+						else {
+													return sprintf('<a href="%1$s?action=profile;u=%2$d">%3$s</a>', $scripturl, $rowData['id_member'], $rowData['poster_name']);
+						}
 					},
 				),
 				'sort' => array(
@@ -524,8 +545,9 @@ 
 						$date = empty($rowData['poster_time']) ? $txt['never'] : timeformat($rowData['poster_time']);
 
 						// Add a link to the topic in case of an attachment.
-						if ($context['browse_type'] !== 'avatars')
-							$date .= sprintf('<br>%1$s <a href="%2$s?topic=%3$d.msg%4$d#msg%4$d">%5$s</a>', $txt['in'], $scripturl, $rowData['id_topic'], $rowData['id_msg'], $rowData['subject']);
+						if ($context['browse_type'] !== 'avatars') {
+													$date .= sprintf('<br>%1$s <a href="%2$s?topic=%3$d.msg%4$d#msg%4$d">%5$s</a>', $txt['in'], $scripturl, $rowData['id_topic'], $rowData['id_msg'], $rowData['subject']);
+						}
 
 						return $date;
 					},
@@ -610,8 +632,8 @@ 
 	global $smcFunc, $txt;
 
 	// Choose a query depending on what we are viewing.
-	if ($browse_type === 'avatars')
-		$request = $smcFunc['db_query']('', '
+	if ($browse_type === 'avatars') {
+			$request = $smcFunc['db_query']('', '
 			SELECT
 				{string:blank_text} AS id_msg, COALESCE(mem.real_name, {string:not_applicable_text}) AS poster_name,
 				mem.last_login AS poster_time, 0 AS id_topic, a.id_member, a.id_attach, a.filename, a.file_hash, a.attachment_type,
@@ -630,8 +652,8 @@ 
 				'per_page' => $items_per_page,
 			)
 		);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT
 				m.id_msg, COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time, m.id_topic, m.id_member,
 				a.id_attach, a.filename, a.file_hash, a.attachment_type, a.size, a.width, a.height, a.downloads, mf.subject, t.id_board
@@ -650,9 +672,11 @@ 
 				'per_page' => $items_per_page,
 			)
 		);
+	}
 	$files = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$files[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$files[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $files;
@@ -670,8 +694,8 @@ 
 	global $smcFunc;
 
 	// Depending on the type of file, different queries are used.
-	if ($browse_type === 'avatars')
-		$request = $smcFunc['db_query']('', '
+	if ($browse_type === 'avatars') {
+			$request = $smcFunc['db_query']('', '
 		SELECT COUNT(*)
 		FROM {db_prefix}attachments
 		WHERE id_member != {int:guest_id_member}',
@@ -679,8 +703,8 @@ 
 			'guest_id_member' => 0,
 		)
 	);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*) AS num_attach
 			FROM {db_prefix}attachments AS a
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
@@ -693,6 +717,7 @@ 
 				'guest_id_member' => 0,
 			)
 		);
+	}
 
 	list ($num_files) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
@@ -775,12 +800,14 @@ 
 	$current_dir_size /= 1024;
 
 	// If they specified a limit only....
-	if (!empty($modSettings['attachmentDirSizeLimit']))
-		$context['attachment_space'] = comma_format(max($modSettings['attachmentDirSizeLimit'] - $current_dir_size, 0), 2);
+	if (!empty($modSettings['attachmentDirSizeLimit'])) {
+			$context['attachment_space'] = comma_format(max($modSettings['attachmentDirSizeLimit'] - $current_dir_size, 0), 2);
+	}
 	$context['attachment_current_size'] = comma_format($current_dir_size, 2);
 
-	if (!empty($modSettings['attachmentDirFileLimit']))
-		$context['attachment_files'] = comma_format(max($modSettings['attachmentDirFileLimit'] - $current_dir_files, 0), 0);
+	if (!empty($modSettings['attachmentDirFileLimit'])) {
+			$context['attachment_files'] = comma_format(max($modSettings['attachmentDirFileLimit'] - $current_dir_files, 0), 0);
+	}
 	$context['attachment_current_files'] = comma_format($current_dir_files, 0);
 
 	$context['attach_multiple_dirs'] = count($attach_dirs) > 1 ? true : false;
@@ -817,8 +844,8 @@ 
 		$messages = removeAttachments(array('attachment_type' => 0, 'poster_time' => (time() - 24 * 60 * 60 * $_POST['age'])), 'messages', true);
 
 		// Update the messages to reflect the change.
-		if (!empty($messages) && !empty($_POST['notice']))
-			$smcFunc['db_query']('', '
+		if (!empty($messages) && !empty($_POST['notice'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}messages
 				SET body = CONCAT(body, {string:notice})
 				WHERE id_msg IN ({array_int:messages})',
@@ -827,8 +854,8 @@ 
 					'notice' => '<br><br>' . $_POST['notice'],
 				)
 			);
-	}
-	else
+		}
+	} else
 	{
 		// Remove all the old avatars.
 		removeAttachments(array('not_id_member' => 0, 'last_login' => (time() - 24 * 60 * 60 * $_POST['age'])), 'members');
@@ -853,8 +880,8 @@ 
 	$messages = removeAttachments(array('attachment_type' => 0, 'size' => 1024 * $_POST['size']), 'messages', true);
 
 	// And make a note on the post.
-	if (!empty($messages) && !empty($_POST['notice']))
-		$smcFunc['db_query']('', '
+	if (!empty($messages) && !empty($_POST['notice'])) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}messages
 			SET body = CONCAT(body, {string:notice})
 			WHERE id_msg IN ({array_int:messages})',
@@ -863,6 +890,7 @@ 
 				'notice' => '<br><br>' . $_POST['notice'],
 			)
 		);
+	}
 
 	redirectexit('action=admin;area=manageattachments;sa=maintenance');
 }
@@ -882,16 +910,17 @@ 
 	{
 		$attachments = array();
 		// There must be a quicker way to pass this safety test??
-		foreach ($_POST['remove'] as $removeID => $dummy)
-			$attachments[] = (int) $removeID;
+		foreach ($_POST['remove'] as $removeID => $dummy) {
+					$attachments[] = (int) $removeID;
+		}
 
 		// If the attachments are from a 3rd party, let them remove it. Hooks should remove their ids from the array.
 		$filesRemoved = false;
 		call_integration_hook('integrate_attachment_remove', array(&$filesRemoved, $attachments));
 
-		if ($_REQUEST['type'] == 'avatars' && !empty($attachments))
-			removeAttachments(array('id_attach' => $attachments));
-		else if (!empty($attachments))
+		if ($_REQUEST['type'] == 'avatars' && !empty($attachments)) {
+					removeAttachments(array('id_attach' => $attachments));
+		} else if (!empty($attachments))
 		{
 			$messages = removeAttachments(array('id_attach' => $attachments), 'messages', true);
 
@@ -930,12 +959,13 @@ 
 
 	$messages = removeAttachments(array('attachment_type' => 0), '', true);
 
-	if (!isset($_POST['notice']))
-		$_POST['notice'] = $txt['attachment_delete_admin'];
+	if (!isset($_POST['notice'])) {
+			$_POST['notice'] = $txt['attachment_delete_admin'];
+	}
 
 	// Add the notice on the end of the changed messages.
-	if (!empty($messages))
-		$smcFunc['db_query']('', '
+	if (!empty($messages)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}messages
 			SET body = CONCAT(body, {string:deleted_message})
 			WHERE id_msg IN ({array_int:messages})',
@@ -944,6 +974,7 @@ 
 				'deleted_message' => '<br><br>' . $_POST['notice'],
 			)
 		);
+	}
 
 	redirectexit('action=admin;area=manageattachments;sa=maintenance');
 }
@@ -982,24 +1013,26 @@ 
 			$is_not = substr($real_type, 0, 4) == 'not_';
 			$type = $is_not ? substr($real_type, 4) : $real_type;
 
-			if (in_array($type, array('id_member', 'id_attach', 'id_msg')))
-				$new_condition[] = 'a.' . $type . ($is_not ? ' NOT' : '') . ' IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
-			elseif ($type == 'attachment_type')
-				$new_condition[] = 'a.attachment_type = {int:' . $real_type . '}';
-			elseif ($type == 'poster_time')
-				$new_condition[] = 'm.poster_time < {int:' . $real_type . '}';
-			elseif ($type == 'last_login')
-				$new_condition[] = 'mem.last_login < {int:' . $real_type . '}';
-			elseif ($type == 'size')
-				$new_condition[] = 'a.size > {int:' . $real_type . '}';
-			elseif ($type == 'id_topic')
-				$new_condition[] = 'm.id_topic IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			if (in_array($type, array('id_member', 'id_attach', 'id_msg'))) {
+							$new_condition[] = 'a.' . $type . ($is_not ? ' NOT' : '') . ' IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			} elseif ($type == 'attachment_type') {
+							$new_condition[] = 'a.attachment_type = {int:' . $real_type . '}';
+			} elseif ($type == 'poster_time') {
+							$new_condition[] = 'm.poster_time < {int:' . $real_type . '}';
+			} elseif ($type == 'last_login') {
+							$new_condition[] = 'mem.last_login < {int:' . $real_type . '}';
+			} elseif ($type == 'size') {
+							$new_condition[] = 'a.size > {int:' . $real_type . '}';
+			} elseif ($type == 'id_topic') {
+							$new_condition[] = 'm.id_topic IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
+			}
 
 			// Add the parameter!
 			$query_parameter[$real_type] = $restriction;
 
-			if ($type == 'do_logging')
-				$do_logging = $condition['id_attach'];
+			if ($type == 'do_logging') {
+							$do_logging = $condition['id_attach'];
+			}
 		}
 		$condition = implode(' AND ', $new_condition);
 	}
@@ -1031,15 +1064,15 @@ 
 			// wasn't it obvious? :P
 			// @todo look again at this.
 			@unlink($modSettings['custom_avatar_dir'] . '/' . $row['filename']);
-		}
-		else
+		} else
 		{
 			$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
 			@unlink($filename);
 
 			// If this was a thumb, the parent attachment should know about it.
-			if (!empty($row['id_parent']))
-				$parents[] = $row['id_parent'];
+			if (!empty($row['id_parent'])) {
+							$parents[] = $row['id_parent'];
+			}
 
 			// If this attachments has a thumb, remove it as well.
 			if (!empty($row['id_thumb']) && $autoThumbRemoval)
@@ -1051,8 +1084,9 @@ 
 		}
 
 		// Make a list.
-		if ($return_affected_messages && empty($row['attachment_type']))
-			$msgs[] = $row['id_msg'];
+		if ($return_affected_messages && empty($row['attachment_type'])) {
+					$msgs[] = $row['id_msg'];
+		}
 
 		$attach[] = $row['id_attach'];
 	}
@@ -1060,8 +1094,8 @@ 
 
 	// Removed attachments don't have to be updated anymore.
 	$parents = array_diff($parents, $attach);
-	if (!empty($parents))
-		$smcFunc['db_query']('', '
+	if (!empty($parents)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}attachments
 			SET id_thumb = {int:no_thumb}
 			WHERE id_attach IN ({array_int:parent_attachments})',
@@ -1070,6 +1104,7 @@ 
 				'no_thumb' => 0,
 			)
 		);
+	}
 
 	if (!empty($do_logging))
 	{
@@ -1086,31 +1121,34 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			logAction(
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					logAction(
 				'remove_attach',
 				array(
 					'message' => $row['id_msg'],
 					'filename' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', $smcFunc['htmlspecialchars']($row['filename'])),
 				)
 			);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($attach))
-		$smcFunc['db_query']('', '
+	if (!empty($attach)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}attachments
 			WHERE id_attach IN ({array_int:attachment_list})',
 			array(
 				'attachment_list' => $attach,
 			)
 		);
+	}
 
 	call_integration_hook('integrate_remove_attachments', array($attach));
 
-	if ($return_affected_messages)
-		return array_unique($msgs);
-}
+	if ($return_affected_messages) {
+			return array_unique($msgs);
+	}
+	}
 
 /**
  * This function should find attachments in the database that no longer exist and clear them, and fix filesize issues.
@@ -1122,8 +1160,9 @@ 
 	checkSession('get');
 
 	// If we choose cancel, redirect right back.
-	if (isset($_POST['cancel']))
-		redirectexit('action=admin;area=manageattachments;sa=maintenance');
+	if (isset($_POST['cancel'])) {
+			redirectexit('action=admin;area=manageattachments;sa=maintenance');
+	}
 
 	// Try give us a while to sort this out...
 	@set_time_limit(600);
@@ -1140,13 +1179,15 @@ 
 		if (isset($_GET['fixErrors']))
 		{
 			// Nothing?
-			if (empty($_POST['to_fix']))
-				redirectexit('action=admin;area=manageattachments;sa=maintenance');
+			if (empty($_POST['to_fix'])) {
+							redirectexit('action=admin;area=manageattachments;sa=maintenance');
+			}
 
 			$_SESSION['attachments_to_fix'] = array();
 			// @todo No need to do this I think.
-			foreach ($_POST['to_fix'] as $value)
-				$_SESSION['attachments_to_fix'][] = $value;
+			foreach ($_POST['to_fix'] as $value) {
+							$_SESSION['attachments_to_fix'][] = $value;
+			}
 		}
 	}
 
@@ -1213,13 +1254,14 @@ 
 					}
 				}
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'missing_thumbnail_parent';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'missing_thumbnail_parent';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_remove) && in_array('missing_thumbnail_parent', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_remove) && in_array('missing_thumbnail_parent', $to_fix)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}attachments
 					WHERE id_attach IN ({array_int:to_remove})
 						AND attachment_type = {int:attachment_type}',
@@ -1228,6 +1270,7 @@ 
 						'attachment_type' => 3,
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1272,13 +1315,14 @@ 
 				$to_update[] = $row['id_attach'];
 				$context['repair_errors']['parent_missing_thumbnail']++;
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'parent_missing_thumbnail';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'parent_missing_thumbnail';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_update) && in_array('parent_missing_thumbnail', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_update) && in_array('parent_missing_thumbnail', $to_fix)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}attachments
 					SET id_thumb = {int:no_thumb}
 					WHERE id_attach IN ({array_int:to_update})',
@@ -1287,6 +1331,7 @@ 
 						'no_thumb' => 0,
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1324,10 +1369,11 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($result))
 			{
 				// Get the filename.
-				if ($row['attachment_type'] == 1)
-					$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
-				else
-					$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+				if ($row['attachment_type'] == 1) {
+									$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
+				} else {
+									$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+				}
 
 				// File doesn't exist?
 				if (!file_exists($filename))
@@ -1339,15 +1385,16 @@ 
 						$attachment_name = $row['id_attach'] . '_' . $row['file_hash'] . '.dat';
 
 						// Loop through the other folders.
-						foreach ($modSettings['attachmentUploadDir'] as $id => $dir)
-							if (file_exists($dir . '/' . $attachment_name))
+						foreach ($modSettings['attachmentUploadDir'] as $id => $dir) {
+													if (file_exists($dir . '/' . $attachment_name))
 							{
 								$context['repair_errors']['wrong_folder']++;
+						}
 								$errors_found[] = 'wrong_folder';
 
 								// Are we going to fix this now?
-								if ($fix_errors && in_array('wrong_folder', $to_fix))
-									$smcFunc['db_query']('', '
+								if ($fix_errors && in_array('wrong_folder', $to_fix)) {
+																	$smcFunc['db_query']('', '
 										UPDATE {db_prefix}attachments
 										SET id_folder = {int:new_folder}
 										WHERE id_attach = {int:id_attach}',
@@ -1356,6 +1403,7 @@ 
 											'id_attach' => $row['id_attach'],
 										)
 									);
+								}
 
 								continue 2;
 							}
@@ -1364,8 +1412,7 @@ 
 					$to_remove[] = $row['id_attach'];
 					$context['repair_errors']['file_missing_on_disk']++;
 					$errors_found[] = 'file_missing_on_disk';
-				}
-				elseif (filesize($filename) == 0)
+				} elseif (filesize($filename) == 0)
 				{
 					$context['repair_errors']['file_size_of_zero']++;
 					$errors_found[] = 'file_size_of_zero';
@@ -1376,8 +1423,7 @@ 
 						$to_remove[] = $row['id_attach'];
 						@unlink($filename);
 					}
-				}
-				elseif (filesize($filename) != $row['size'])
+				} elseif (filesize($filename) != $row['size'])
 				{
 					$context['repair_errors']['file_wrong_size']++;
 					$errors_found[] = 'file_wrong_size';
@@ -1398,14 +1444,18 @@ 
 				}
 			}
 
-			if (in_array('file_missing_on_disk', $errors_found))
-				$to_fix[] = 'file_missing_on_disk';
-			if (in_array('file_size_of_zero', $errors_found))
-				$to_fix[] = 'file_size_of_zero';
-			if (in_array('file_wrong_size', $errors_found))
-				$to_fix[] = 'file_wrong_size';
-			if (in_array('wrong_folder', $errors_found))
-				$to_fix[] = 'wrong_folder';
+			if (in_array('file_missing_on_disk', $errors_found)) {
+							$to_fix[] = 'file_missing_on_disk';
+			}
+			if (in_array('file_size_of_zero', $errors_found)) {
+							$to_fix[] = 'file_size_of_zero';
+			}
+			if (in_array('file_wrong_size', $errors_found)) {
+							$to_fix[] = 'file_wrong_size';
+			}
+			if (in_array('wrong_folder', $errors_found)) {
+							$to_fix[] = 'wrong_folder';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
@@ -1475,20 +1525,22 @@ 
 				// If we are repairing remove the file from disk now.
 				if ($fix_errors && in_array('avatar_no_member', $to_fix))
 				{
-					if ($row['attachment_type'] == 1)
-						$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
-					else
-						$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+					if ($row['attachment_type'] == 1) {
+											$filename = $modSettings['custom_avatar_dir'] . '/' . $row['filename'];
+					} else {
+											$filename = getAttachmentFilename($row['filename'], $row['id_attach'], $row['id_folder'], false, $row['file_hash']);
+					}
 					@unlink($filename);
 				}
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'avatar_no_member';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'avatar_no_member';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_remove) && in_array('avatar_no_member', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_remove) && in_array('avatar_no_member', $to_fix)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}attachments
 					WHERE id_attach IN ({array_int:to_remove})
 						AND id_member != {int:no_member}
@@ -1499,6 +1551,7 @@ 
 						'no_msg' => 0,
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1558,13 +1611,14 @@ 
 					@unlink($filename);
 				}
 			}
-			if ($smcFunc['db_num_rows']($result) != 0)
-				$to_fix[] = 'attachment_no_msg';
+			if ($smcFunc['db_num_rows']($result) != 0) {
+							$to_fix[] = 'attachment_no_msg';
+			}
 			$smcFunc['db_free_result']($result);
 
 			// Do we need to delete what we have?
-			if ($fix_errors && !empty($to_remove) && in_array('attachment_no_msg', $to_fix))
-				$smcFunc['db_query']('', '
+			if ($fix_errors && !empty($to_remove) && in_array('attachment_no_msg', $to_fix)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}attachments
 					WHERE id_attach IN ({array_int:to_remove})
 						AND id_member = {int:no_member}
@@ -1575,6 +1629,7 @@ 
 						'attach_thumb' => array(0,3),
 					)
 				);
+			}
 
 			pauseAttachmentMaintenance($to_fix, $thumbnails);
 		}
@@ -1598,8 +1653,9 @@ 
 			{
 				while ($file = readdir($dir))
 				{
-					if (in_array($file, array('.', '..', '.htaccess', 'index.php')))
-						continue;
+					if (in_array($file, array('.', '..', '.htaccess', 'index.php'))) {
+											continue;
+					}
 
 					if ($files_checked <= $current_check)
 					{
@@ -1607,8 +1663,9 @@ 
 						if (strpos($file, 'post_tmp_') !== false)
 						{
 							// Temp file is more than 5 hours old!
-							if (filemtime($attach_dir . '/' . $file) < time() - 18000)
-								@unlink($attach_dir . '/' . $file);
+							if (filemtime($attach_dir . '/' . $file) < time() - 18000) {
+															@unlink($attach_dir . '/' . $file);
+							}
 						}
 						// That should be an attachment, let's check if we have it in the database
 						elseif (strpos($file, '_') !== false)
@@ -1630,8 +1687,7 @@ 
 									if ($fix_errors && in_array('files_without_attachment', $to_fix))
 									{
 										@unlink($attach_dir . '/' . $file);
-									}
-									else
+									} else
 									{
 										$context['repair_errors']['files_without_attachment']++;
 										$to_fix[] = 'files_without_attachment';
@@ -1639,14 +1695,12 @@ 
 								}
 								$smcFunc['db_free_result']($request);
 							}
-						}
-						else
+						} else
 						{
 							if ($fix_errors && in_array('files_without_attachment', $to_fix))
 							{
 								@unlink($attach_dir . '/' . $file);
-							}
-							else
+							} else
 							{
 								$context['repair_errors']['files_without_attachment']++;
 								$to_fix[] = 'files_without_attachment';
@@ -1655,8 +1709,9 @@ 
 					}
 					$current_check++;
 					$_GET['substep'] = $current_check;
-					if ($current_check - $files_checked >= $max_checks)
-						pauseAttachmentMaintenance($to_fix);
+					if ($current_check - $files_checked >= $max_checks) {
+											pauseAttachmentMaintenance($to_fix);
+					}
 				}
 				closedir($dir);
 			}
@@ -1692,12 +1747,14 @@ 
 
 	// Try get more time...
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Have we already used our maximum time?
-	if ((time() - $time_start) < 3 || $context['starting_substep'] == $_GET['substep'])
-		return;
+	if ((time() - $time_start) < 3 || $context['starting_substep'] == $_GET['substep']) {
+			return;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=manageattachments;sa=repair' . (isset($_GET['fixErrors']) ? ';fixErrors' : '') . ';step=' . $_GET['step'] . ';substep=' . $_GET['substep'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -1709,10 +1766,11 @@ 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'maintenance';
 
 	// Change these two if more steps are added!
-	if (empty($max_substep))
-		$context['continue_percent'] = round(($_GET['step'] * 100) / 25);
-	else
-		$context['continue_percent'] = round(($_GET['step'] * 100 + ($_GET['substep'] * 100) / $max_substep) / 25);
+	if (empty($max_substep)) {
+			$context['continue_percent'] = round(($_GET['step'] * 100) / 25);
+	} else {
+			$context['continue_percent'] = round(($_GET['step'] * 100 + ($_GET['substep'] * 100) / $max_substep) / 25);
+	}
 
 	// Never more than 100%!
 	$context['continue_percent'] = min($context['continue_percent'], 100);
@@ -1754,15 +1812,17 @@ 
 				'attachment_type' => 0,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$attachments[] = $row['id_attach'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$attachments[] = $row['id_attach'];
+		}
 		$smcFunc['db_free_result']($request);
+	} elseif (!empty($_GET['aid'])) {
+			$attachments[] = (int) $_GET['aid'];
 	}
-	elseif (!empty($_GET['aid']))
-		$attachments[] = (int) $_GET['aid'];
 
-	if (empty($attachments))
-		fatal_lang_error('no_access', false);
+	if (empty($attachments)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Now we have some ID's cleaned and ready to approve, but first - let's check we have permission!
 	$allowed_boards = boardsAllowedTo('approve_posts');
@@ -1795,17 +1855,18 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($attachments))
-		fatal_lang_error('no_access', false);
+	if (empty($attachments)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Finally, we are there. Follow through!
 	if ($is_approve)
 	{
 		// Checked and deemed worthy.
 		ApproveAttachments($attachments);
+	} else {
+			removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
 	}
-	else
-		removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
 
 	// Return to the topic....
 	redirectexit($redirect);
@@ -1821,8 +1882,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($attachments))
-		return 0;
+	if (empty($attachments)) {
+			return 0;
+	}
 
 	// For safety, check for thumbnails...
 	$request = $smcFunc['db_query']('', '
@@ -1841,15 +1903,17 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Update the thumbnail too...
-		if (!empty($row['id_thumb']))
-			$attachments[] = $row['id_thumb'];
+		if (!empty($row['id_thumb'])) {
+					$attachments[] = $row['id_thumb'];
+		}
 
 		$attachments[] = $row['id_attach'];
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($attachments))
-		return 0;
+	if (empty($attachments)) {
+			return 0;
+	}
 
 	// Approving an attachment is not hard - it's easy.
 	$smcFunc['db_query']('', '
@@ -1875,14 +1939,15 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		logAction(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			logAction(
 			'approve_attach',
 			array(
 				'message' => $row['id_msg'],
 				'filename' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', $smcFunc['htmlspecialchars']($row['filename'])),
 			)
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Remove from the approval queue.
@@ -1905,11 +1970,11 @@ 
 	global $modSettings, $scripturl, $context, $txt, $sourcedir, $boarddir, $smcFunc, $settings;
 
 	// Since this needs to be done eventually.
-	if (!isset($modSettings['attachment_basedirectories']))
-		$modSettings['attachment_basedirectories'] = array();
-
-	elseif (!is_array($modSettings['attachment_basedirectories']))
-		$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+	if (!isset($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = array();
+	} elseif (!is_array($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+	}
 
 	$errors = array();
 
@@ -1924,8 +1989,9 @@ 
 		{
 			$error = '';
 			$id = (int) $id;
-			if ($id < 1)
-				continue;
+			if ($id < 1) {
+							continue;
+			}
 
 			// Sorry, these dirs are NOT valid
 			$invalid_dirs = array($boarddir, $settings['default_theme_dir'], $sourcedir);
@@ -1944,8 +2010,7 @@ 
 				{
 						$errors[] = $path . ': ' . $txt['attach_dir_duplicate_msg'];
 						continue;
-				}
-				elseif (empty($path))
+				} elseif (empty($path))
 				{
 					// Ignore this and set $id to one less
 					continue;
@@ -1953,10 +2018,11 @@ 
 
 				// OK, so let's try to create it then.
 				require_once($sourcedir . '/Subs-Attachments.php');
-				if (automanage_attachments_create_directory($path))
-					$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
-				else
-					$errors[] = $path . ': ' . $txt[$context['dir_creation_error']];
+				if (automanage_attachments_create_directory($path)) {
+									$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+				} else {
+									$errors[] = $path . ': ' . $txt[$context['dir_creation_error']];
+				}
 			}
 
 			// Changing a directory name?
@@ -1969,8 +2035,7 @@ 
 						$errors[] = $path . ': ' . $txt['attach_dir_no_rename'];
 						$path = $modSettings['attachmentUploadDir'][$id];
 					}
-				}
-				else
+				} else
 				{
 					$errors[] = $path . ': ' . $txt['attach_dir_exists_msg'];
 					$path = $modSettings['attachmentUploadDir'][$id];
@@ -1995,12 +2060,13 @@ 
 				$path = $modSettings['attachmentUploadDir'][$id];
 
 				// It's not a good idea to delete the current directory.
-				if ($id == (!empty($_POST['current_dir']) ? $_POST['current_dir'] : $modSettings['currentAttachmentUploadDir']))
-					$errors[] = $path . ': ' . $txt['attach_dir_is_current'];
+				if ($id == (!empty($_POST['current_dir']) ? $_POST['current_dir'] : $modSettings['currentAttachmentUploadDir'])) {
+									$errors[] = $path . ': ' . $txt['attach_dir_is_current'];
+				}
 				// Or the current base directory
-				elseif (!empty($modSettings['basedirectory_for_attachments']) && $modSettings['basedirectory_for_attachments'] == $modSettings['attachmentUploadDir'][$id])
-					$errors[] = $path . ': ' . $txt['attach_dir_is_current_bd'];
-				else
+				elseif (!empty($modSettings['basedirectory_for_attachments']) && $modSettings['basedirectory_for_attachments'] == $modSettings['attachmentUploadDir'][$id]) {
+									$errors[] = $path . ': ' . $txt['attach_dir_is_current_bd'];
+				} else
 				{
 					// Let's not try to delete a path with files in it.
 					$request = $smcFunc['db_query']('', '
@@ -2019,17 +2085,18 @@ 
 					if (!empty($modSettings['attachment_basedirectories']))
 					{
 						// Count any sub-folders.
-						foreach ($modSettings['attachmentUploadDir'] as $sub)
-							if (strpos($sub, $path . DIRECTORY_SEPARATOR) !== false)
+						foreach ($modSettings['attachmentUploadDir'] as $sub) {
+													if (strpos($sub, $path . DIRECTORY_SEPARATOR) !== false)
 								$num_attach++;
+						}
 					}
 
 					// It's safe to delete. So try to delete the folder also
 					if ($num_attach == 0)
 					{
-						if (is_dir($path))
-							$doit = true;
-						elseif (is_dir($boarddir . DIRECTORY_SEPARATOR . $path))
+						if (is_dir($path)) {
+													$doit = true;
+						} elseif (is_dir($boarddir . DIRECTORY_SEPARATOR . $path))
 						{
 							$doit = true;
 							$path = $boarddir . DIRECTORY_SEPARATOR . $path;
@@ -2039,8 +2106,9 @@ 
 						{
 							unlink($path . '/.htaccess');
 							unlink($path . '/index.php');
-							if (!@rmdir($path))
-								$error = $path . ': ' . $txt['attach_dir_no_delete'];
+							if (!@rmdir($path)) {
+															$error = $path . ': ' . $txt['attach_dir_no_delete'];
+							}
 						}
 
 						// Remove it from the base directory list.
@@ -2050,14 +2118,15 @@ 
 							updateSettings(array('attachment_basedirectories' => $smcFunc['json_encode']($modSettings['attachment_basedirectories'])));
 							$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
 						}
+					} else {
+											$error = $path . ': ' . $txt['attach_dir_no_remove'];
 					}
-					else
-						$error = $path . ': ' . $txt['attach_dir_no_remove'];
 
-					if (empty($error))
-						continue;
-					else
-						$errors[] = $error;
+					if (empty($error)) {
+											continue;
+					} else {
+											$errors[] = $error;
+					}
 				}
 			}
 
@@ -2065,23 +2134,26 @@ 
 		}
 
 		// We need to make sure the current directory is right.
-		if (empty($_POST['current_dir']) && !empty($modSettings['currentAttachmentUploadDir']))
-			$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+		if (empty($_POST['current_dir']) && !empty($modSettings['currentAttachmentUploadDir'])) {
+					$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+		}
 
 		// Find the current directory if there's no value carried,
 		if (empty($_POST['current_dir']) || empty($new_dirs[$_POST['current_dir']]))
 		{
-			if (array_key_exists($modSettings['currentAttachmentUploadDir'], $modSettings['attachmentUploadDir']))
-				$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
-			else
-				$_POST['current_dir'] = max(array_keys($modSettings['attachmentUploadDir']));
+			if (array_key_exists($modSettings['currentAttachmentUploadDir'], $modSettings['attachmentUploadDir'])) {
+							$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
+			} else {
+							$_POST['current_dir'] = max(array_keys($modSettings['attachmentUploadDir']));
+			}
 		}
 
 		// If the user wishes to go back, update the last_dir array
 		if ($_POST['current_dir'] != $modSettings['currentAttachmentUploadDir'] && !empty($modSettings['last_attachments_directory']) && (isset($modSettings['last_attachments_directory'][$_POST['current_dir']]) || isset($modSettings['last_attachments_directory'][0])))
 		{
-			if (!is_array($modSettings['last_attachments_directory']))
-				$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
+			if (!is_array($modSettings['last_attachments_directory'])) {
+							$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
+			}
 			$num = substr(strrchr($modSettings['attachmentUploadDir'][$_POST['current_dir']], '_'), 1);
 
 			if (is_numeric($num))
@@ -2089,16 +2161,18 @@ 
 				// Need to find the base folder.
 				$bid = -1;
 				$use_subdirectories_for_attachments = 0;
-				if (!empty($modSettings['attachment_basedirectories']))
-					foreach ($modSettings['attachment_basedirectories'] as $bid => $base)
+				if (!empty($modSettings['attachment_basedirectories'])) {
+									foreach ($modSettings['attachment_basedirectories'] as $bid => $base)
 						if (strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $base . DIRECTORY_SEPARATOR) !== false)
 						{
 							$use_subdirectories_for_attachments = 1;
+				}
 							break;
 						}
 
-				if ($use_subdirectories_for_attachments == 0 && strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $boarddir . DIRECTORY_SEPARATOR) !== false)
-					$bid = 0;
+				if ($use_subdirectories_for_attachments == 0 && strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $boarddir . DIRECTORY_SEPARATOR) !== false) {
+									$bid = 0;
+				}
 
 				$modSettings['last_attachments_directory'][$bid] = (int) $num;
 				$modSettings['basedirectory_for_attachments'] = !empty($modSettings['basedirectory_for_attachments']) ? $modSettings['basedirectory_for_attachments'] : '';
@@ -2117,8 +2191,8 @@ 
 			// We might need to reset the paths. This loop will just loop through once.
 			foreach ($new_dirs as $id => $dir)
 			{
-				if ($id != 1)
-					$smcFunc['db_query']('', '
+				if ($id != 1) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}attachments
 						SET id_folder = {int:default_folder}
 						WHERE id_folder = {int:current_folder}',
@@ -2127,14 +2201,14 @@ 
 							'current_folder' => $id,
 						)
 					);
+				}
 
 				$update = array(
 					'currentAttachmentUploadDir' => 1,
 					'attachmentUploadDir' => $smcFunc['json_encode'](array(1 => $dir)),
 				);
 			}
-		}
-		else
+		} else
 		{
 			// Save it to the database.
 			$update = array(
@@ -2143,11 +2217,13 @@ 
 			);
 		}
 
-		if (!empty($update))
-			updateSettings($update);
+		if (!empty($update)) {
+					updateSettings($update);
+		}
 
-		if (!empty($errors))
-			$_SESSION['errors']['dir'] = $errors;
+		if (!empty($errors)) {
+					$_SESSION['errors']['dir'] = $errors;
+		}
 
 		redirectexit('action=admin;area=manageattachments;sa=attachpaths;' . $context['session_var'] . '=' . $context['session_id']);
 	}
@@ -2161,10 +2237,11 @@ 
 		$_POST['current_base_dir'] = isset($_POST['current_base_dir']) ? (int) $_POST['current_base_dir'] : 1;
 		if (empty($_POST['new_base_dir']) && !empty($_POST['current_base_dir']))
 		{
-			if ($modSettings['basedirectory_for_attachments'] != $modSettings['attachmentUploadDir'][$_POST['current_base_dir']])
-				$update = (array(
+			if ($modSettings['basedirectory_for_attachments'] != $modSettings['attachmentUploadDir'][$_POST['current_base_dir']]) {
+							$update = (array(
 					'basedirectory_for_attachments' => $modSettings['attachmentUploadDir'][$_POST['current_base_dir']],
 				));
+			}
 		}
 
 		if (isset($_POST['base_dir']))
@@ -2212,13 +2289,15 @@ 
 
 			if (!in_array($_POST['new_base_dir'], $modSettings['attachmentUploadDir']))
 			{
-				if (!automanage_attachments_create_directory($_POST['new_base_dir']))
-					$errors[] = $_POST['new_base_dir'] . ': ' . $txt['attach_dir_base_no_create'];
+				if (!automanage_attachments_create_directory($_POST['new_base_dir'])) {
+									$errors[] = $_POST['new_base_dir'] . ': ' . $txt['attach_dir_base_no_create'];
+				}
 			}
 
 			$modSettings['currentAttachmentUploadDir'] = array_search($_POST['new_base_dir'], $modSettings['attachmentUploadDir']);
-			if (!in_array($_POST['new_base_dir'], $modSettings['attachment_basedirectories']))
-				$modSettings['attachment_basedirectories'][$modSettings['currentAttachmentUploadDir']] = $_POST['new_base_dir'];
+			if (!in_array($_POST['new_base_dir'], $modSettings['attachment_basedirectories'])) {
+							$modSettings['attachment_basedirectories'][$modSettings['currentAttachmentUploadDir']] = $_POST['new_base_dir'];
+			}
 			ksort($modSettings['attachment_basedirectories']);
 
 			$update = (array(
@@ -2228,11 +2307,13 @@ 
 			));
 		}
 
-		if (!empty($errors))
-			$_SESSION['errors']['base'] = $errors;
+		if (!empty($errors)) {
+					$_SESSION['errors']['base'] = $errors;
+		}
 
-		if (!empty($update))
-			updateSettings($update);
+		if (!empty($update)) {
+					updateSettings($update);
+		}
 
 		redirectexit('action=admin;area=manageattachments;sa=attachpaths;' . $context['session_var'] . '=' . $context['session_id']);
 	}
@@ -2242,13 +2323,15 @@ 
 		if (is_array($_SESSION['errors']))
 		{
 			$errors = array();
-			if (!empty($_SESSION['errors']['dir']))
-				foreach ($_SESSION['errors']['dir'] as $error)
+			if (!empty($_SESSION['errors']['dir'])) {
+							foreach ($_SESSION['errors']['dir'] as $error)
 					$errors['dir'][] = $smcFunc['htmlspecialchars']($error, ENT_QUOTES);
+			}
 
-			if (!empty($_SESSION['errors']['base']))
-				foreach ($_SESSION['errors']['base'] as $error)
+			if (!empty($_SESSION['errors']['base'])) {
+							foreach ($_SESSION['errors']['base'] as $error)
 					$errors['base'][] = $smcFunc['htmlspecialchars']($error, ENT_QUOTES);
+			}
 		}
 		unset($_SESSION['errors']);
 	}
@@ -2458,8 +2541,9 @@ 
 	foreach ($modSettings['attachmentUploadDir'] as $id => $dir)
 	{
 		// If there aren't any attachments in this directory this won't exist.
-		if (!isset($expected_files[$id]))
-			$expected_files[$id] = 0;
+		if (!isset($expected_files[$id])) {
+					$expected_files[$id] = 0;
+		}
 
 		// Check if the directory is doing okay.
 		list ($status, $error, $files) = attachDirStatus($dir, $expected_files[$id]);
@@ -2472,10 +2556,11 @@ 
 			$is_base_dir = in_array($dir, $modSettings['attachment_basedirectories']);
 
 			// Count any sub-folders.
-			foreach ($modSettings['attachmentUploadDir'] as $sid => $sub)
-				if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
+			foreach ($modSettings['attachmentUploadDir'] as $sid => $sub) {
+							if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
 				{
 					$expected_files[$id]++;
+			}
 					$sub_dirs++;
 				}
 		}
@@ -2493,8 +2578,8 @@ 
 	}
 
 	// Just stick a new directory on at the bottom.
-	if (isset($_REQUEST['new_path']))
-		$attachdirs[] = array(
+	if (isset($_REQUEST['new_path'])) {
+			$attachdirs[] = array(
 			'id' => max(array_merge(array_keys($expected_files), array_keys($modSettings['attachmentUploadDir']))) + 1,
 			'current' => false,
 			'path' => '',
@@ -2502,6 +2587,7 @@ 
 			'num_files' => '',
 			'status' => '',
 		);
+	}
 
 	return $attachdirs;
 }
@@ -2514,8 +2600,9 @@ 
 {
 	global $modSettings, $txt;
 
-	if (empty($modSettings['attachment_basedirectories']))
-		return;
+	if (empty($modSettings['attachment_basedirectories'])) {
+			return;
+	}
 
 	$basedirs = array();
 	// Get a list of the base directories.
@@ -2523,16 +2610,18 @@ 
 	{
 		// Loop through the attach directory array to count any sub-directories
 		$expected_dirs = 0;
-		foreach ($modSettings['attachmentUploadDir'] as $sid => $sub)
-			if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
+		foreach ($modSettings['attachmentUploadDir'] as $sid => $sub) {
+					if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
 				$expected_dirs++;
+		}
 
-		if (!is_dir($dir))
-			$status = 'does_not_exist';
-		elseif (!is_writeable($dir))
-			$status = 'not_writable';
-		else
-			$status = 'ok';
+		if (!is_dir($dir)) {
+					$status = 'does_not_exist';
+		} elseif (!is_writeable($dir)) {
+					$status = 'not_writable';
+		} else {
+					$status = 'ok';
+		}
 
 		$basedirs[] = array(
 			'id' => $id,
@@ -2543,14 +2632,15 @@ 
 		);
 	}
 
-	if (isset($_REQUEST['new_base_path']))
-		$basedirs[] = array(
+	if (isset($_REQUEST['new_base_path'])) {
+			$basedirs[] = array(
 			'id' => '',
 			'current' => false,
 			'path' => '<input type="text" name="new_base_dir" value="" size="40">',
 			'num_dirs' => '',
 			'status' => '',
 		);
+	}
 
 	return $basedirs;
 }
@@ -2566,10 +2656,11 @@ 
  */
 function attachDirStatus($dir, $expected_files)
 {
-	if (!is_dir($dir))
-		return array('does_not_exist', true, '');
-	elseif (!is_writable($dir))
-		return array('not_writable', true, '');
+	if (!is_dir($dir)) {
+			return array('does_not_exist', true, '');
+	} elseif (!is_writable($dir)) {
+			return array('not_writable', true, '');
+	}
 
 	// Everything is okay so far, start to scan through the directory.
 	$num_files = 0;
@@ -2577,22 +2668,26 @@ 
 	while ($file = $dir_handle->read())
 	{
 		// Now do we have a real file here?
-		if (in_array($file, array('.', '..', '.htaccess', 'index.php')))
-			continue;
+		if (in_array($file, array('.', '..', '.htaccess', 'index.php'))) {
+					continue;
+		}
 
 		$num_files++;
 	}
 	$dir_handle->close();
 
-	if ($num_files < $expected_files)
-		return array('files_missing', true, $num_files);
+	if ($num_files < $expected_files) {
+			return array('files_missing', true, $num_files);
+	}
 	// Empty?
-	elseif ($expected_files == 0)
-		return array('unused', false, $num_files);
+	elseif ($expected_files == 0) {
+			return array('unused', false, $num_files);
+	}
 	// All good!
-	else
-		return array('ok', false, $num_files);
-}
+	else {
+			return array('ok', false, $num_files);
+	}
+	}
 
 /**
  * Maintance function to move attachments from one directory to another
@@ -2604,10 +2699,11 @@ 
 	checkSession();
 
 	$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
-	if (!empty($modSettings['attachment_basedirectories']))
-		$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
-	else
-		$modSettings['basedirectory_for_attachments'] = array();
+	if (!empty($modSettings['attachment_basedirectories'])) {
+			$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+	} else {
+			$modSettings['basedirectory_for_attachments'] = array();
+	}
 
 	$_POST['from'] = (int) $_POST['from'];
 	$_POST['auto'] = !empty($_POST['auto']) ? (int) $_POST['auto'] : 0;
@@ -2621,11 +2717,13 @@ 
 	$total_moved = 0;
 	$total_not_moved = 0;
 
-	if (empty($_POST['from']) || (empty($_POST['auto']) && empty($_POST['to'])))
-		$results[] = $txt['attachment_transfer_no_dir'];
+	if (empty($_POST['from']) || (empty($_POST['auto']) && empty($_POST['to']))) {
+			$results[] = $txt['attachment_transfer_no_dir'];
+	}
 
-	if ($_POST['from'] == $_POST['to'])
-		$results[] = $txt['attachment_transfer_same_dir'];
+	if ($_POST['from'] == $_POST['to']) {
+			$results[] = $txt['attachment_transfer_same_dir'];
+	}
 
 	if (empty($results))
 	{
@@ -2644,8 +2742,9 @@ 
 		$smcFunc['db_free_result']($request);
 		$total_progress -= $start;
 
-		if ($total_progress < 1)
-			$results[] = $txt['attachment_transfer_no_find'];
+		if ($total_progress < 1) {
+					$results[] = $txt['attachment_transfer_no_find'];
+		}
 	}
 
 	if (empty($results))
@@ -2661,9 +2760,9 @@ 
 
 			automanage_attachments_check_directory();
 			$new_dir = $modSettings['currentAttachmentUploadDir'];
+		} else {
+					$new_dir = $_POST['to'];
 		}
-		else
-			$new_dir = $_POST['to'];
 
 		$modSettings['currentAttachmentUploadDir'] = $new_dir;
 
@@ -2671,8 +2770,9 @@ 
 		while ($break == false)
 		{
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			// If limits are set, get the file count and size for the destination folder
 			if ($dir_files <= 0 && (!empty($modSettings['attachmentDirSizeLimit']) || !empty($modSettings['attachmentDirFileLimit'])))
@@ -2708,13 +2808,15 @@ 
 
 			if ($smcFunc['db_num_rows']($request) === 0)
 			{
-				if (empty($current_progress))
-					$results[] = $txt['attachment_transfer_no_find'];
+				if (empty($current_progress)) {
+									$results[] = $txt['attachment_transfer_no_find'];
+				}
 				break;
 			}
 
-			if ($smcFunc['db_num_rows']($request) < $limit)
-				$break = true;
+			if ($smcFunc['db_num_rows']($request) < $limit) {
+							$break = true;
+			}
 
 			// Move them
 			$moved = array();
@@ -2738,8 +2840,9 @@ 
 							automanage_attachments_by_space();
 
 							$results[] = sprintf($txt['attachments_transferred'], $total_moved, $modSettings['attachmentUploadDir'][$new_dir]);
-							if (!empty($total_not_moved))
-								$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+							if (!empty($total_not_moved)) {
+															$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+							}
 
 							$dir_files = 0;
 							$total_moved = 0;
@@ -2747,8 +2850,7 @@ 
 
 							$break = false;
 							break;
-						}
-						else
+						} else
 						{
 							// Hmm, not in auto. Time to bail out then...
 							$results[] = $txt['attachment_transfer_no_room'];
@@ -2763,9 +2865,9 @@ 
 					$total_moved++;
 					$current_progress++;
 					$moved[] = $row['id_attach'];
+				} else {
+									$total_not_moved++;
 				}
-				else
-					$total_not_moved++;
 			}
 			$smcFunc['db_free_result']($request);
 
@@ -2803,13 +2905,15 @@ 
 		}
 
 		$results[] = sprintf($txt['attachments_transferred'], $total_moved, $modSettings['attachmentUploadDir'][$new_dir]);
-		if (!empty($total_not_moved))
-			$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+		if (!empty($total_not_moved)) {
+					$results[] = sprintf($txt['attachments_not_transferred'], $total_not_moved);
+		}
 	}
 
 	$_SESSION['results'] = $results;
-	if (file_exists($boarddir . '/progress.php'))
-		unlink($boarddir . '/progress.php');
+	if (file_exists($boarddir . '/progress.php')) {
+			unlink($boarddir . '/progress.php');
+	}
 
 	redirectexit('action=admin;area=manageattachments;sa=maintenance#transfer');
 }

Sources/ManageMaintenance.php

Braces +266 added lines, -197 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Main dispatcher, the maintenance access point.
@@ -96,14 +97,16 @@ 
 	call_integration_hook('integrate_manage_maintenance', array(&$subActions));
 
 	// Yep, sub-action time!
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$subAction = $_REQUEST['sa'];
-	else
-		$subAction = 'routine';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$subAction = $_REQUEST['sa'];
+	} else {
+			$subAction = 'routine';
+	}
 
 	// Doing something special?
-	if (isset($_REQUEST['activity']) && isset($subActions[$subAction]['activities'][$_REQUEST['activity']]))
-		$activity = $_REQUEST['activity'];
+	if (isset($_REQUEST['activity']) && isset($subActions[$subAction]['activities'][$_REQUEST['activity']])) {
+			$activity = $_REQUEST['activity'];
+	}
 
 	// Set a few things.
 	$context['page_title'] = $txt['maintain_title'];
@@ -114,12 +117,14 @@ 
 	call_helper($subActions[$subAction]['function']);
 
 	// Any special activity?
-	if (isset($activity))
-		call_helper($subActions[$subAction]['activities'][$activity]);
+	if (isset($activity)) {
+			call_helper($subActions[$subAction]['activities'][$activity]);
+	}
 
 	//converted to UTF-8? show a small maintenance info
-	if (isset($_GET['done']) && $_GET['done'] == 'convertutf8')
-		$context['maintenance_finished'] = $txt['utf8_title'];
+	if (isset($_GET['done']) && $_GET['done'] == 'convertutf8') {
+			$context['maintenance_finished'] = $txt['utf8_title'];
+	}
 
 	// Create a maintenance token.  Kinda hard to do it any other way.
 	createToken('admin-maint');
@@ -141,19 +146,22 @@ 
 		db_extend('packages');
 
 		$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-		foreach ($colData as $column)
-			if ($column['name'] == 'body')
+		foreach ($colData as $column) {
+					if ($column['name'] == 'body')
 				$body_type = $column['type'];
+		}
 
 		$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
 		$context['convert_to_suggest'] = ($body_type != 'text' && !empty($modSettings['max_messageLength']) && $modSettings['max_messageLength'] < 65536);
 	}
 
-	if (isset($_GET['done']) && $_GET['done'] == 'convertutf8')
-		$context['maintenance_finished'] = $txt['utf8_title'];
-	if (isset($_GET['done']) && $_GET['done'] == 'convertentities')
-		$context['maintenance_finished'] = $txt['entity_convert_title'];
-}
+	if (isset($_GET['done']) && $_GET['done'] == 'convertutf8') {
+			$context['maintenance_finished'] = $txt['utf8_title'];
+	}
+	if (isset($_GET['done']) && $_GET['done'] == 'convertentities') {
+			$context['maintenance_finished'] = $txt['entity_convert_title'];
+	}
+	}
 
 /**
  * Supporting function for the routine maintenance area.
@@ -162,9 +170,10 @@ 
 {
 	global $context, $txt;
 
-	if (isset($_GET['done']) && $_GET['done'] == 'recount')
-		$context['maintenance_finished'] = $txt['maintain_recount'];
-}
+	if (isset($_GET['done']) && $_GET['done'] == 'recount') {
+			$context['maintenance_finished'] = $txt['maintain_recount'];
+	}
+	}
 
 /**
  * Supporting function for the members maintenance area.
@@ -195,8 +204,9 @@ 
 	}
 	$smcFunc['db_free_result']($result);
 
-	if (isset($_GET['done']) && $_GET['done'] == 'recountposts')
-		$context['maintenance_finished'] = $txt['maintain_recountposts'];
+	if (isset($_GET['done']) && $_GET['done'] == 'recountposts') {
+			$context['maintenance_finished'] = $txt['maintain_recountposts'];
+	}
 
 	loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 }
@@ -222,11 +232,12 @@ 
 	$context['categories'] = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
 			'id' => $row['id_board'],
@@ -239,11 +250,12 @@ 
 	require_once($sourcedir . '/Subs-Boards.php');
 	sortCategories($context['categories']);
 
-	if (isset($_GET['done']) && $_GET['done'] == 'purgeold')
-		$context['maintenance_finished'] = $txt['maintain_old'];
-	elseif (isset($_GET['done']) && $_GET['done'] == 'massmove')
-		$context['maintenance_finished'] = $txt['move_topics_maintenance'];
-}
+	if (isset($_GET['done']) && $_GET['done'] == 'purgeold') {
+			$context['maintenance_finished'] = $txt['maintain_old'];
+	} elseif (isset($_GET['done']) && $_GET['done'] == 'massmove') {
+			$context['maintenance_finished'] = $txt['move_topics_maintenance'];
+	}
+	}
 
 /**
  * Find and fix all errors on the forum.
@@ -351,15 +363,17 @@ 
 	// Show me your badge!
 	isAllowedTo('admin_forum');
 
-	if ($db_type != 'mysql')
-		return;
+	if ($db_type != 'mysql') {
+			return;
+	}
 
 	db_extend('packages');
 
 	$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-	foreach ($colData as $column)
-		if ($column['name'] == 'body')
+	foreach ($colData as $column) {
+			if ($column['name'] == 'body')
 			$body_type = $column['type'];
+	}
 
 	$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
 
@@ -369,33 +383,36 @@ 
 		validateToken('admin-maint');
 
 		// Make it longer so we can do their limit.
-		if ($body_type == 'text')
-			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'mediumtext'));
+		if ($body_type == 'text') {
+					$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'mediumtext'));
+		}
 		// Shorten the column so we can have a bit (literally per record) less space occupied
-		else
-			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'text'));
+		else {
+					$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'text'));
+		}
 
 		// 3rd party integrations may be interested in knowning about this.
 		call_integration_hook('integrate_convert_msgbody', array($body_type));
 
 		$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-		foreach ($colData as $column)
-			if ($column['name'] == 'body')
+		foreach ($colData as $column) {
+					if ($column['name'] == 'body')
 				$body_type = $column['type'];
+		}
 
 		$context['maintenance_finished'] = $txt[$context['convert_to'] . '_title'];
 		$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
 		$context['convert_to_suggest'] = ($body_type != 'text' && !empty($modSettings['max_messageLength']) && $modSettings['max_messageLength'] < 65536);
 
 		return;
-	}
-	elseif ($body_type != 'text' && (!isset($_POST['do_conversion']) || isset($_POST['cont'])))
+	} elseif ($body_type != 'text' && (!isset($_POST['do_conversion']) || isset($_POST['cont'])))
 	{
 		checkSession();
-		if (empty($_REQUEST['start']))
-			validateToken('admin-maint');
-		else
-			validateToken('admin-convertMsg');
+		if (empty($_REQUEST['start'])) {
+					validateToken('admin-maint');
+		} else {
+					validateToken('admin-convertMsg');
+		}
 
 		$context['page_title'] = $txt['not_done_title'];
 		$context['continue_post_data'] = '';
@@ -427,8 +444,9 @@ 
 					'increment' => $increment - 1,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$id_msg_exceeding[] = $row['id_msg'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$id_msg_exceeding[] = $row['id_msg'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -457,9 +475,9 @@ 
 			{
 				$query_msg = array_slice($id_msg_exceeding, 0, 100);
 				$context['exceeding_messages_morethan'] = sprintf($txt['exceeding_messages_morethan'], count($id_msg_exceeding));
+			} else {
+							$query_msg = $id_msg_exceeding;
 			}
-			else
-				$query_msg = $id_msg_exceeding;
 
 			$context['exceeding_messages'] = array();
 			$request = $smcFunc['db_query']('', '
@@ -470,8 +488,9 @@ 
 					'messages' => $query_msg,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['exceeding_messages'][] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['exceeding_messages'][] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+			}
 			$smcFunc['db_free_result']($request);
 		}
 	}
@@ -495,8 +514,9 @@ 
 	isAllowedTo('admin_forum');
 
 	// Check to see if UTF-8 is currently the default character set.
-	if ($modSettings['global_character_set'] !== 'UTF-8' || !isset($db_character_set) || $db_character_set !== 'utf8')
-		fatal_lang_error('entity_convert_only_utf8');
+	if ($modSettings['global_character_set'] !== 'UTF-8' || !isset($db_character_set) || $db_character_set !== 'utf8') {
+			fatal_lang_error('entity_convert_only_utf8');
+	}
 
 	// Some starting values.
 	$context['table'] = empty($_REQUEST['table']) ? 0 : (int) $_REQUEST['table'];
@@ -558,8 +578,9 @@ 
 		// Make sure we keep stuff unique!
 		$primary_keys = array();
 
-		if (function_exists('apache_reset_timeout'))
-			@apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					@apache_reset_timeout();
+		}
 
 		// Get a list of text columns.
 		$columns = array();
@@ -570,9 +591,10 @@ 
 				'cur_table' => $cur_table,
 			)
 		);
-		while ($column_info = $smcFunc['db_fetch_assoc']($request))
-			if (strpos($column_info['Type'], 'text') !== false || strpos($column_info['Type'], 'char') !== false)
+		while ($column_info = $smcFunc['db_fetch_assoc']($request)) {
+					if (strpos($column_info['Type'], 'text') !== false || strpos($column_info['Type'], 'char') !== false)
 				$columns[] = strtolower($column_info['Field']);
+		}
 
 		// Get the column with the (first) primary key.
 		$request = $smcFunc['db_query']('', '
@@ -586,8 +608,9 @@ 
 		{
 			if ($row['Key_name'] === 'PRIMARY')
 			{
-				if (empty($primary_key) || ($row['Seq_in_index'] == 1 && !in_array(strtolower($row['Column_name']), $columns)))
-					$primary_key = $row['Column_name'];
+				if (empty($primary_key) || ($row['Seq_in_index'] == 1 && !in_array(strtolower($row['Column_name']), $columns))) {
+									$primary_key = $row['Column_name'];
+				}
 
 				$primary_keys[] = $row['Column_name'];
 			}
@@ -596,8 +619,9 @@ 
 
 		// No primary key, no glory.
 		// Same for columns. Just to be sure we've work to do!
-		if (empty($primary_key) || empty($columns))
-			continue;
+		if (empty($primary_key) || empty($columns)) {
+					continue;
+		}
 
 		// Get the maximum value for the primary key.
 		$request = $smcFunc['db_query']('', '
@@ -611,8 +635,9 @@ 
 		list($max_value) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (empty($max_value))
-			continue;
+		if (empty($max_value)) {
+					continue;
+		}
 
 		while ($context['start'] <= $max_value)
 		{
@@ -636,10 +661,11 @@ 
 			{
 				$insertion_variables = array();
 				$changes = array();
-				foreach ($row as $column_name => $column_value)
-					if ($column_name !== $primary_key && strpos($column_value, '&#') !== false)
+				foreach ($row as $column_name => $column_value) {
+									if ($column_name !== $primary_key && strpos($column_value, '&#') !== false)
 					{
 						$changes[] = $column_name . ' = {string:changes_' . $column_name . '}';
+				}
 						$insertion_variables['changes_' . $column_name] = preg_replace_callback('~&#(\d{1,7}|x[0-9a-fA-F]{1,6});~', 'fixchar__callback', $column_value);
 					}
 
@@ -651,8 +677,8 @@ 
 				}
 
 				// Update the row.
-				if (!empty($changes))
-					$smcFunc['db_query']('', '
+				if (!empty($changes)) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}' . $cur_table . '
 						SET
 							' . implode(',
@@ -660,6 +686,7 @@ 
 						WHERE ' . implode(' AND ', $where),
 						$insertion_variables
 					);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 			$context['start'] += 500;
@@ -700,10 +727,11 @@ 
 
 	checkSession('request');
 
-	if (!isset($_SESSION['optimized_tables']))
-		validateToken('admin-maint');
-	else
-		validateToken('admin-optimize', 'post', false);
+	if (!isset($_SESSION['optimized_tables'])) {
+			validateToken('admin-maint');
+	} else {
+			validateToken('admin-optimize', 'post', false);
+	}
 
 	ignore_user_abort(true);
 	db_extend();
@@ -719,13 +747,15 @@ 
 	// Get a list of tables, as well as how many there are.
 	$temp_tables = $smcFunc['db_list_tables'](false, $real_prefix . '%');
 	$tables = array();
-	foreach ($temp_tables as $table)
-		$tables[] = array('table_name' => $table);
+	foreach ($temp_tables as $table) {
+			$tables[] = array('table_name' => $table);
+	}
 
 	// If there aren't any tables then I believe that would mean the world has exploded...
 	$context['num_tables'] = count($tables);
-	if ($context['num_tables'] == 0)
-		fatal_error('You appear to be running SMF in a flat file mode... fantastic!', false);
+	if ($context['num_tables'] == 0) {
+			fatal_error('You appear to be running SMF in a flat file mode... fantastic!', false);
+	}
 
 	$_REQUEST['start'] = empty($_REQUEST['start']) ? 0 : (int) $_REQUEST['start'];
 
@@ -736,8 +766,9 @@ 
 	$_SESSION['optimized_tables'] = !empty($_SESSION['optimized_tables']) ? $_SESSION['optimized_tables'] : array();
 	for ($key = $_REQUEST['start']; $context['num_tables'] - 1; $key++)
 	{
-		if (empty($tables[$key]))
-			break;
+		if (empty($tables[$key])) {
+					break;
+		}
 
 		// Continue?
 		if (microtime(true) - $time_start > 10)
@@ -751,8 +782,9 @@ 
 			createToken('admin-optimize');
 			$context['continue_post_data'] = '<input type="hidden" name="' . $context['admin-optimize_token_var'] . '" value="' . $context['admin-optimize_token'] . '">';
 
-			if (function_exists('apache_reset_timeout'))
-				apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							apache_reset_timeout();
+			}
 
 			return;
 		}
@@ -760,11 +792,12 @@ 
 		// Optimize the table!  We use backticks here because it might be a custom table.
 		$data_freed = $smcFunc['db_optimize_table']($tables[$key]['table_name']);
 
-		if ($data_freed > 0)
-			$_SESSION['optimized_tables'][] = array(
+		if ($data_freed > 0) {
+					$_SESSION['optimized_tables'][] = array(
 				'name' => $tables[$key]['table_name'],
 				'data_freed' => $data_freed,
 			);
+		}
 	}
 
 	// Number of tables, etc...
@@ -799,10 +832,11 @@ 
 	checkSession('request');
 
 	// validate the request or the loop
-	if (!isset($_REQUEST['step']))
-		validateToken('admin-maint');
-	else
-		validateToken('admin-boardrecount');
+	if (!isset($_REQUEST['step'])) {
+			validateToken('admin-maint');
+	} else {
+			validateToken('admin-boardrecount');
+	}
 
 	$context['page_title'] = $txt['not_done_title'];
 	$context['continue_post_data'] = '';
@@ -823,8 +857,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	$increment = min(max(50, ceil($max_topics / 4)), 2000);
-	if (empty($_REQUEST['start']))
-		$_REQUEST['start'] = 0;
+	if (empty($_REQUEST['start'])) {
+			$_REQUEST['start'] = 0;
+	}
 
 	$total_steps = 8;
 
@@ -851,8 +886,8 @@ 
 					'max_id' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET num_replies = {int:num_replies}
 					WHERE id_topic = {int:id_topic}',
@@ -861,6 +896,7 @@ 
 						'id_topic' => $row['id_topic'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			// Recount unapproved messages
@@ -879,8 +915,8 @@ 
 					'max_id' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET unapproved_posts = {int:unapproved_posts}
 					WHERE id_topic = {int:id_topic}',
@@ -889,6 +925,7 @@ 
 						'id_topic' => $row['id_topic'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -911,8 +948,8 @@ 
 	// Update the post count of each board.
 	if ($_REQUEST['step'] <= 1)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET num_posts = {int:num_posts}
 				WHERE redirect = {string:redirect}',
@@ -921,6 +958,7 @@ 
 					'redirect' => '',
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -937,8 +975,8 @@ 
 					'is_approved' => 1,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET num_posts = num_posts + {int:real_num_posts}
 					WHERE id_board = {int:id_board}',
@@ -947,6 +985,7 @@ 
 						'real_num_posts' => $row['real_num_posts'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -969,14 +1008,15 @@ 
 	// Update the topic count of each board.
 	if ($_REQUEST['step'] <= 2)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET num_topics = {int:num_topics}',
 				array(
 					'num_topics' => 0,
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -993,8 +1033,8 @@ 
 					'id_topic_max' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET num_topics = num_topics + {int:real_num_topics}
 					WHERE id_board = {int:id_board}',
@@ -1003,6 +1043,7 @@ 
 						'real_num_topics' => $row['real_num_topics'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -1025,14 +1066,15 @@ 
 	// Update the unapproved post count of each board.
 	if ($_REQUEST['step'] <= 3)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET unapproved_posts = {int:unapproved_posts}',
 				array(
 					'unapproved_posts' => 0,
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -1049,8 +1091,8 @@ 
 					'is_approved' => 0,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET unapproved_posts = unapproved_posts + {int:unapproved_posts}
 					WHERE id_board = {int:id_board}',
@@ -1059,6 +1101,7 @@ 
 						'unapproved_posts' => $row['real_unapproved_posts'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -1081,14 +1124,15 @@ 
 	// Update the unapproved topic count of each board.
 	if ($_REQUEST['step'] <= 4)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET unapproved_topics = {int:unapproved_topics}',
 				array(
 					'unapproved_topics' => 0,
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -1105,8 +1149,8 @@ 
 					'id_topic_max' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET unapproved_topics = unapproved_topics + {int:real_unapproved_topics}
 					WHERE id_board = {int:id_board}',
@@ -1115,6 +1159,7 @@ 
 						'real_unapproved_topics' => $row['real_unapproved_topics'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -1148,8 +1193,9 @@ 
 				'is_not_deleted' => 0,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateMemberData($row['id_member'], array('instant_messages' => $row['real_num']));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateMemberData($row['id_member'], array('instant_messages' => $row['real_num']));
+		}
 		$smcFunc['db_free_result']($request);
 
 		$request = $smcFunc['db_query']('', '
@@ -1164,8 +1210,9 @@ 
 				'is_not_read' => 0,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateMemberData($row['id_member'], array('unread_messages' => $row['real_num']));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateMemberData($row['id_member'], array('unread_messages' => $row['real_num']));
+		}
 		$smcFunc['db_free_result']($request);
 
 		if (microtime(true) - $time_start > 3)
@@ -1197,12 +1244,13 @@ 
 				)
 			);
 			$boards = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$boards[$row['id_board']][] = $row['id_msg'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$boards[$row['id_board']][] = $row['id_msg'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			foreach ($boards as $board_id => $messages)
-				$smcFunc['db_query']('', '
+			foreach ($boards as $board_id => $messages) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}messages
 					SET id_board = {int:id_board}
 					WHERE id_msg IN ({array_int:id_msg_array})',
@@ -1211,6 +1259,7 @@ 
 						'id_board' => $board_id,
 					)
 				);
+			}
 
 			$_REQUEST['start'] += $increment;
 
@@ -1240,8 +1289,9 @@ 
 		)
 	);
 	$realBoardCounts = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$realBoardCounts[$row['id_board']] = $row['local_last_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$realBoardCounts[$row['id_board']] = $row['local_last_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -1261,18 +1311,20 @@ 
 	krsort($resort_me);
 
 	$lastModifiedMsg = array();
-	foreach ($resort_me as $rows)
-		foreach ($rows as $row)
+	foreach ($resort_me as $rows) {
+			foreach ($rows as $row)
 		{
 			// The latest message is the latest of the current board and its children.
 			if (isset($lastModifiedMsg[$row['id_board']]))
 				$curLastModifiedMsg = max($row['local_last_msg'], $lastModifiedMsg[$row['id_board']]);
-			else
-				$curLastModifiedMsg = $row['local_last_msg'];
+	}
+			else {
+							$curLastModifiedMsg = $row['local_last_msg'];
+			}
 
 			// If what is and what should be the latest message differ, an update is necessary.
-			if ($row['local_last_msg'] != $row['id_last_msg'] || $curLastModifiedMsg != $row['id_msg_updated'])
-				$smcFunc['db_query']('', '
+			if ($row['local_last_msg'] != $row['id_last_msg'] || $curLastModifiedMsg != $row['id_msg_updated']) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET id_last_msg = {int:id_last_msg}, id_msg_updated = {int:id_msg_updated}
 					WHERE id_board = {int:id_board}',
@@ -1282,12 +1334,14 @@ 
 						'id_board' => $row['id_board'],
 					)
 				);
+			}
 
 			// Parent boards inherit the latest modified message of their children.
-			if (isset($lastModifiedMsg[$row['id_parent']]))
-				$lastModifiedMsg[$row['id_parent']] = max($row['local_last_msg'], $lastModifiedMsg[$row['id_parent']]);
-			else
-				$lastModifiedMsg[$row['id_parent']] = $row['local_last_msg'];
+			if (isset($lastModifiedMsg[$row['id_parent']])) {
+							$lastModifiedMsg[$row['id_parent']] = max($row['local_last_msg'], $lastModifiedMsg[$row['id_parent']]);
+			} else {
+							$lastModifiedMsg[$row['id_parent']] = $row['local_last_msg'];
+			}
 		}
 
 	// Update all the basic statistics.
@@ -1359,8 +1413,9 @@ 
 	require_once($sourcedir . '/Subs-Auth.php');
 	$members = findMembers($_POST['to']);
 
-	if (empty($members))
-		fatal_lang_error('reattribute_cannot_find_member');
+	if (empty($members)) {
+			fatal_lang_error('reattribute_cannot_find_member');
+	}
 
 	$memID = array_shift($members);
 	$memID = $memID['id'];
@@ -1390,8 +1445,9 @@ 
 		validateToken('admin-maint');
 
 		$groups = array();
-		foreach ($_POST['groups'] as $id => $dummy)
-			$groups[] = (int) $id;
+		foreach ($_POST['groups'] as $id => $dummy) {
+					$groups[] = (int) $id;
+		}
 		$time_limit = (time() - ($_POST['maxdays'] * 24 * 3600));
 		$where_vars = array(
 			'time_limit' => $time_limit,
@@ -1400,9 +1456,9 @@ 
 		{
 			$where = 'mem.date_registered < {int:time_limit} AND mem.is_activated = {int:is_activated}';
 			$where_vars['is_activated'] = 0;
+		} else {
+					$where = 'mem.last_login < {int:time_limit} AND (mem.last_login != 0 OR mem.date_registered < {int:time_limit})';
 		}
-		else
-			$where = 'mem.last_login < {int:time_limit} AND (mem.last_login != 0 OR mem.date_registered < {int:time_limit})';
 
 		// Need to get *all* groups then work out which (if any) we avoid.
 		$request = $smcFunc['db_query']('', '
@@ -1421,8 +1477,7 @@ 
 				{
 					$where .= ' AND mem.id_post_group != {int:id_post_group_' . $row['id_group'] . '}';
 					$where_vars['id_post_group_' . $row['id_group']] = $row['id_group'];
-				}
-				else
+				} else
 				{
 					$where .= ' AND mem.id_group != {int:id_group_' . $row['id_group'] . '} AND FIND_IN_SET({int:id_group_' . $row['id_group'] . '}, mem.additional_groups) = 0';
 					$where_vars['id_group_' . $row['id_group']] = $row['id_group'];
@@ -1449,8 +1504,9 @@ 
 		$members = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!$row['is_mod'] || !in_array(3, $groups))
-				$members[] = $row['id_member'];
+			if (!$row['is_mod'] || !in_array(3, $groups)) {
+							$members[] = $row['id_member'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -1497,8 +1553,9 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$drafts[] = (int) $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$drafts[] = (int) $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If we have old drafts, remove them
@@ -1541,8 +1598,9 @@ 
 	$sticky = isset($_POST['move_type_sticky']) || isset($_GET['sticky']);
 
 	// No boards then this is your stop.
-	if (empty($id_board_from) || empty($id_board_to))
-		return;
+	if (empty($id_board_from) || empty($id_board_to)) {
+			return;
+	}
 
 	// The big WHERE clause
 	$conditions = 'WHERE t.id_board = {int:id_board_from}
@@ -1590,18 +1648,20 @@ 
 		);
 		list ($total_topics) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
+	} else {
+			$total_topics = (int) $_REQUEST['totaltopics'];
 	}
-	else
-		$total_topics = (int) $_REQUEST['totaltopics'];
 
 	// Seems like we need this here.
 	$context['continue_get_data'] = '?action=admin;area=maintain;sa=topics;activity=massmove;id_board_from=' . $id_board_from . ';id_board_to=' . $id_board_to . ';totaltopics=' . $total_topics . ';max_days=' . $max_days;
 
-	if ($locked)
-		$context['continue_get_data'] .= ';locked';
+	if ($locked) {
+			$context['continue_get_data'] .= ';locked';
+	}
 
-	if ($sticky)
-		$context['continue_get_data'] .= ';sticky';
+	if ($sticky) {
+			$context['continue_get_data'] .= ';sticky';
+	}
 
 	$context['continue_get_data'] .= ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 
@@ -1622,8 +1682,9 @@ 
 
 			// Get the ids.
 			$topics = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$topics[] = $row['id_topic'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$topics[] = $row['id_topic'];
+			}
 
 			// Just return if we don't have any topics left to move.
 			if (empty($topics))
@@ -1714,9 +1775,9 @@ 
 		// save it so we don't do this again for this task
 		list ($_SESSION['total_members']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
+	} else {
+			validateToken('admin-recountposts');
 	}
-	else
-		validateToken('admin-recountposts');
 
 	// Lets get a group of members and determine their post count (from the boards that have post count enabled of course).
 	$request = $smcFunc['db_query']('', '
@@ -1762,8 +1823,9 @@ 
 		createToken('admin-recountposts');
 		$context['continue_post_data'] = '<input type="hidden" name="' . $context['admin-recountposts_token_var'] . '" value="' . $context['admin-recountposts_token'] . '">';
 
-		if (function_exists('apache_reset_timeout'))
-			apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					apache_reset_timeout();
+		}
 		return;
 	}
 
@@ -1849,10 +1911,9 @@ 
 		checkSession('request');
 		validateToken('admin-hook', 'request');
 
-		if ($_REQUEST['do'] == 'remove')
-			remove_integration_function($_REQUEST['hook'], urldecode($_REQUEST['function']));
-
-		else
+		if ($_REQUEST['do'] == 'remove') {
+					remove_integration_function($_REQUEST['hook'], urldecode($_REQUEST['function']));
+		} else
 		{
 			$function_remove = urldecode($_REQUEST['function']) . (($_REQUEST['do'] == 'disable') ? '' : '!');
 			$function_add = urldecode($_REQUEST['function']) . (($_REQUEST['do'] == 'disable') ? '!' : '');
@@ -1902,11 +1963,11 @@ 
 						// Show a nice icon to indicate this is an instance.
 						$instance = (!empty($data['instance']) ? '<span class="generic_icons news" title="' . $txt['hooks_field_function_method'] . '"></span> ' : '');
 
-						if (!empty($data['included_file']))
-							return $instance . $txt['hooks_field_function'] . ': ' . $data['real_function'] . '<br>' . $txt['hooks_field_included_file'] . ': ' . $data['included_file'];
-
-						else
-							return $instance . $data['real_function'];
+						if (!empty($data['included_file'])) {
+													return $instance . $txt['hooks_field_function'] . ': ' . $data['real_function'] . '<br>' . $txt['hooks_field_included_file'] . ': ' . $data['included_file'];
+						} else {
+													return $instance . $data['real_function'];
+						}
 					},
 				),
 				'sort' =>  array(
@@ -1971,11 +2032,12 @@ 
 		'data' => array(
 			'function' => function($data) use ($txt, $scripturl, $context)
 			{
-				if (!$data['hook_exists'])
-					return '
+				if (!$data['hook_exists']) {
+									return '
 					<a href="' . $scripturl . '?action=admin;area=maintain;sa=hooks;do=remove;hook=' . $data['hook_name'] . ';function=' . urlencode($data['function_name']) . $context['filter_url'] . ';' . $context['admin-hook_token_var'] . '=' . $context['admin-hook_token'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" data-confirm="' . $txt['quickmod_confirm'] . '" class="you_sure">
 						<span class="generic_icons delete" title="' . $txt['hooks_button_remove'] . '"></span>
 					</a>';
+				}
 			},
 			'class' => 'centertext',
 		),
@@ -2010,10 +2072,11 @@ 
 		{
 			if ($file != '.' && $file != '..')
 			{
-				if (is_dir($dir_path . '/' . $file))
-					$files = array_merge($files, get_files_recursive($dir_path . '/' . $file));
-				else
-					$files[] = array('dir' => $dir_path, 'name' => $file);
+				if (is_dir($dir_path . '/' . $file)) {
+									$files = array_merge($files, get_files_recursive($dir_path . '/' . $file));
+				} else {
+									$files[] = array('dir' => $dir_path, 'name' => $file);
+				}
 			}
 		}
 	}
@@ -2062,16 +2125,16 @@ 
 							// I need to know if there is at least one function called in this file.
 							$temp_data['include'][$hookParsedData['pureFunc']] = array('hook' => $hook, 'function' => $hookParsedData['pureFunc']);
 							unset($temp_hooks[$hook][$rawFunc]);
-						}
-						elseif (strpos(str_replace(' (', '(', $fc), 'function ' . trim($hookParsedData['pureFunc']) . '(') !== false)
+						} elseif (strpos(str_replace(' (', '(', $fc), 'function ' . trim($hookParsedData['pureFunc']) . '(') !== false)
 						{
 							$hook_status[$hook][$hookParsedData['pureFunc']] = $hookParsedData;
 							$hook_status[$hook][$hookParsedData['pureFunc']]['exists'] = true;
 							$hook_status[$hook][$hookParsedData['pureFunc']]['in_file'] = (!empty($file['name']) ? $file['name'] : (!empty($hookParsedData['hookFile']) ? $hookParsedData['hookFile'] : ''));
 
 							// Does the hook has its own file?
-							if (!empty($hookParsedData['hookFile']))
-								$temp_data['include'][$hookParsedData['pureFunc']] = array('hook' => $hook, 'function' => $hookParsedData['pureFunc']);
+							if (!empty($hookParsedData['hookFile'])) {
+															$temp_data['include'][$hookParsedData['pureFunc']] = array('hook' => $hook, 'function' => $hookParsedData['pureFunc']);
+							}
 
 							// I want to remember all the functions called within this file (to check later if they are enabled or disabled and decide if the integrare_*_include of that file can be disabled too)
 							$temp_data['function'][$file['name']][$hookParsedData['pureFunc']] = $hookParsedData['enabled'];
@@ -2098,15 +2161,17 @@ 
 	$sort = array();
 	$hooks_filters = array();
 
-	foreach ($hooks as $hook => $functions)
-		$hooks_filters[] = '<option' . ($context['current_filter'] == $hook ? ' selected ' : '') . ' value="' . $hook . '">' . $hook . '</option>';
+	foreach ($hooks as $hook => $functions) {
+			$hooks_filters[] = '<option' . ($context['current_filter'] == $hook ? ' selected ' : '') . ' value="' . $hook . '">' . $hook . '</option>';
+	}
 
-	if (!empty($hooks_filters))
-		$context['insert_after_template'] .= '
+	if (!empty($hooks_filters)) {
+			$context['insert_after_template'] .= '
 		<script>
 			var hook_name_header = document.getElementById(\'header_list_integration_hooks_hook_name\');
 			hook_name_header.innerHTML += ' . JavaScriptEscape('<select style="margin-left:15px;" onchange="window.location=(\'' . $scripturl . '?action=admin;area=maintain;sa=hooks\' + (this.value ? \';filter=\' + this.value : \'\'));"><option value="">' . $txt['hooks_reset_filter'] . '</option>' . implode('', $hooks_filters) . '</select>') . ';
 		</script>';
+	}
 
 	$temp_data = array();
 	$id = 0;
@@ -2148,10 +2213,11 @@ 
 
 	foreach ($temp_data as $data)
 	{
-		if (++$counter < $start)
-			continue;
-		elseif ($counter == $start + $per_page)
-			break;
+		if (++$counter < $start) {
+					continue;
+		} elseif ($counter == $start + $per_page) {
+					break;
+		}
 
 		$hooks_data[] = $data;
 	}
@@ -2173,13 +2239,15 @@ 
 	$hooks_count = 0;
 
 	$context['filter'] = false;
-	if (isset($_GET['filter']))
-		$context['filter'] = $_GET['filter'];
+	if (isset($_GET['filter'])) {
+			$context['filter'] = $_GET['filter'];
+	}
 
 	foreach ($hooks as $hook => $functions)
 	{
-		if (empty($context['filter']) || (!empty($context['filter']) && $context['filter'] == $hook))
-			$hooks_count += count($functions);
+		if (empty($context['filter']) || (!empty($context['filter']) && $context['filter'] == $hook)) {
+					$hooks_count += count($functions);
+		}
 	}
 
 	return $hooks_count;
@@ -2200,8 +2268,9 @@ 
 		$integration_hooks = array();
 		foreach ($modSettings as $key => $value)
 		{
-			if (!empty($value) && substr($key, 0, 10) === 'integrate_')
-				$integration_hooks[$key] = explode(',', $value);
+			if (!empty($value) && substr($key, 0, 10) === 'integrate_') {
+							$integration_hooks[$key] = explode(',', $value);
+			}
 		}
 	}
 
@@ -2232,8 +2301,9 @@ 
 	);
 
 	// Meh...
-	if (empty($rawData))
-		return $hookData;
+	if (empty($rawData)) {
+			return $hookData;
+	}
 
 	// For convenience purposes only!
 	$modFunc = $rawData;
@@ -2244,11 +2314,11 @@ 
 		list ($hookData['hookFile'], $modFunc) = explode('|', $modFunc);
 
 		// Does the file exists? who knows!
-		if (empty($settings['theme_dir']))
-			$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-
-		else
-			$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		if (empty($settings['theme_dir'])) {
+					$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
+		} else {
+					$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		}
 
 		$hookData['fileExists'] = file_exists($hookData['absPath']);
 		$hookData['hookFile'] = basename($hookData['hookFile']);
@@ -2273,11 +2343,10 @@ 
 	{
 		list ($hookData['class'], $hookData['method']) = explode('::', $modFunc);
 		$hookData['pureFunc'] = $hookData['method'];
+	} else {
+			$hookData['pureFunc'] = $modFunc;
 	}
 
-	else
-		$hookData['pureFunc'] = $modFunc;
-
 	return $hookData;
 }
 

Sources/DbPackages-mysql.php

Braces +122 added lines, -98 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the file functions to the $smcFunc array.
@@ -53,8 +54,9 @@ 
 		'messages', 'moderator_groups', 'moderators', 'package_servers', 'permission_profiles', 'permissions', 'personal_messages',
 		'pm_labeled_messages', 'pm_labels', 'pm_recipients', 'pm_rules', 'poll_choices', 'polls', 'scheduled_tasks', 'sessions', 'settings', 'smileys',
 		'spiders', 'subscriptions', 'themes', 'topics', 'user_alerts', 'user_alerts_prefs', 'user_drafts', 'user_likes');
-	foreach ($reservedTables as $k => $table_name)
-		$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	foreach ($reservedTables as $k => $table_name) {
+			$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	}
 
 	// We in turn may need the extra stuff.
 	db_extend('extra');
@@ -109,8 +111,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// First - no way do we touch SMF tables.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Log that we'll want to remove this on uninstall.
 	$db_package_log[] = array('remove_table', $table_name);
@@ -120,9 +123,9 @@ 
 	if (in_array($full_table_name, $tables))
 	{
 		// This is a sad day... drop the table? If not, return false (error) by default.
-		if ($if_exists == 'overwrite')
-			$smcFunc['db_drop_table']($table_name);
-		else if ($if_exists == 'update')
+		if ($if_exists == 'overwrite') {
+					$smcFunc['db_drop_table']($table_name);
+		} else if ($if_exists == 'update')
 		{
 			$smcFunc['db_transaction']('begin');
 			$db_trans = true;
@@ -134,15 +137,16 @@ 
 				)
 			);
 			$old_table_exists = true;
+		} else {
+					return $if_exists == 'ignore';
 		}
-		else
-			return $if_exists == 'ignore';
 	}
 
 	// Righty - let's do the damn thing!
 	$table_query = 'CREATE TABLE ' . $table_name . "\n" . '(';
-	foreach ($columns as $column)
-		$table_query .= "\n\t" . smf_db_create_query_column($column) . ',';
+	foreach ($columns as $column) {
+			$table_query .= "\n\t" . smf_db_create_query_column($column) . ',';
+	}
 
 	// Loop through the indexes next...
 	foreach ($indexes as $index)
@@ -150,19 +154,21 @@ 
 		$columns = implode(',', $index['columns']);
 
 		// Is it the primary?
-		if (isset($index['type']) && $index['type'] == 'primary')
-			$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
-		else
+		if (isset($index['type']) && $index['type'] == 'primary') {
+					$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
+		} else
 		{
-			if (empty($index['name']))
-				$index['name'] = implode('_', $index['columns']);
+			if (empty($index['name'])) {
+							$index['name'] = implode('_', $index['columns']);
+			}
 			$table_query .= "\n\t" . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : 'KEY') . ' ' . $index['name'] . ' (' . $columns . '),';
 		}
 	}
 
 	// No trailing commas!
-	if (substr($table_query, -1) == ',')
-		$table_query = substr($table_query, 0, -1);
+	if (substr($table_query, -1) == ',') {
+			$table_query = substr($table_query, 0, -1);
+	}
 
 	// Which engine do we want here?
 	if (empty($engines))
@@ -172,8 +178,9 @@ 
 
 		while ($row = $smcFunc['db_fetch_assoc']($get_engines))
 		{
-			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT')
-				$engines[] = $row['Engine'];
+			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT') {
+							$engines[] = $row['Engine'];
+			}
 		}
 
 		$smcFunc['db_free_result']($get_engines);
@@ -187,8 +194,9 @@ 
 	}
 
 	$table_query .= ') ENGINE=' . $parameters['engine'];
-	if (!empty($db_character_set) && $db_character_set == 'utf8')
-		$table_query .= ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+	if (!empty($db_character_set) && $db_character_set == 'utf8') {
+			$table_query .= ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+	}
 
 	// Create the table!
 	$smcFunc['db_query']('', $table_query,
@@ -255,8 +263,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// God no - dropping one of these = bad.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Does it exist?
 	if (in_array($full_table_name, $smcFunc['db_list_tables']()))
@@ -297,14 +306,16 @@ 
 
 	// Does it exist - if so don't add it again!
 	$columns = $smcFunc['db_list_columns']($table_name, false);
-	foreach ($columns as $column)
-		if ($column == $column_info['name'])
+	foreach ($columns as $column) {
+			if ($column == $column_info['name'])
 		{
 			// If we're going to overwrite then use change column.
 			if ($if_exists == 'update')
 				return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-			else
-				return false;
+	}
+			else {
+							return false;
+			}
 		}
 
 	// Get the specifics...
@@ -340,8 +351,8 @@ 
 
 	// Does it exist?
 	$columns = $smcFunc['db_list_columns']($table_name, true);
-	foreach ($columns as $column)
-		if ($column['name'] == $column_name)
+	foreach ($columns as $column) {
+			if ($column['name'] == $column_name)
 		{
 			$smcFunc['db_query']('', '
 				ALTER TABLE ' . $table_name . '
@@ -350,6 +361,7 @@ 
 					'security_override' => true,
 				)
 			);
+	}
 
 			return true;
 		}
@@ -375,37 +387,47 @@ 
 	// Check it does exist!
 	$columns = $smcFunc['db_list_columns']($table_name, true);
 	$old_info = null;
-	foreach ($columns as $column)
-		if ($column['name'] == $old_column)
+	foreach ($columns as $column) {
+			if ($column['name'] == $old_column)
 			$old_info = $column;
+	}
 
 	// Nothing?
-	if ($old_info == null)
-		return false;
+	if ($old_info == null) {
+			return false;
+	}
 
 	// Get the right bits.
-	if (!isset($column_info['name']))
-		$column_info['name'] = $old_column;
-	if (!isset($column_info['default']))
-		$column_info['default'] = $old_info['default'];
-	if (!isset($column_info['null']))
-		$column_info['null'] = $old_info['null'];
-	if (!isset($column_info['auto']))
-		$column_info['auto'] = $old_info['auto'];
-	if (!isset($column_info['type']))
-		$column_info['type'] = $old_info['type'];
-	if (!isset($column_info['size']) || !is_numeric($column_info['size']))
-		$column_info['size'] = $old_info['size'];
-	if (!isset($column_info['unsigned']) || !in_array($column_info['type'], array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')))
-		$column_info['unsigned'] = '';
+	if (!isset($column_info['name'])) {
+			$column_info['name'] = $old_column;
+	}
+	if (!isset($column_info['default'])) {
+			$column_info['default'] = $old_info['default'];
+	}
+	if (!isset($column_info['null'])) {
+			$column_info['null'] = $old_info['null'];
+	}
+	if (!isset($column_info['auto'])) {
+			$column_info['auto'] = $old_info['auto'];
+	}
+	if (!isset($column_info['type'])) {
+			$column_info['type'] = $old_info['type'];
+	}
+	if (!isset($column_info['size']) || !is_numeric($column_info['size'])) {
+			$column_info['size'] = $old_info['size'];
+	}
+	if (!isset($column_info['unsigned']) || !in_array($column_info['type'], array('int', 'tinyint', 'smallint', 'mediumint', 'bigint'))) {
+			$column_info['unsigned'] = '';
+	}
 
 	list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
 
 	// Allow for unsigned integers (mysql only)
 	$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column_info['unsigned']) ? 'unsigned ' : '';
 
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	$smcFunc['db_query']('', '
 		ALTER TABLE ' . $table_name . '
@@ -435,18 +457,20 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// No columns = no index.
-	if (empty($index_info['columns']))
-		return false;
+	if (empty($index_info['columns'])) {
+			return false;
+	}
 	$columns = implode(',', $index_info['columns']);
 
 	// No name - make it up!
 	if (empty($index_info['name']))
 	{
 		// No need for primary.
-		if (isset($index_info['type']) && $index_info['type'] == 'primary')
-			$index_info['name'] = '';
-		else
-			$index_info['name'] = implode('_', $index_info['columns']);
+		if (isset($index_info['type']) && $index_info['type'] == 'primary') {
+					$index_info['name'] = '';
+		} else {
+					$index_info['name'] = implode('_', $index_info['columns']);
+		}
 	}
 
 	// Log that we are going to want to remove this!
@@ -460,10 +484,11 @@ 
 		if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary'))
 		{
 			// If we want to overwrite simply remove the current one then continue.
-			if ($if_exists != 'update' || $index['type'] == 'primary')
-				return false;
-			else
-				$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			if ($if_exists != 'update' || $index['type'] == 'primary') {
+							return false;
+			} else {
+							$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			}
 		}
 	}
 
@@ -477,8 +502,7 @@ 
 				'security_override' => true,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			ALTER TABLE ' . $table_name . '
@@ -562,8 +586,7 @@ 
 		$types = array(
 			'inet' => 'varbinary',
 		);
-	}
-	else
+	} else
 	{
 		$types = array(
 			'varbinary' => 'inet',
@@ -577,16 +600,15 @@ 
 		{
 			$type_size = 16;
 			$type_name = 'varbinary';
-		}
-		elseif ($type_name == 'varbinary' && $reverse && $type_size == 16)
+		} elseif ($type_name == 'varbinary' && $reverse && $type_size == 16)
 		{
 			$type_name = 'inet';
 			$type_size = null;
+		} elseif ($type_name == 'varbinary') {
+					$type_name = 'varbinary';
+		} else {
+					$type_name = $types[$type_name];
 		}
-		elseif ($type_name == 'varbinary')
-			$type_name = 'varbinary';
-		else
-			$type_name = $types[$type_name];
 	}
 
 	return array($type_name, $type_size);
@@ -653,8 +675,7 @@ 
 		if (!$detail)
 		{
 			$columns[] = $row['Field'];
-		}
-		else
+		} else
 		{
 			// Is there an auto_increment?
 			$auto = strpos($row['Extra'], 'auto_increment') !== false ? true : false;
@@ -664,10 +685,10 @@ 
 			{
 				$type = $matches[1];
 				$size = $matches[2];
-				if (!empty($matches[3]) && $matches[3] == 'unsigned')
-					$unsigned = true;
-			}
-			else
+				if (!empty($matches[3]) && $matches[3] == 'unsigned') {
+									$unsigned = true;
+				}
+			} else
 			{
 				$type = $row['Type'];
 				$size = null;
@@ -718,19 +739,20 @@ 
 	$indexes = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if (!$detail)
-			$indexes[] = $row['Key_name'];
-		else
+		if (!$detail) {
+					$indexes[] = $row['Key_name'];
+		} else
 		{
 			// What is the type?
-			if ($row['Key_name'] == 'PRIMARY')
-				$type = 'primary';
-			elseif (empty($row['Non_unique']))
-				$type = 'unique';
-			elseif (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT')
-				$type = 'fulltext';
-			else
-				$type = 'index';
+			if ($row['Key_name'] == 'PRIMARY') {
+							$type = 'primary';
+			} elseif (empty($row['Non_unique'])) {
+							$type = 'unique';
+			} elseif (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT') {
+							$type = 'fulltext';
+			} else {
+							$type = 'index';
+			}
 
 			// This is the first column we've seen?
 			if (empty($indexes[$row['Key_name']]))
@@ -743,10 +765,11 @@ 
 			}
 
 			// Is it a partial index?
-			if (!empty($row['Sub_part']))
-				$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
-			else
-				$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
+			if (!empty($row['Sub_part'])) {
+							$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
+			} else {
+							$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($result);
@@ -768,11 +791,11 @@ 
 	if (!empty($column['auto']))
 	{
 		$default = 'auto_increment';
+	} elseif (isset($column['default']) && $column['default'] !== null) {
+			$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
+	} else {
+			$default = '';
 	}
-	elseif (isset($column['default']) && $column['default'] !== null)
-		$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
-	else
-		$default = '';
 
 	// Sort out the size... and stuff...
 	$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
@@ -781,8 +804,9 @@ 
 	// Allow unsigned integers (mysql only)
 	$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column['unsigned']) ? 'unsigned ' : '';
 
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	// Now just put it together!
 	return '`' . $column['name'] . '` ' . $type . ' ' . (!empty($unsigned) ? $unsigned : '') . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default;

Sources/RepairBoards.php

Braces +119 added lines, -85 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Finds or repairs errors in the database to fix possible problems.
@@ -50,8 +51,9 @@ 
 	);
 
 	// Start displaying errors without fixing them.
-	if (isset($_GET['fixErrors']))
-		checkSession('get');
+	if (isset($_GET['fixErrors'])) {
+			checkSession('get');
+	}
 
 	// Will want this.
 	loadForumTests();
@@ -69,11 +71,11 @@ 
 			$_SESSION['repairboards_to_fix'] = $context['to_fix'];
 			$_SESSION['repairboards_to_fix2'] = null;
 
-			if (empty($context['repair_errors']))
-				$context['repair_errors'][] = '???';
+			if (empty($context['repair_errors'])) {
+							$context['repair_errors'][] = '???';
+			}
 		}
-	}
-	else
+	} else
 	{
 		$context['error_search'] = false;
 		$context['to_fix'] = isset($_SESSION['repairboards_to_fix']) ? $_SESSION['repairboards_to_fix'] : array();
@@ -120,16 +122,19 @@ 
 
 	// More time, I need more time!
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Errr, wait.  How much time has this taken already?
-	if (!$force && (time() - $time_start) < 3)
-		return;
+	if (!$force && (time() - $time_start) < 3) {
+			return;
+	}
 
 	// Restore the query cache if interested.
-	if (!empty($db_temp_cache))
-		$db_cache = $db_temp_cache;
+	if (!empty($db_temp_cache)) {
+			$db_cache = $db_temp_cache;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=repairboards' . (isset($_GET['fixErrors']) ? ';fixErrors' : '') . ';step=' . $_GET['step'] . ';substep=' . $_GET['substep'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -138,10 +143,11 @@ 
 	$context['sub_template'] = 'not_done';
 
 	// Change these two if more steps are added!
-	if (empty($max_substep))
-		$context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']);
-	else
-		$context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']);
+	if (empty($max_substep)) {
+			$context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']);
+	} else {
+			$context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']);
+	}
 
 	// Never more than 100%!
 	$context['continue_percent'] = min($context['continue_percent'], 100);
@@ -612,8 +618,9 @@ 
 				$row['myid_last_msg'] = (int) $row['myid_last_msg'];
 
 				// Not really a problem?
-				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
-					return false;
+				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) {
+									return false;
+				}
 
 				$memberStartedID = (int) getMsgMemberID($row['myid_first_msg']);
 				$memberUpdatedID = (int) getMsgMemberID($row['myid_last_msg']);
@@ -637,15 +644,19 @@ 
 			'message_function' => function ($row) use ($txt, &$context)
 			{
 				// A pretend error?
-				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
-					return false;
+				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) {
+									return false;
+				}
 
-				if ($row['id_first_msg'] != $row['myid_first_msg'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']);
-				if ($row['id_last_msg'] != $row['myid_last_msg'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']);
-				if ($row['approved'] != $row['firstmsg_approved'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']);
+				if ($row['id_first_msg'] != $row['myid_first_msg']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']);
+				}
+				if ($row['id_last_msg'] != $row['myid_last_msg']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']);
+				}
+				if ($row['approved'] != $row['firstmsg_approved']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']);
+				}
 
 				return true;
 			},
@@ -675,8 +686,9 @@ 
 				$row['my_num_replies'] = (int) $row['my_num_replies'];
 
 				// Not really a problem?
-				if ($row['my_num_replies'] == $row['num_replies'])
-					return false;
+				if ($row['my_num_replies'] == $row['num_replies']) {
+									return false;
+				}
 
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
@@ -695,11 +707,13 @@ 
 				global $txt, $context;
 
 				// Just joking?
-				if ($row['my_num_replies'] == $row['num_replies'])
-					return false;
+				if ($row['my_num_replies'] == $row['num_replies']) {
+									return false;
+				}
 
-				if ($row['num_replies'] != $row['my_num_replies'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']);
+				if ($row['num_replies'] != $row['my_num_replies']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']);
+				}
 
 				return true;
 
@@ -1290,8 +1304,9 @@ 
 				$inserts = array();
 				while ($row = $smcFunc['db_fetch_assoc']($result))
 				{
-					foreach (text2words($row['subject']) as $word)
-						$inserts[] = array($word, $row['id_topic']);
+					foreach (text2words($row['subject']) as $word) {
+											$inserts[] = array($word, $row['id_topic']);
+					}
 					if (count($inserts) > 500)
 					{
 						$smcFunc['db_insert']('ignore',
@@ -1305,13 +1320,14 @@ 
 
 				}
 
-				if (!empty($inserts))
-					$smcFunc['db_insert']('ignore',
+				if (!empty($inserts)) {
+									$smcFunc['db_insert']('ignore',
 						'{db_prefix}log_search_subjects',
 						array('word' => 'string', 'id_topic' => 'int'),
 						$inserts,
 						array('word', 'id_topic')
 					);
+				}
 
 		},
 			'message_function' => function ($row)
@@ -1581,8 +1597,9 @@ 
 		$current_step++;
 
 		// Already done this?
-		if ($_GET['step'] > $current_step)
-			continue;
+		if ($_GET['step'] > $current_step) {
+					continue;
+		}
 
 		// If we're fixing it but it ain't broke why try?
 		if ($do_fix && !in_array($error_type, $to_fix))
@@ -1611,14 +1628,16 @@ 
 		while (!$done)
 		{
 			// Make sure there's at least one ID to test.
-			if (isset($test['substeps']) && empty($step_max))
-				break;
+			if (isset($test['substeps']) && empty($step_max)) {
+							break;
+			}
 
 			// What is the testing query (Changes if we are testing or fixing)
-			if (!$do_fix)
-				$test_query = 'check_query';
-			else
-				$test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query';
+			if (!$do_fix) {
+							$test_query = 'check_query';
+			} else {
+							$test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query';
+			}
 
 			// Do the test...
 			$request = $smcFunc['db_query']('',
@@ -1628,10 +1647,11 @@ 
 			);
 
 			// Does it need a fix?
-			if (!empty($test['check_type']) && $test['check_type'] == 'count')
-				list ($needs_fix) = $smcFunc['db_fetch_row']($request);
-			else
-				$needs_fix = $smcFunc['db_num_rows']($request);
+			if (!empty($test['check_type']) && $test['check_type'] == 'count') {
+							list ($needs_fix) = $smcFunc['db_fetch_row']($request);
+			} else {
+							$needs_fix = $smcFunc['db_num_rows']($request);
+			}
 
 			$total_queries++;
 
@@ -1643,8 +1663,9 @@ 
 					// Assume need to fix.
 					$found_errors = true;
 
-					if (isset($test['message']))
-						$context['repair_errors'][] = $txt[$test['message']];
+					if (isset($test['message'])) {
+											$context['repair_errors'][] = $txt[$test['message']];
+					}
 
 					// One per row!
 					elseif (isset($test['messages']))
@@ -1654,10 +1675,11 @@ 
 							$variables = $test['messages'];
 							foreach ($variables as $k => $v)
 							{
-								if ($k == 0 && isset($txt[$v]))
-									$variables[$k] = $txt[$v];
-								elseif ($k > 0 && isset($row[$v]))
-									$variables[$k] = $row[$v];
+								if ($k == 0 && isset($txt[$v])) {
+																	$variables[$k] = $txt[$v];
+								} elseif ($k > 0 && isset($row[$v])) {
+																	$variables[$k] = $row[$v];
+								}
 							}
 							$context['repair_errors'][] = call_user_func_array('sprintf', $variables);
 						}
@@ -1668,13 +1690,15 @@ 
 					{
 						// Find out if there are actually errors.
 						$found_errors = false;
-						while ($row = $smcFunc['db_fetch_assoc']($request))
-							$found_errors |= $test['message_function']($row);
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
+													$found_errors |= $test['message_function']($row);
+						}
 					}
 
 					// Actually have something to fix?
-					if ($found_errors)
-						$to_fix[] = $error_type;
+					if ($found_errors) {
+											$to_fix[] = $error_type;
+					}
 				}
 
 				// We want to fix, we need to fix - so work out what exactly to do!
@@ -1684,8 +1708,9 @@ 
 					if (isset($test['fix_collect']))
 					{
 						$ids = array();
-						while ($row = $smcFunc['db_fetch_assoc']($request))
-							$ids[] = $row[$test['fix_collect']['index']];
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
+													$ids[] = $row[$test['fix_collect']['index']];
+						}
 						if (!empty($ids))
 						{
 							// Fix it!
@@ -1694,30 +1719,34 @@ 
 					}
 
 					// Simply executing a fix it query?
-					elseif (isset($test['fix_it_query']))
-						$smcFunc['db_query']('',
+					elseif (isset($test['fix_it_query'])) {
+											$smcFunc['db_query']('',
 							$test['fix_it_query'],
 							array(
 							)
 						);
+					}
 
 					// Do we have some processing to do?
 					elseif (isset($test['fix_processing']))
 					{
-						while ($row = $smcFunc['db_fetch_assoc']($request))
-							$test['fix_processing']($row);
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
+													$test['fix_processing']($row);
+						}
 					}
 
 					// What about the full set of processing?
-					elseif (isset($test['fix_full_processing']))
-						$test['fix_full_processing']($request);
+					elseif (isset($test['fix_full_processing'])) {
+											$test['fix_full_processing']($request);
+					}
 
 					// Do we have other things we need to fix as a result?
 					if (!empty($test['force_fix']))
 					{
-						foreach ($test['force_fix'] as $item)
-							if (!in_array($item, $to_fix))
+						foreach ($test['force_fix'] as $item) {
+													if (!in_array($item, $to_fix))
 								$to_fix[] = $item;
+						}
 					}
 				}
 			}
@@ -1735,16 +1764,17 @@ 
 				if ($_GET['substep'] <= $step_max)
 				{
 					pauseRepairProcess($to_fix, $error_type, $step_max);
+				} else {
+									$done = true;
 				}
-				else
-					$done = true;
+			} else {
+							$done = true;
 			}
-			else
-				$done = true;
 
 			// Don't allow more than 1000 queries at a time.
-			if ($total_queries >= 1000)
-				pauseRepairProcess($to_fix, $error_type, $step_max, true);
+			if ($total_queries >= 1000) {
+							pauseRepairProcess($to_fix, $error_type, $step_max, true);
+			}
 		}
 
 		// Keep going.
@@ -1757,8 +1787,9 @@ 
 		if ($do_fix)
 		{
 			$key = array_search($error_type, $to_fix);
-			if ($key !== false && isset($to_fix[$key]))
-				unset($to_fix[$key]);
+			if ($key !== false && isset($to_fix[$key])) {
+							unset($to_fix[$key]);
+			}
 		}
 
 		// Are we done?
@@ -1781,10 +1812,11 @@ 
 	static $createOnce = false;
 
 	// Have we already created it?
-	if ($createOnce)
-		return;
-	else
-		$createOnce = true;
+	if ($createOnce) {
+			return;
+	} else {
+			$createOnce = true;
+	}
 
 	// Back to the forum's default language.
 	loadLanguage('Admin', $language);
@@ -1799,8 +1831,9 @@ 
 			'cat_name' => $txt['salvaged_category_name'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($result) != 0)
-		list ($salvageCatID) = $smcFunc['db_fetch_row']($result);
+	if ($smcFunc['db_num_rows']($result) != 0) {
+			list ($salvageCatID) = $smcFunc['db_fetch_row']($result);
+	}
 	$smcFunc['db_free_result']($result);
 
 	if (empty($salvageCatID))
@@ -1832,8 +1865,9 @@ 
 			'board_name' => $txt['salvaged_board_name'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($result) != 0)
-		list ($salvageBoardID) = $smcFunc['db_fetch_row']($result);
+	if ($smcFunc['db_num_rows']($result) != 0) {
+			list ($salvageBoardID) = $smcFunc['db_fetch_row']($result);
+	}
 	$smcFunc['db_free_result']($result);
 
 	if (empty($salvageBoardID))

Sources/Admin.php

Braces +75 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main admin handling function.<br>
@@ -444,8 +445,9 @@ 
 		foreach ($admin_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -457,24 +459,27 @@ 
 	unset($admin_areas);
 
 	// Nothing valid?
-	if ($admin_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($admin_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?action=admin',
 		'name' => $txt['admin_center'],
 	);
-	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['label'],
 		);
-	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';sa=' . $admin_include_data['current_subsection'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['subsections'][$admin_include_data['current_subsection']][0],
 		);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['admin_menu_id'] = $context['max_menu_id'];
@@ -484,16 +489,18 @@ 
 	$context['admin_area'] = $admin_include_data['current_area'];
 
 	// Now - finally - call the right place!
-	if (isset($admin_include_data['file']))
-		require_once($sourcedir . '/' . $admin_include_data['file']);
+	if (isset($admin_include_data['file'])) {
+			require_once($sourcedir . '/' . $admin_include_data['file']);
+	}
 
 	// Get the right callable.
 	$call = call_helper($admin_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call);
-}
+	if (!empty($call)) {
+			call_user_func($call);
+	}
+	}
 
 /**
  * The main administration section.
@@ -547,13 +554,14 @@ 
 
 	$context['sub_template'] = $context['admin_area'] == 'credits' ? 'credits' : 'admin';
 	$context['page_title'] = $context['admin_area'] == 'credits' ? $txt['support_credits_title'] : $txt['admin_center'];
-	if ($context['admin_area'] != 'credits')
-		$context[$context['admin_menu_name']]['tab_data'] = array(
+	if ($context['admin_area'] != 'credits') {
+			$context[$context['admin_menu_name']]['tab_data'] = array(
 			'title' => $txt['admin_center'],
 			'help' => '',
 			'description' => '<strong>' . $txt['hello_guest'] . ' ' . $context['user']['name'] . '!</strong>
 						' . sprintf($txt['admin_main_welcome'], $txt['admin_center'], $txt['help'], $txt['help']),
 		);
+	}
 
 	// Lastly, fill in the blanks in the support resources paragraphs.
 	$txt['support_resources_p1'] = sprintf($txt['support_resources_p1'],
@@ -571,9 +579,10 @@ 
 		'https://www.simplemachines.org/redirect/customize_support'
 	);
 
-	if ($context['admin_area'] == 'admin')
-		loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
-}
+	if ($context['admin_area'] == 'admin') {
+			loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
+	}
+	}
 
 /**
  * Get one of the admin information files from Simple Machines.
@@ -584,8 +593,9 @@ 
 
 	setMemoryLimit('32M');
 
-	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Strip off the forum cache part or we won't find it...
 	$_REQUEST['filename'] = str_replace($modSettings['browser_cache'], '', $_REQUEST['filename']);
@@ -600,27 +610,30 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	}
 
 	list ($file_data, $filetype) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// @todo Temp
 	// Figure out if sesc is still being used.
-	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript')
-		$file_data = '
+	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript') {
+			$file_data = '
 if (!(\'smfForum_sessionvar\' in window))
 	window.smfForum_sessionvar = \'sesc\';
 ' . strtr($file_data, array(';sesc=' => ';\' + window.smfForum_sessionvar + \'='));
+	}
 
 	$context['template_layers'] = array();
 	// Lets make sure we aren't going to output anything nasty.
 	@ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		@ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			@ob_start();
+	}
 
 	// Make sure they know what type of file we are.
 	header('Content-Type: ' . $filetype);
@@ -660,11 +673,12 @@ 
 		updateAdminPreferences();
 	}
 
-	if (trim($context['search_term']) == '')
-		$context['search_results'] = array();
-	else
-		call_helper($subActions[$context['search_type']]);
-}
+	if (trim($context['search_term']) == '') {
+			$context['search_results'] = array();
+	} else {
+			call_helper($subActions[$context['search_type']]);
+	}
+	}
 
 /**
  * A complicated but relatively quick internal search.
@@ -728,8 +742,9 @@ 
 
 	loadLanguage(implode('+', $language_files));
 
-	foreach ($include_files as $file)
-		require_once($sourcedir . '/' . $file . '.php');
+	foreach ($include_files as $file) {
+			require_once($sourcedir . '/' . $file . '.php');
+	}
 
 	/* This is the huge array that defines everything... it's a huge array of items formatted as follows:
 		0 = Language index (Can be array of indexes) to search through for this setting.
@@ -753,11 +768,12 @@ 
 		foreach ($section['areas'] as $menu_key => $menu_item)
 		{
 			$search_data['sections'][] = array($menu_item['label'], 'area=' . $menu_key);
-			if (!empty($menu_item['subsections']))
-				foreach ($menu_item['subsections'] as $key => $sublabel)
+			if (!empty($menu_item['subsections'])) {
+							foreach ($menu_item['subsections'] as $key => $sublabel)
 				{
 					if (isset($sublabel['label']))
 						$search_data['sections'][] = array($sublabel['label'], 'area=' . $menu_key . ';sa=' . $key);
+			}
 				}
 		}
 	}
@@ -767,9 +783,10 @@ 
 		// Get a list of their variables.
 		$config_vars = $setting_area[0](true);
 
-		foreach ($config_vars as $var)
-			if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
+		foreach ($config_vars as $var) {
+					if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
 				$search_data['settings'][] = array($var[(isset($var[2]) && in_array($var[2], array('file', 'db'))) ? 0 : 1], $setting_area[1], 'alttxt' => (isset($var[2]) && in_array($var[2], array('file', 'db'))) || isset($var[3]) ? (in_array($var[2], array('file', 'db')) ? $var[1] : $var[3]) : '');
+		}
 	}
 
 	$context['page_title'] = $txt['admin_search_results'];
@@ -782,8 +799,9 @@ 
 		foreach ($data as $item)
 		{
 			$found = false;
-			if (!is_array($item[0]))
-				$item[0] = array($item[0]);
+			if (!is_array($item[0])) {
+							$item[0] = array($item[0]);
+			}
 			foreach ($item[0] as $term)
 			{
 				if (stripos($term, $search_term) !== false || (isset($txt[$term]) && stripos($txt[$term], $search_term) !== false) || (isset($txt['setting_' . $term]) && stripos($txt['setting_' . $term], $search_term) !== false))
@@ -841,8 +859,9 @@ 
 	$postVars = explode(' ', $context['search_term']);
 
 	// Encode the search data.
-	foreach ($postVars as $k => $v)
-		$postVars[$k] = urlencode($v);
+	foreach ($postVars as $k => $v) {
+			$postVars[$k] = urlencode($v);
+	}
 
 	// This is what we will send.
 	$postVars = implode('+', $postVars);
@@ -854,8 +873,9 @@ 
 	$search_results = fetch_web_data($context['doc_apiurl'] . '?action=query&list=search&srprop=timestamp|snippet&format=xml&srwhat=text&srsearch=' . $postVars);
 
 	// If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded?
-	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true)
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	$search_results = $matches[1];
 
@@ -867,8 +887,9 @@ 
 	$results = new xmlArray($search_results, false);
 
 	// Move through the api layer.
-	if (!$results->exists('api'))
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$results->exists('api')) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	// Are there actually some results?
 	if ($results->exists('api/query/search/p'))
@@ -904,8 +925,9 @@ 
 	);
 
 	// If it's not got a sa set it must have come here for first time, pretend error log should be reversed.
-	if (!isset($_REQUEST['sa']))
-		$_REQUEST['desc'] = true;
+	if (!isset($_REQUEST['sa'])) {
+			$_REQUEST['desc'] = true;
+	}
 
 	// Setup some tab stuff.
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -955,9 +977,10 @@ 
 	unset($_SESSION['admin_time']);
 
 	// Clean any admin tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-admin') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-admin') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Themes/default/ManageNews.template.php

Braces +21 added lines, -14 removed lines

@@ -18,9 +18,10 @@ 
 	global $context, $txt, $scripturl;
 
 	// Are we done sending the newsletter?
-	if (!empty($context['newsletter_sent']))
-		echo '
+	if (!empty($context['newsletter_sent'])) {
+			echo '
 	<div class="infobox">', $txt['admin_news_newsletter_' . $context['newsletter_sent']], '</div>';
+	}
 
 	echo '
 	<div id="admincenter">
@@ -39,9 +40,10 @@ 
 					</dt>
 					<dd>';
 
-	foreach ($context['groups'] as $group)
-		echo '
+	foreach ($context['groups'] as $group) {
+			echo '
 						<label for="groups_', $group['id'], '"><input type="checkbox" name="groups[', $group['id'], ']" id="groups_', $group['id'], '" value="', $group['id'], '" checked> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em><br>';
+	}
 
 	echo '
 						<br>
@@ -82,9 +84,10 @@ 
 						</dt>
 						<dd>';
 
-	foreach ($context['groups'] as $group)
-		echo '
+	foreach ($context['groups'] as $group) {
+			echo '
 							<label for="exclude_groups_', $group['id'], '"><input type="checkbox" name="exclude_groups[', $group['id'], ']" id="exclude_groups_', $group['id'], '" value="', $group['id'], '"> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em><br>';
+	}
 
 	echo '
 							<br>
@@ -230,9 +233,10 @@ 
 				<div id="bbcBox_message"></div>';
 
 	// What about smileys?
-	if (!empty($context['smileys']['postform']) || !empty($context['smileys']['popup']))
-		echo '
+	if (!empty($context['smileys']['postform']) || !empty($context['smileys']['popup'])) {
+			echo '
 				<div id="smileyBox_message"></div>';
+	}
 
 	// Show BBC buttons, smileys and textbox.
 	echo '
@@ -253,9 +257,10 @@ 
 			<input type="hidden" name="email_force" value="', $context['email_force'], '">
 			<input type="hidden" name="total_emails" value="', $context['total_emails'], '">';
 
-	foreach ($context['recipients'] as $key => $values)
-		echo '
+	foreach ($context['recipients'] as $key => $values) {
+			echo '
 			<input type="hidden" name="', $key, '" value="', implode(($key == 'emails' ? ';' : ','), $values), '">';
+	}
 
 	echo '
 			<script>';
@@ -411,9 +416,10 @@ 
 				<input type="hidden" name="parse_html" value="', $context['parse_html'], '">';
 
 	// All the things we must remember!
-	foreach ($context['recipients'] as $key => $values)
-		echo '
+	foreach ($context['recipients'] as $key => $values) {
+			echo '
 				<input type="hidden" name="', $key, '" value="', implode(($key == 'emails' ? ';' : ','), $values), '">';
+	}
 
 	echo '
 			</div><!-- .windowbg -->
@@ -446,9 +452,10 @@ 
 {
 	global $context, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 			<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	template_show_list('news_lists');
 }

Themes/default/Stats.template.php

Braces +26 added lines, -18 removed lines

@@ -44,10 +44,11 @@ 
 				<dt>', $txt['users_online_today'], ':</dt>
 				<dd>', $context['online_today'], '</dd>';
 
-	if (!empty($modSettings['hitStats']))
-		echo '
+	if (!empty($modSettings['hitStats'])) {
+			echo '
 				<dt>', $txt['num_hits'], ':</dt>
 				<dd>', $context['num_hits'], '</dd>';
+	}
 
 	echo '
 			</dl>
@@ -71,17 +72,19 @@ 
 				<dt>', $txt['gender_stats'], ':</dt>
 				<dd>';
 
-		foreach ($context['gender'] as $g => $n)
-			echo $g, ': ', $n, '<br>';
+		foreach ($context['gender'] as $g => $n) {
+					echo $g, ': ', $n, '<br>';
+		}
 
 		echo '
 				</dd>';
 	}
 
-	if (!empty($modSettings['hitStats']))
-		echo '
+	if (!empty($modSettings['hitStats'])) {
+			echo '
 				<dt>', $txt['average_hits'], ':</dt>
 				<dd>', $context['average_hits'], '</dd>';
+	}
 
 	echo '
 			</dl>';
@@ -105,14 +108,15 @@ 
 					</dt>
 					<dd class="statsbar">';
 
-			if (!empty($item['percent']))
-				echo '
+			if (!empty($item['percent'])) {
+							echo '
 						<div class="bar" style="width: ', $item['percent'], '%;">
 							<span class="righttext">', $item['num'], '</span>
 						</div>';
-			else
-				echo '
+			} else {
+							echo '
 						<div class="bar empty"><span class="righttext">', $item['num'], '</span></div>';
+			}
 
 			echo '
 					</dd>';
@@ -144,9 +148,10 @@ 
 					<th>', $txt['stats_new_members'], '</th>
 					<th>', $txt['most_online'], '</th>';
 
-		if (!empty($modSettings['hitStats']))
-			echo '
+		if (!empty($modSettings['hitStats'])) {
+					echo '
 					<th>', $txt['page_views'], '</th>';
+		}
 
 		echo '
 				</tr>
@@ -165,9 +170,10 @@ 
 					<th>', $year['new_members'], '</th>
 					<th>', $year['most_members_online'], '</th>';
 
-			if (!empty($modSettings['hitStats']))
-				echo '
+			if (!empty($modSettings['hitStats'])) {
+							echo '
 					<th>', $year['hits'], '</th>';
+			}
 
 			echo '
 				</tr>';
@@ -184,9 +190,10 @@ 
 					<th>', $month['new_members'], '</th>
 					<th>', $month['most_members_online'], '</th>';
 
-				if (!empty($modSettings['hitStats']))
-					echo '
+				if (!empty($modSettings['hitStats'])) {
+									echo '
 					<th>', $month['hits'], '</th>';
+				}
 
 				echo '
 				</tr>';
@@ -203,9 +210,10 @@ 
 					<td>', $day['new_members'], '</td>
 					<td>', $day['most_members_online'], '</td>';
 
-						if (!empty($modSettings['hitStats']))
-							echo '
+						if (!empty($modSettings['hitStats'])) {
+													echo '
 					<td>', $day['hits'], '</td>';
+						}
 
 						echo '
 				</tr>';

Themes/default/Poll.template.php

Braces +12 added lines, -8 removed lines

@@ -46,8 +46,8 @@ 
 				<h3 class="catbg">', $context['page_title'], '</h3>
 			</div>';
 
-	if (!empty($context['poll_error']['messages']))
-		echo '
+	if (!empty($context['poll_error']['messages'])) {
+			echo '
 			<div class="errorbox">
 				<dl class="poll_error">
 					<dt>
@@ -58,6 +58,7 @@ 
 					</dt>
 				</dl>
 			</div>';
+	}
 
 	echo '
 			<div>
@@ -79,8 +80,9 @@ 
 								<input type="text" name="options[', $choice['id'], ']" id="options-', $choice['id'], '" value="', $choice['label'], '" size="80" maxlength="255">';
 
 		// Does this option have a vote count yet, or is it new?
-		if ($choice['votes'] != -1)
-			echo ' (', $choice['votes'], ' ', $txt['votes'], ')';
+		if ($choice['votes'] != -1) {
+					echo ' (', $choice['votes'], ' ', $txt['votes'], ')';
+		}
 
 		echo '
 							</dd>';
@@ -118,14 +120,15 @@ 
 								<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', '>
 							</dd>';
 
-		if ($context['poll']['guest_vote_allowed'])
-			echo '
+		if ($context['poll']['guest_vote_allowed']) {
+					echo '
 							<dt>
 								<label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label>
 							</dt>
 							<dd>
 								<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll']['guest_vote']) ? ' checked' : '', '>
 							</dd>';
+		}
 	}
 
 	echo '
@@ -141,12 +144,13 @@ 
 					</fieldset>';
 
 	// If this is an edit, we can allow them to reset the vote counts.
-	if ($context['is_edit'])
-		echo '
+	if ($context['is_edit']) {
+			echo '
 					<fieldset id="poll_reset">
 						<legend>', $txt['reset_votes'], '</legend>
 						<input type="checkbox" name="resetVoteCount" value="on"> ' . $txt['reset_votes_check'] . '
 					</fieldset>';
+	}
 	echo '
 					<input type="submit" name="post" value="', $txt['save'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
 				</div><!-- .roundframe -->