albertlast / SMF2.1

Sources/Post.php

Spacing +37 added lines, -37 removed lines

@@ -798,7 +798,7 @@ 
 				{
 					// It goes 0 = outside, 1 = begin tag, 2 = inside, 3 = close tag, repeat.
 					if ($i % 4 == 0)
-						$parts[$i] = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function ($m)
+						$parts[$i] = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m)
 						{
 							return '[html]' . preg_replace('~<br\s?/?' . '>~i', '&lt;br /&gt;<br>', "$m[1]") . '[/html]';
 						}, $parts[$i]);
@@ -895,7 +895,7 @@ 
 				{
 					// Since, they don't belong here. Let's inform the user that they exist..
 					if (!empty($topic))
-						$delete_url = $scripturl . '?action=post' .(!empty($_REQUEST['msg']) ? (';msg=' . $_REQUEST['msg']) : '') . (!empty($_REQUEST['last_msg']) ? (';last_msg=' . $_REQUEST['last_msg']) : '') . ';topic=' . $topic . ';delete_temp';
+						$delete_url = $scripturl . '?action=post' . (!empty($_REQUEST['msg']) ? (';msg=' . $_REQUEST['msg']) : '') . (!empty($_REQUEST['last_msg']) ? (';last_msg=' . $_REQUEST['last_msg']) : '') . ';topic=' . $topic . ';delete_temp';
 					else
 						$delete_url = $scripturl . '?action=post;board=' . $board . ';delete_temp';
 
@@ -903,7 +903,7 @@ 
 					$file_list = array();
 					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 						if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
-							$file_list[] =  $attachment['name'];
+							$file_list[] = $attachment['name'];
 
 					$_SESSION['temp_attachments']['post']['files'] = $file_list;
 					$file_list = '<div class="attachments">' . implode('<br>', $file_list) . '</div>';
@@ -911,7 +911,7 @@ 
 					if (!empty($_SESSION['temp_attachments']['post']['msg']))
 					{
 						// We have a message id, so we can link back to the old topic they were trying to edit..
-						$goback_url = $scripturl . '?action=post' .(!empty($_SESSION['temp_attachments']['post']['msg']) ? (';msg=' . $_SESSION['temp_attachments']['post']['msg']) : '') . (!empty($_SESSION['temp_attachments']['post']['last_msg']) ? (';last_msg=' . $_SESSION['temp_attachments']['post']['last_msg']) : '') . ';topic=' . $_SESSION['temp_attachments']['post']['topic'] . ';additionalOptions';
+						$goback_url = $scripturl . '?action=post' . (!empty($_SESSION['temp_attachments']['post']['msg']) ? (';msg=' . $_SESSION['temp_attachments']['post']['msg']) : '') . (!empty($_SESSION['temp_attachments']['post']['last_msg']) ? (';last_msg=' . $_SESSION['temp_attachments']['post']['last_msg']) : '') . ';topic=' . $_SESSION['temp_attachments']['post']['topic'] . ';additionalOptions';
 
 						$post_errors[] = array('temp_attachments_found', array($delete_url, $goback_url, $file_list));
 						$context['ignore_temp_attachments'] = true;
@@ -1198,55 +1198,55 @@ 
 		foreach ($context['current_attachments'] as $key => $mock)
 			addInlineJavaScript('
 	current_attachments.push({
-		name: '. JavaScriptEscape($mock['name']) .',
-		size: '. $mock['size'] .',
-		attachID: '. $mock['attachID'] .',
-		approved: '. $mock['approved'] .',
-		type: '. JavaScriptEscape(!empty($mock['mime_type']) ? $mock['mime_type'] : '') .',
-		thumbID: '. (!empty($mock['thumb']) ? $mock['thumb'] : 0) .'
+		name: '. JavaScriptEscape($mock['name']) . ',
+		size: '. $mock['size'] . ',
+		attachID: '. $mock['attachID'] . ',
+		approved: '. $mock['approved'] . ',
+		type: '. JavaScriptEscape(!empty($mock['mime_type']) ? $mock['mime_type'] : '') . ',
+		thumbID: '. (!empty($mock['thumb']) ? $mock['thumb'] : 0) . '
 	});', true);
 	}
 
 	// File Upload.
 	if ($context['can_post_attachment'])
 	{
-		$acceptedFiles = implode(',', array_map(function($val) use($smcFunc) { return '.'. $smcFunc['htmltrim']($val);} , explode(',', $context['allowed_extensions'])));
+		$acceptedFiles = implode(',', array_map(function($val) use($smcFunc) { return '.' . $smcFunc['htmltrim']($val); } , explode(',', $context['allowed_extensions'])));
 
 		loadJavaScriptFile('dropzone.min.js', array('defer' => true), 'smf_dropzone');
 		loadJavaScriptFile('smf_fileUpload.js', array('defer' => true), 'smf_fileUpload');
 		addInlineJavaScript('
 	$(function() {
 		smf_fileUpload({
-			dictDefaultMessage : '. JavaScriptEscape($txt['attach_drop_zone']) .',
-			dictFallbackMessage : '. JavaScriptEscape($txt['attach_drop_zone_no']) .',
-			dictCancelUpload : '. JavaScriptEscape($txt['modify_cancel']) .',
-			genericError: '. JavaScriptEscape($txt['attach_php_error']) .',
-			text_attachLeft: '. JavaScriptEscape($txt['attached_attachedLeft']) .',
-			text_deleteAttach: '. JavaScriptEscape($txt['attached_file_delete']) .',
-			text_attachDeleted: '. JavaScriptEscape($txt['attached_file_deleted']) .',
-			text_insertBBC: '. JavaScriptEscape($txt['attached_insertBBC']) .',
-			text_attachUploaded: '. JavaScriptEscape($txt['attached_file_uploaded']) .',
-			text_attach_unlimited: '. JavaScriptEscape($txt['attach_drop_unlimited']) .',
-			dictMaxFilesExceeded: '. JavaScriptEscape($txt['more_attachments_error']) .',
-			dictInvalidFileType: '. JavaScriptEscape(sprintf($txt['cant_upload_type'], $context['allowed_extensions'])) .',
-			dictFileTooBig: '. JavaScriptEscape(sprintf($txt['file_too_big'], comma_format($modSettings['attachmentSizeLimit'], 0))) .',
-			maxTotalSize: '. JavaScriptEscape($txt['attach_max_total_file_size_current']) .',
-			acceptedFiles: '. JavaScriptEscape($acceptedFiles) .',
-			maxFilesize: '. (!empty($modSettings['attachmentSizeLimit']) ? $modSettings['attachmentSizeLimit'] : 'null') .',
-			thumbnailWidth: '.(!empty($modSettings['attachmentThumbWidth']) ? $modSettings['attachmentThumbWidth'] : 'null') .',
-			thumbnailHeight: '.(!empty($modSettings['attachmentThumbHeight']) ? $modSettings['attachmentThumbHeight'] : 'null') .',
-			maxFiles: '. (!empty($context['num_allowed_attachments']) ? $context['num_allowed_attachments'] : 'null') .',
-			text_totalMaxSize: '. JavaScriptEscape($txt['attach_max_total_file_size_current']) .',
-			text_max_size_progress: '. JavaScriptEscape($txt['attach_max_size_progress']) .',
-			limitMultiFileUploadSize:'. round(max($modSettings['attachmentPostLimit'] - ($context['attachments']['total_size'] / 1024), 0)) * 1024 .',
-			maxLimitReferenceUploadSize: '. $modSettings['attachmentPostLimit'] * 1024 .',
+			dictDefaultMessage : '. JavaScriptEscape($txt['attach_drop_zone']) . ',
+			dictFallbackMessage : '. JavaScriptEscape($txt['attach_drop_zone_no']) . ',
+			dictCancelUpload : '. JavaScriptEscape($txt['modify_cancel']) . ',
+			genericError: '. JavaScriptEscape($txt['attach_php_error']) . ',
+			text_attachLeft: '. JavaScriptEscape($txt['attached_attachedLeft']) . ',
+			text_deleteAttach: '. JavaScriptEscape($txt['attached_file_delete']) . ',
+			text_attachDeleted: '. JavaScriptEscape($txt['attached_file_deleted']) . ',
+			text_insertBBC: '. JavaScriptEscape($txt['attached_insertBBC']) . ',
+			text_attachUploaded: '. JavaScriptEscape($txt['attached_file_uploaded']) . ',
+			text_attach_unlimited: '. JavaScriptEscape($txt['attach_drop_unlimited']) . ',
+			dictMaxFilesExceeded: '. JavaScriptEscape($txt['more_attachments_error']) . ',
+			dictInvalidFileType: '. JavaScriptEscape(sprintf($txt['cant_upload_type'], $context['allowed_extensions'])) . ',
+			dictFileTooBig: '. JavaScriptEscape(sprintf($txt['file_too_big'], comma_format($modSettings['attachmentSizeLimit'], 0))) . ',
+			maxTotalSize: '. JavaScriptEscape($txt['attach_max_total_file_size_current']) . ',
+			acceptedFiles: '. JavaScriptEscape($acceptedFiles) . ',
+			maxFilesize: '. (!empty($modSettings['attachmentSizeLimit']) ? $modSettings['attachmentSizeLimit'] : 'null') . ',
+			thumbnailWidth: '.(!empty($modSettings['attachmentThumbWidth']) ? $modSettings['attachmentThumbWidth'] : 'null') . ',
+			thumbnailHeight: '.(!empty($modSettings['attachmentThumbHeight']) ? $modSettings['attachmentThumbHeight'] : 'null') . ',
+			maxFiles: '. (!empty($context['num_allowed_attachments']) ? $context['num_allowed_attachments'] : 'null') . ',
+			text_totalMaxSize: '. JavaScriptEscape($txt['attach_max_total_file_size_current']) . ',
+			text_max_size_progress: '. JavaScriptEscape($txt['attach_max_size_progress']) . ',
+			limitMultiFileUploadSize:'. round(max($modSettings['attachmentPostLimit'] - ($context['attachments']['total_size'] / 1024), 0)) * 1024 . ',
+			maxLimitReferenceUploadSize: '. $modSettings['attachmentPostLimit'] * 1024 . ',
 		});
 	});', true);
 	}
 
 	// Knowing the current board ID might be handy.
 	addInlineJavaScript('
-	var current_board = '. (empty($context['current_board']) ? 'null' : $context['current_board']) .';', false);
+	var current_board = '. (empty($context['current_board']) ? 'null' : $context['current_board']) . ';', false);
 
 	// Finally, load the template.
 	if (!isset($_REQUEST['xml']))
@@ -1664,7 +1664,7 @@ 
 	}
 
 	// Coming from the quickReply?
-	if(isset($_POST['quickReply']))
+	if (isset($_POST['quickReply']))
 		$_POST['message'] = $_POST['quickReply'];
 
 	// Check the subject and message.
@@ -2456,7 +2456,7 @@ 
 		FROM {db_prefix}messages AS m
 			LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 		WHERE m.id_topic = {int:current_topic}' . (isset($_REQUEST['msg']) ? '
-			AND m.id_msg < {int:id_msg}' : '') .(!$modSettings['postmod_active'] || allowedTo('approve_posts') ? '' : '
+			AND m.id_msg < {int:id_msg}' : '') . (!$modSettings['postmod_active'] || allowedTo('approve_posts') ? '' : '
 			AND m.approved = {int:approved}') . '
 		ORDER BY m.id_msg DESC' . $limit,
 		array(

Braces +670 added lines, -519 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Handles showing the post screen, loading the post to be modified, and loading any post quoted.
@@ -35,12 +36,14 @@ 
 	global $sourcedir, $smcFunc, $language;
 
 	loadLanguage('Post');
-	if (!empty($modSettings['drafts_post_enabled']))
-		loadLanguage('Drafts');
+	if (!empty($modSettings['drafts_post_enabled'])) {
+			loadLanguage('Drafts');
+	}
 
 	// You can't reply with a poll... hacker.
-	if (isset($_REQUEST['poll']) && !empty($topic) && !isset($_REQUEST['msg']))
-		unset($_REQUEST['poll']);
+	if (isset($_REQUEST['poll']) && !empty($topic) && !isset($_REQUEST['msg'])) {
+			unset($_REQUEST['poll']);
+	}
 
 	// Posting an event?
 	$context['make_event'] = isset($_REQUEST['calendar']);
@@ -55,8 +58,9 @@ 
 	$context['auto_notify'] = !empty($context['notify_prefs']['msg_auto_notify']);
 
 	// You must be posting to *some* board.
-	if (empty($board) && !$context['make_event'])
-		fatal_lang_error('no_board', false);
+	if (empty($board) && !$context['make_event']) {
+			fatal_lang_error('no_board', false);
+	}
 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -79,10 +83,11 @@ 
 			array(
 				'msg' => (int) $_REQUEST['msg'],
 		));
-		if ($smcFunc['db_num_rows']($request) != 1)
-			unset($_REQUEST['msg'], $_POST['msg'], $_GET['msg']);
-		else
-			list ($topic) = $smcFunc['db_fetch_row']($request);
+		if ($smcFunc['db_num_rows']($request) != 1) {
+					unset($_REQUEST['msg'], $_POST['msg'], $_GET['msg']);
+		} else {
+					list ($topic) = $smcFunc['db_fetch_row']($request);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -109,33 +114,36 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If this topic already has a poll, they sure can't add another.
-		if (isset($_REQUEST['poll']) && $pollID > 0)
-			unset($_REQUEST['poll']);
+		if (isset($_REQUEST['poll']) && $pollID > 0) {
+					unset($_REQUEST['poll']);
+		}
 
 		if (empty($_REQUEST['msg']))
 		{
-			if ($user_info['is_guest'] && !allowedTo('post_reply_any') && (!$modSettings['postmod_active'] || !allowedTo('post_unapproved_replies_any')))
-				is_not_guest();
+			if ($user_info['is_guest'] && !allowedTo('post_reply_any') && (!$modSettings['postmod_active'] || !allowedTo('post_unapproved_replies_any'))) {
+							is_not_guest();
+			}
 
 			// By default the reply will be approved...
 			$context['becomes_approved'] = true;
 			if ($id_member_poster != $user_info['id'] || $user_info['is_guest'])
 			{
-				if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any'))
-					$context['becomes_approved'] = false;
-				else
-					isAllowedTo('post_reply_any');
-			}
-			elseif (!allowedTo('post_reply_any'))
+				if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any')) {
+									$context['becomes_approved'] = false;
+				} else {
+									isAllowedTo('post_reply_any');
+				}
+			} elseif (!allowedTo('post_reply_any'))
 			{
-				if ($modSettings['postmod_active'] && ((allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own')) || allowedTo('post_unapproved_replies_any')))
-					$context['becomes_approved'] = false;
-				else
-					isAllowedTo('post_reply_own');
+				if ($modSettings['postmod_active'] && ((allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own')) || allowedTo('post_unapproved_replies_any'))) {
+									$context['becomes_approved'] = false;
+				} else {
+									isAllowedTo('post_reply_own');
+				}
 			}
+		} else {
+					$context['becomes_approved'] = true;
 		}
-		else
-			$context['becomes_approved'] = true;
 
 		$context['can_lock'] = allowedTo('lock_any') || ($user_info['id'] == $id_member_poster && allowedTo('lock_own'));
 		$context['can_sticky'] = allowedTo('make_sticky');
@@ -147,18 +155,19 @@ 
 		$context['sticky'] = isset($_REQUEST['sticky']) ? !empty($_REQUEST['sticky']) : $sticky;
 
 		// Check whether this is a really old post being bumped...
-		if (!empty($modSettings['oldTopicDays']) && $lastPostTime + $modSettings['oldTopicDays'] * 86400 < time() && empty($sticky) && !isset($_REQUEST['subject']))
-			$post_errors[] = array('old_topic', array($modSettings['oldTopicDays']));
-	}
-	else
+		if (!empty($modSettings['oldTopicDays']) && $lastPostTime + $modSettings['oldTopicDays'] * 86400 < time() && empty($sticky) && !isset($_REQUEST['subject'])) {
+					$post_errors[] = array('old_topic', array($modSettings['oldTopicDays']));
+		}
+	} else
 	{
 		$context['becomes_approved'] = true;
 		if ((!$context['make_event'] || !empty($board)))
 		{
-			if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics'))
-				$context['becomes_approved'] = false;
-			else
-				isAllowedTo('post_new');
+			if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics')) {
+							$context['becomes_approved'] = false;
+			} else {
+							isAllowedTo('post_new');
+			}
 		}
 
 		$locked = 0;
@@ -196,20 +205,24 @@ 
 	}
 
 	// Don't allow a post if it's locked and you aren't all powerful.
-	if ($locked && !allowedTo('moderate_board'))
-		fatal_lang_error('topic_locked', false);
+	if ($locked && !allowedTo('moderate_board')) {
+			fatal_lang_error('topic_locked', false);
+	}
 	// Check the users permissions - is the user allowed to add or post a poll?
 	if (isset($_REQUEST['poll']) && $modSettings['pollMode'] == '1')
 	{
 		// New topic, new poll.
-		if (empty($topic))
-			isAllowedTo('poll_post');
+		if (empty($topic)) {
+					isAllowedTo('poll_post');
+		}
 		// This is an old topic - but it is yours!  Can you add to it?
-		elseif ($user_info['id'] == $id_member_poster && !allowedTo('poll_add_any'))
-			isAllowedTo('poll_add_own');
+		elseif ($user_info['id'] == $id_member_poster && !allowedTo('poll_add_any')) {
+					isAllowedTo('poll_add_own');
+		}
 		// If you're not the owner, can you add to any poll?
-		else
-			isAllowedTo('poll_add_any');
+		else {
+					isAllowedTo('poll_add_any');
+		}
 
 		require_once($sourcedir . '/Subs-Members.php');
 		$allowedVoteGroups = groupsAllowedTo('poll_vote', $board);
@@ -238,8 +251,9 @@ 
 	if ($context['make_event'])
 	{
 		// They might want to pick a board.
-		if (!isset($context['current_board']))
-			$context['current_board'] = 0;
+		if (!isset($context['current_board'])) {
+					$context['current_board'] = 0;
+		}
 
 		// Start loading up the event info.
 		$context['event'] = array();
@@ -277,26 +291,28 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// Make sure the user is allowed to edit this event.
-			if ($row['id_member'] != $user_info['id'])
-				isAllowedTo('calendar_edit_any');
-			elseif (!allowedTo('calendar_edit_any'))
-				isAllowedTo('calendar_edit_own');
+			if ($row['id_member'] != $user_info['id']) {
+							isAllowedTo('calendar_edit_any');
+			} elseif (!allowedTo('calendar_edit_any')) {
+							isAllowedTo('calendar_edit_own');
+			}
 
 			$context['event']['month'] = $row['month'];
 			$context['event']['day'] = $row['day'];
 			$context['event']['year'] = $row['year'];
 			$context['event']['title'] = $row['title'];
 			$context['event']['span'] = $row['span'] + 1;
-		}
-		else
+		} else
 		{
 			$today = getdate();
 
 			// You must have a month and year specified!
-			if (!isset($_REQUEST['month']))
-				$_REQUEST['month'] = $today['mon'];
-			if (!isset($_REQUEST['year']))
-				$_REQUEST['year'] = $today['year'];
+			if (!isset($_REQUEST['month'])) {
+							$_REQUEST['month'] = $today['mon'];
+			}
+			if (!isset($_REQUEST['year'])) {
+							$_REQUEST['year'] = $today['year'];
+			}
 
 			$context['event']['month'] = (int) $_REQUEST['month'];
 			$context['event']['year'] = (int) $_REQUEST['year'];
@@ -304,15 +320,18 @@ 
 			$context['event']['span'] = isset($_REQUEST['span']) ? $_REQUEST['span'] : 1;
 
 			// Make sure the year and month are in the valid range.
-			if ($context['event']['month'] < 1 || $context['event']['month'] > 12)
-				fatal_lang_error('invalid_month', false);
-			if ($context['event']['year'] < $modSettings['cal_minyear'] || $context['event']['year'] > $modSettings['cal_maxyear'])
-				fatal_lang_error('invalid_year', false);
+			if ($context['event']['month'] < 1 || $context['event']['month'] > 12) {
+							fatal_lang_error('invalid_month', false);
+			}
+			if ($context['event']['year'] < $modSettings['cal_minyear'] || $context['event']['year'] > $modSettings['cal_maxyear']) {
+							fatal_lang_error('invalid_year', false);
+			}
 
 			// Get a list of boards they can post in.
 			$boards = boardsAllowedTo('post_new');
-			if (empty($boards))
-				fatal_lang_error('cannot_post_new', 'user');
+			if (empty($boards)) {
+							fatal_lang_error('cannot_post_new', 'user');
+			}
 
 			// Load a list of boards for this event in the context.
 			require_once($sourcedir . '/Subs-MessageIndex.php');
@@ -357,10 +376,11 @@ 
 
 			if (!empty($context['new_replies']))
 			{
-				if ($context['new_replies'] == 1)
-					$txt['error_new_replies'] = isset($_GET['last_msg']) ? $txt['error_new_reply_reading'] : $txt['error_new_reply'];
-				else
-					$txt['error_new_replies'] = sprintf(isset($_GET['last_msg']) ? $txt['error_new_replies_reading'] : $txt['error_new_replies'], $context['new_replies']);
+				if ($context['new_replies'] == 1) {
+									$txt['error_new_replies'] = isset($_GET['last_msg']) ? $txt['error_new_reply_reading'] : $txt['error_new_reply'];
+				} else {
+									$txt['error_new_replies'] = sprintf(isset($_GET['last_msg']) ? $txt['error_new_replies_reading'] : $txt['error_new_replies'], $context['new_replies']);
+				}
 
 				$post_errors[] = 'new_replies';
 
@@ -372,9 +392,9 @@ 
 	// Get a response prefix (like 'Re:') in the default forum language.
 	if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 	{
-		if ($language === $user_info['language'])
-			$context['response_prefix'] = $txt['response_prefix'];
-		else
+		if ($language === $user_info['language']) {
+					$context['response_prefix'] = $txt['response_prefix'];
+		} else
 		{
 			loadLanguage('index', $language, false);
 			$context['response_prefix'] = $txt['response_prefix'];
@@ -387,8 +407,9 @@ 
 	// Do we have a body, but an error happened.
 	if (isset($_REQUEST['message']) || isset($_REQUEST['quickReply']) || !empty($context['post_error']))
 	{
-		if (isset($_REQUEST['quickReply']))
-			$_REQUEST['message'] = $_REQUEST['quickReply'];
+		if (isset($_REQUEST['quickReply'])) {
+					$_REQUEST['message'] = $_REQUEST['quickReply'];
+		}
 
 		// Validate inputs.
 		if (empty($context['post_error']))
@@ -396,15 +417,17 @@ 
 			// This means they didn't click Post and get an error.
 			$really_previewing = true;
 
-		}
-		else
+		} else
 		{
-			if (!isset($_REQUEST['subject']))
-				$_REQUEST['subject'] = '';
-			if (!isset($_REQUEST['message']))
-				$_REQUEST['message'] = '';
-			if (!isset($_REQUEST['icon']))
-				$_REQUEST['icon'] = 'xx';
+			if (!isset($_REQUEST['subject'])) {
+							$_REQUEST['subject'] = '';
+			}
+			if (!isset($_REQUEST['message'])) {
+							$_REQUEST['message'] = '';
+			}
+			if (!isset($_REQUEST['icon'])) {
+							$_REQUEST['icon'] = 'xx';
+			}
 
 			// They are previewing if they asked to preview (i.e. came from quick reply).
 			$really_previewing = !empty($_POST['preview']);
@@ -420,8 +443,9 @@ 
 		$form_message = $smcFunc['htmlspecialchars']($_REQUEST['message'], ENT_QUOTES);
 
 		// Make sure the subject isn't too long - taking into account special characters.
-		if ($smcFunc['strlen']($form_subject) > 100)
-			$form_subject = $smcFunc['substr']($form_subject, 0, 100);
+		if ($smcFunc['strlen']($form_subject) > 100) {
+					$form_subject = $smcFunc['substr']($form_subject, 0, 100);
+		}
 
 		if (isset($_REQUEST['poll']))
 		{
@@ -433,8 +457,9 @@ 
 			$_POST['options'] = empty($_POST['options']) ? array() : htmlspecialchars__recursive($_POST['options']);
 			foreach ($_POST['options'] as $option)
 			{
-				if (trim($option) == '')
-					continue;
+				if (trim($option) == '') {
+									continue;
+				}
 
 				$context['choices'][] = array(
 					'id' => $choice_id++,
@@ -496,13 +521,14 @@ 
 				$context['preview_subject'] = $form_subject;
 
 				censorText($context['preview_subject']);
+			} else {
+							$context['preview_subject'] = '<em>' . $txt['no_subject'] . '</em>';
 			}
-			else
-				$context['preview_subject'] = '<em>' . $txt['no_subject'] . '</em>';
 
 			// Protect any CDATA blocks.
-			if (isset($_REQUEST['xml']))
-				$context['preview_message'] = strtr($context['preview_message'], array(']]>' => ']]]]><![CDATA[>'));
+			if (isset($_REQUEST['xml'])) {
+							$context['preview_message'] = strtr($context['preview_message'], array(']]>' => ']]]]><![CDATA[>'));
+			}
 		}
 
 		// Set up the checkboxes.
@@ -541,29 +567,32 @@ 
 			);
 			// The message they were trying to edit was most likely deleted.
 			// @todo Change this error message?
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('no_board', false);
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('no_board', false);
+			}
 			$row = $smcFunc['db_fetch_assoc']($request);
 
 			$attachment_stuff = array($row);
-			while ($row2 = $smcFunc['db_fetch_assoc']($request))
-				$attachment_stuff[] = $row2;
+			while ($row2 = $smcFunc['db_fetch_assoc']($request)) {
+							$attachment_stuff[] = $row2;
+			}
 			$smcFunc['db_free_result']($request);
 
 			if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
 			{
 				// Give an extra five minutes over the disable time threshold, so they can type - assuming the post is public.
-				if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
-					fatal_lang_error('modify_post_time_passed', false);
-				elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own'))
-					isAllowedTo('modify_replies');
-				else
-					isAllowedTo('modify_own');
+				if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
+									fatal_lang_error('modify_post_time_passed', false);
+				} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own')) {
+									isAllowedTo('modify_replies');
+				} else {
+									isAllowedTo('modify_own');
+				}
+			} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any')) {
+							isAllowedTo('modify_replies');
+			} else {
+							isAllowedTo('modify_any');
 			}
-			elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any'))
-				isAllowedTo('modify_replies');
-			else
-				isAllowedTo('modify_any');
 
 			if ($context['can_announce'] && !empty($row['id_action']))
 			{
@@ -587,8 +616,9 @@ 
 
 				while ($row = $smcFunc['db_fetch_assoc']($request))
 				{
-					if ($row['filesize'] <= 0)
-						continue;
+					if ($row['filesize'] <= 0) {
+											continue;
+					}
 					$context['current_attachments'][$row['id_attach']] = array(
 						'name' => $smcFunc['htmlspecialchars']($row['filename']),
 						'size' => $row['filesize'],
@@ -658,29 +688,32 @@ 
 			)
 		);
 		// The message they were trying to edit was most likely deleted.
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_message', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_message', false);
+		}
 		$row = $smcFunc['db_fetch_assoc']($request);
 
 		$attachment_stuff = array($row);
-		while ($row2 = $smcFunc['db_fetch_assoc']($request))
-			$attachment_stuff[] = $row2;
+		while ($row2 = $smcFunc['db_fetch_assoc']($request)) {
+					$attachment_stuff[] = $row2;
+		}
 		$smcFunc['db_free_result']($request);
 
 		if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
 		{
 			// Give an extra five minutes over the disable time threshold, so they can type - assuming the post is public.
-			if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
-				fatal_lang_error('modify_post_time_passed', false);
-			elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own'))
-				isAllowedTo('modify_replies');
-			else
-				isAllowedTo('modify_own');
+			if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
+							fatal_lang_error('modify_post_time_passed', false);
+			} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own')) {
+							isAllowedTo('modify_replies');
+			} else {
+							isAllowedTo('modify_own');
+			}
+		} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any')) {
+					isAllowedTo('modify_replies');
+		} else {
+					isAllowedTo('modify_any');
 		}
-		elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any'))
-			isAllowedTo('modify_replies');
-		else
-			isAllowedTo('modify_any');
 
 		if ($context['can_announce'] && !empty($row['id_action']))
 		{
@@ -707,15 +740,17 @@ 
 		$context['icon'] = $row['icon'];
 
 		// Show an "approve" box if the user can approve it, and the message isn't approved.
-		if (!$row['approved'] && !$context['show_approval'])
-			$context['show_approval'] = allowedTo('approve_posts');
+		if (!$row['approved'] && !$context['show_approval']) {
+					$context['show_approval'] = allowedTo('approve_posts');
+		}
 
 		// Sort the attachments so they are in the order saved
 		$temp = array();
 		foreach ($attachment_stuff as $attachment)
 		{
-			if ($attachment['filesize'] >= 0 && !empty($modSettings['attachmentEnable']))
-				$temp[$attachment['id_attach']] = $attachment;
+			if ($attachment['filesize'] >= 0 && !empty($modSettings['attachmentEnable'])) {
+							$temp[$attachment['id_attach']] = $attachment;
+			}
 
 		}
 		ksort($temp);
@@ -777,14 +812,16 @@ 
 					'is_approved' => 1,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('quoted_post_deleted', false);
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('quoted_post_deleted', false);
+			}
 			list ($form_subject, $mname, $mdate, $form_message) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
 			// Add 'Re: ' to the front of the quoted subject.
-			if (trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0)
-				$form_subject = $context['response_prefix'] . $form_subject;
+			if (trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) {
+							$form_subject = $context['response_prefix'] . $form_subject;
+			}
 
 			// Censor the message and subject.
 			censorText($form_message);
@@ -797,10 +834,11 @@ 
 				for ($i = 0, $n = count($parts); $i < $n; $i++)
 				{
 					// It goes 0 = outside, 1 = begin tag, 2 = inside, 3 = close tag, repeat.
-					if ($i % 4 == 0)
-						$parts[$i] = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function ($m)
+					if ($i % 4 == 0) {
+											$parts[$i] = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function ($m)
 						{
 							return '[html]' . preg_replace('~<br\s?/?' . '>~i', '&lt;br /&gt;<br>', "$m[1]") . '[/html]';
+					}
 						}, $parts[$i]);
 				}
 				$form_message = implode('', $parts);
@@ -809,8 +847,9 @@ 
 			$form_message = preg_replace('~<br ?/?' . '>~i', "\n", $form_message);
 
 			// Remove any nested quotes, if necessary.
-			if (!empty($modSettings['removeNestedQuotes']))
-				$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
+			if (!empty($modSettings['removeNestedQuotes'])) {
+							$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
+			}
 
 			// Add a quote string on the front and end.
 			$form_message = '[quote author=' . $mname . ' link=msg=' . (int) $_REQUEST['quote'] . ' date=' . $mdate . ']' . "\n" . rtrim($form_message) . "\n" . '[/quote]';
@@ -822,15 +861,15 @@ 
 			$form_subject = $first_subject;
 
 			// Add 'Re: ' to the front of the subject.
-			if (trim($context['response_prefix']) != '' && $form_subject != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0)
-				$form_subject = $context['response_prefix'] . $form_subject;
+			if (trim($context['response_prefix']) != '' && $form_subject != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) {
+							$form_subject = $context['response_prefix'] . $form_subject;
+			}
 
 			// Censor the subject.
 			censorText($form_subject);
 
 			$form_message = '';
-		}
-		else
+		} else
 		{
 			$form_subject = isset($_GET['subject']) ? $_GET['subject'] : '';
 			$form_message = '';
@@ -848,13 +887,15 @@ 
 		if (isset($_REQUEST['msg']))
 		{
 			$context['attachments']['quantity'] = count($context['current_attachments']);
-			foreach ($context['current_attachments'] as $attachment)
-				$context['attachments']['total_size'] += $attachment['size'];
+			foreach ($context['current_attachments'] as $attachment) {
+							$context['attachments']['total_size'] += $attachment['size'];
+			}
 		}
 
 		// A bit of house keeping first.
-		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1)
-			unset($_SESSION['temp_attachments']);
+		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1) {
+					unset($_SESSION['temp_attachments']);
+		}
 
 		if (!empty($_SESSION['temp_attachments']))
 		{
@@ -863,9 +904,10 @@ 
 			{
 				foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 				{
-					if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
-						if (file_exists($attachment['tmp_name']))
+					if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false) {
+											if (file_exists($attachment['tmp_name']))
 							unlink($attachment['tmp_name']);
+					}
 				}
 				$post_errors[] = 'temp_attachments_gone';
 				$_SESSION['temp_attachments'] = array();
@@ -879,8 +921,9 @@ 
 					// See if any files still exist before showing the warning message and the files attached.
 					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 					{
-						if (strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
-							continue;
+						if (strpos($attachID, 'post_tmp_' . $user_info['id']) === false) {
+													continue;
+						}
 
 						if (file_exists($attachment['tmp_name']))
 						{
@@ -890,20 +933,21 @@ 
 							break;
 						}
 					}
-				}
-				else
+				} else
 				{
 					// Since, they don't belong here. Let's inform the user that they exist..
-					if (!empty($topic))
-						$delete_url = $scripturl . '?action=post' .(!empty($_REQUEST['msg']) ? (';msg=' . $_REQUEST['msg']) : '') . (!empty($_REQUEST['last_msg']) ? (';last_msg=' . $_REQUEST['last_msg']) : '') . ';topic=' . $topic . ';delete_temp';
-					else
-						$delete_url = $scripturl . '?action=post;board=' . $board . ';delete_temp';
+					if (!empty($topic)) {
+											$delete_url = $scripturl . '?action=post' .(!empty($_REQUEST['msg']) ? (';msg=' . $_REQUEST['msg']) : '') . (!empty($_REQUEST['last_msg']) ? (';last_msg=' . $_REQUEST['last_msg']) : '') . ';topic=' . $topic . ';delete_temp';
+					} else {
+											$delete_url = $scripturl . '?action=post;board=' . $board . ';delete_temp';
+					}
 
 					// Compile a list of the files to show the user.
 					$file_list = array();
-					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-						if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
+					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+											if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
 							$file_list[] =  $attachment['name'];
+					}
 
 					$_SESSION['temp_attachments']['post']['files'] = $file_list;
 					$file_list = '<div class="attachments">' . implode('<br>', $file_list) . '</div>';
@@ -915,8 +959,7 @@ 
 
 						$post_errors[] = array('temp_attachments_found', array($delete_url, $goback_url, $file_list));
 						$context['ignore_temp_attachments'] = true;
-					}
-					else
+					} else
 					{
 						$post_errors[] = array('temp_attachments_lost', array($delete_url, $file_list));
 						$context['ignore_temp_attachments'] = true;
@@ -924,16 +967,19 @@ 
 				}
 			}
 
-			if (!empty($context['we_are_history']))
-				$post_errors[] = $context['we_are_history'];
+			if (!empty($context['we_are_history'])) {
+							$post_errors[] = $context['we_are_history'];
+			}
 
 			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 			{
-				if (isset($context['ignore_temp_attachments']) || isset($_SESSION['temp_attachments']['post']['files']))
-					break;
+				if (isset($context['ignore_temp_attachments']) || isset($_SESSION['temp_attachments']['post']['files'])) {
+									break;
+				}
 
-				if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
-					continue;
+				if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false) {
+									continue;
+				}
 
 				if ($attachID == 'initial_error')
 				{
@@ -948,15 +994,17 @@ 
 				{
 					$txt['error_attach_errors'] = empty($txt['error_attach_errors']) ? '<br>' : '';
 					$txt['error_attach_errors'] .= vsprintf($txt['attach_warning'], $attachment['name']) . '<div style="padding: 0 1em;">';
-					foreach ($attachment['errors'] as $error)
-						$txt['error_attach_errors'] .= (is_array($error) ? vsprintf($txt[$error[0]], $error[1]) : $txt[$error]) . '<br >';
+					foreach ($attachment['errors'] as $error) {
+											$txt['error_attach_errors'] .= (is_array($error) ? vsprintf($txt[$error[0]], $error[1]) : $txt[$error]) . '<br >';
+					}
 					$txt['error_attach_errors'] .= '</div>';
 					$post_errors[] = 'attach_errors';
 
 					// Take out the trash.
 					unset($_SESSION['temp_attachments'][$attachID]);
-					if (file_exists($attachment['tmp_name']))
-						unlink($attachment['tmp_name']);
+					if (file_exists($attachment['tmp_name'])) {
+											unlink($attachment['tmp_name']);
+					}
 					continue;
 				}
 
@@ -969,8 +1017,9 @@ 
 
 				$context['attachments']['quantity']++;
 				$context['attachments']['total_size'] += $attachment['size'];
-				if (!isset($context['files_in_session_warning']))
-					$context['files_in_session_warning'] = $txt['attached_files_in_session'];
+				if (!isset($context['files_in_session_warning'])) {
+									$context['files_in_session_warning'] = $txt['attached_files_in_session'];
+				}
 
 				$context['current_attachments'][$attachID] = array(
 					'name' => '<u>' . $smcFunc['htmlspecialchars']($attachment['name']) . '</u>',
@@ -998,8 +1047,9 @@ 
 	}
 
 	// If they came from quick reply, and have to enter verification details, give them some notice.
-	if (!empty($_REQUEST['from_qr']) && !empty($context['require_verification']))
-		$post_errors[] = 'need_qr_verification';
+	if (!empty($_REQUEST['from_qr']) && !empty($context['require_verification'])) {
+			$post_errors[] = 'need_qr_verification';
+	}
 
 	/*
 	 * There are two error types: serious and minor. Serious errors
@@ -1016,52 +1066,56 @@ 
 	{
 		loadLanguage('Errors');
 		$context['error_type'] = 'minor';
-		foreach ($post_errors as $post_error)
-			if (is_array($post_error))
+		foreach ($post_errors as $post_error) {
+					if (is_array($post_error))
 			{
 				$post_error_id = $post_error[0];
+		}
 				$context['post_error'][$post_error_id] = vsprintf($txt['error_' . $post_error_id], $post_error[1]);
 
 				// If it's not a minor error flag it as such.
-				if (!in_array($post_error_id, $minor_errors))
-					$context['error_type'] = 'serious';
-			}
-			else
+				if (!in_array($post_error_id, $minor_errors)) {
+									$context['error_type'] = 'serious';
+				}
+			} else
 			{
 				$context['post_error'][$post_error] = $txt['error_' . $post_error];
 
 				// If it's not a minor error flag it as such.
-				if (!in_array($post_error, $minor_errors))
-					$context['error_type'] = 'serious';
+				if (!in_array($post_error, $minor_errors)) {
+									$context['error_type'] = 'serious';
+				}
 			}
 	}
 
 	// What are you doing? Posting a poll, modifying, previewing, new post, or reply...
-	if (isset($_REQUEST['poll']))
-		$context['page_title'] = $txt['new_poll'];
-	elseif ($context['make_event'])
-		$context['page_title'] = $context['event']['id'] == -1 ? $txt['calendar_post_event'] : $txt['calendar_edit'];
-	elseif (isset($_REQUEST['msg']))
-		$context['page_title'] = $txt['modify_msg'];
-	elseif (isset($_REQUEST['subject'], $context['preview_subject']))
-		$context['page_title'] = $txt['preview'] . ' - ' . strip_tags($context['preview_subject']);
-	elseif (empty($topic))
-		$context['page_title'] = $txt['start_new_topic'];
-	else
-		$context['page_title'] = $txt['post_reply'];
+	if (isset($_REQUEST['poll'])) {
+			$context['page_title'] = $txt['new_poll'];
+	} elseif ($context['make_event']) {
+			$context['page_title'] = $context['event']['id'] == -1 ? $txt['calendar_post_event'] : $txt['calendar_edit'];
+	} elseif (isset($_REQUEST['msg'])) {
+			$context['page_title'] = $txt['modify_msg'];
+	} elseif (isset($_REQUEST['subject'], $context['preview_subject'])) {
+			$context['page_title'] = $txt['preview'] . ' - ' . strip_tags($context['preview_subject']);
+	} elseif (empty($topic)) {
+			$context['page_title'] = $txt['start_new_topic'];
+	} else {
+			$context['page_title'] = $txt['post_reply'];
+	}
 
 	// Build the link tree.
-	if (empty($topic))
-		$context['linktree'][] = array(
+	if (empty($topic)) {
+			$context['linktree'][] = array(
 			'name' => '<em>' . $txt['start_new_topic'] . '</em>'
 		);
-	else
-		$context['linktree'][] = array(
+	} else {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?topic=' . $topic . '.' . $_REQUEST['start'],
 			'name' => $form_subject,
 			'extra_before' => '<span><strong class="nav">' . $context['page_title'] . ' (</strong></span>',
 			'extra_after' => '<span><strong class="nav">)</strong></span>'
 		);
+	}
 
 	$context['subject'] = addcslashes($form_subject, '"');
 	$context['message'] = str_replace(array('"', '<', '>', '&nbsp;'), array('&quot;', '&lt;', '&gt;', ' '), $form_message);
@@ -1105,8 +1159,9 @@ 
 	// Message icons - customized icons are off?
 	$context['icons'] = getMessageIcons($board);
 
-	if (!empty($context['icons']))
-		$context['icons'][count($context['icons']) - 1]['is_last'] = true;
+	if (!empty($context['icons'])) {
+			$context['icons'][count($context['icons']) - 1]['is_last'] = true;
+	}
 
 	// Are we starting a poll? if set the poll icon as selected if its available
 	if (isset($_REQUEST['poll']))
@@ -1126,8 +1181,9 @@ 
 	for ($i = 0, $n = count($context['icons']); $i < $n; $i++)
 	{
 		$context['icons'][$i]['selected'] = $context['icon'] == $context['icons'][$i]['value'];
-		if ($context['icons'][$i]['selected'])
-			$context['icon_url'] = $context['icons'][$i]['url'];
+		if ($context['icons'][$i]['selected']) {
+					$context['icon_url'] = $context['icons'][$i]['url'];
+		}
 	}
 	if (empty($context['icon_url']))
 	{
@@ -1141,8 +1197,9 @@ 
 		));
 	}
 
-	if (!empty($topic) && !empty($modSettings['topicSummaryPosts']))
-		getTopic();
+	if (!empty($topic) && !empty($modSettings['topicSummaryPosts'])) {
+			getTopic();
+	}
 
 	// If the user can post attachments prepare the warning labels.
 	if ($context['can_post_attachment'])
@@ -1153,15 +1210,17 @@ 
 		$context['attachment_restrictions'] = array();
 		$context['allowed_extensions'] = strtr(strtolower($modSettings['attachmentExtensions']), array(',' => ', '));
 		$attachmentRestrictionTypes = array('attachmentNumPerPostLimit', 'attachmentPostLimit', 'attachmentSizeLimit');
-		foreach ($attachmentRestrictionTypes as $type)
-			if (!empty($modSettings[$type]))
+		foreach ($attachmentRestrictionTypes as $type) {
+					if (!empty($modSettings[$type]))
 			{
 				$context['attachment_restrictions'][] = sprintf($txt['attach_restrict_' . $type . ($modSettings[$type] >= 1024 ? '_MB' : '')], comma_format($modSettings[$type], 0));
+		}
 				// Show some numbers. If they exist.
-				if ($type == 'attachmentNumPerPostLimit' && $context['attachments']['quantity'] > 0)
-					$context['attachment_restrictions'][] = sprintf($txt['attach_remaining'], $modSettings['attachmentNumPerPostLimit'] - $context['attachments']['quantity']);
-				elseif ($type == 'attachmentPostLimit' && $context['attachments']['total_size'] > 0)
-					$context['attachment_restrictions'][] = sprintf($txt['attach_available'], comma_format(round(max($modSettings['attachmentPostLimit'] - ($context['attachments']['total_size'] / 1024), 0)), 0));
+				if ($type == 'attachmentNumPerPostLimit' && $context['attachments']['quantity'] > 0) {
+									$context['attachment_restrictions'][] = sprintf($txt['attach_remaining'], $modSettings['attachmentNumPerPostLimit'] - $context['attachments']['quantity']);
+				} elseif ($type == 'attachmentPostLimit' && $context['attachments']['total_size'] > 0) {
+									$context['attachment_restrictions'][] = sprintf($txt['attach_available'], comma_format(round(max($modSettings['attachmentPostLimit'] - ($context['attachments']['total_size'] / 1024), 0)), 0));
+				}
 			}
 	}
 
@@ -1195,8 +1254,8 @@ 
 
 	if (!empty($context['current_attachments']))
 	{
-		foreach ($context['current_attachments'] as $key => $mock)
-			addInlineJavaScript('
+		foreach ($context['current_attachments'] as $key => $mock) {
+					addInlineJavaScript('
 	current_attachments.push({
 		name: '. JavaScriptEscape($mock['name']) .',
 		size: '. $mock['size'] .',
@@ -1205,6 +1264,7 @@ 
 		type: '. JavaScriptEscape(!empty($mock['mime_type']) ? $mock['mime_type'] : '') .',
 		thumbID: '. (!empty($mock['thumb']) ? $mock['thumb'] : 0) .'
 	});', true);
+		}
 	}
 
 	// File Upload.
@@ -1249,8 +1309,9 @@ 
 	var current_board = '. (empty($context['current_board']) ? 'null' : $context['current_board']) .';', false);
 
 	// Finally, load the template.
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('Post');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('Post');
+	}
 
 	call_integration_hook('integrate_post_end');
 }
@@ -1271,13 +1332,14 @@ 
 	// Sneaking off, are we?
 	if (empty($_POST) && empty($topic))
 	{
-		if (empty($_SERVER['CONTENT_LENGTH']))
-			redirectexit('action=post;board=' . $board . '.0');
-		else
-			fatal_lang_error('post_upload_error', false);
+		if (empty($_SERVER['CONTENT_LENGTH'])) {
+					redirectexit('action=post;board=' . $board . '.0');
+		} else {
+					fatal_lang_error('post_upload_error', false);
+		}
+	} elseif (empty($_POST) && !empty($topic)) {
+			redirectexit('action=post;topic=' . $topic . '.0');
 	}
-	elseif (empty($_POST) && !empty($topic))
-		redirectexit('action=post;topic=' . $topic . '.0');
 
 	// No need!
 	$context['robot_no_index'] = true;
@@ -1289,8 +1351,9 @@ 
 	$post_errors = array();
 
 	// If the session has timed out, let the user re-submit their form.
-	if (checkSession('post', '', false) != '')
-		$post_errors[] = 'session_timeout';
+	if (checkSession('post', '', false) != '') {
+			$post_errors[] = 'session_timeout';
+	}
 
 	// Wrong verification code?
 	if (!$user_info['is_admin'] && !$user_info['is_mod'] && !empty($modSettings['posts_require_captcha']) && ($user_info['posts'] < $modSettings['posts_require_captcha'] || ($user_info['is_guest'] && $modSettings['posts_require_captcha'] == -1)))
@@ -1300,33 +1363,38 @@ 
 			'id' => 'post',
 		);
 		$context['require_verification'] = create_control_verification($verificationOptions, true);
-		if (is_array($context['require_verification']))
-			$post_errors = array_merge($post_errors, $context['require_verification']);
+		if (is_array($context['require_verification'])) {
+					$post_errors = array_merge($post_errors, $context['require_verification']);
+		}
 	}
 
 	require_once($sourcedir . '/Subs-Post.php');
 	loadLanguage('Post');
 
 	// Drafts enabled and needed?
-	if (!empty($modSettings['drafts_post_enabled']) && (isset($_POST['save_draft']) || isset($_POST['id_draft'])))
-		require_once($sourcedir . '/Drafts.php');
+	if (!empty($modSettings['drafts_post_enabled']) && (isset($_POST['save_draft']) || isset($_POST['id_draft']))) {
+			require_once($sourcedir . '/Drafts.php');
+	}
 
 	// First check to see if they are trying to delete any current attachments.
 	if (isset($_POST['attach_del']))
 	{
 		$keep_temp = array();
 		$keep_ids = array();
-		foreach ($_POST['attach_del'] as $dummy)
-			if (strpos($dummy, 'post_tmp_' . $user_info['id']) !== false)
+		foreach ($_POST['attach_del'] as $dummy) {
+					if (strpos($dummy, 'post_tmp_' . $user_info['id']) !== false)
 				$keep_temp[] = $dummy;
-			else
-				$keep_ids[] = (int) $dummy;
+		}
+			else {
+							$keep_ids[] = (int) $dummy;
+			}
 
-		if (isset($_SESSION['temp_attachments']))
-			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
+		if (isset($_SESSION['temp_attachments'])) {
+					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 			{
 				if ((isset($_SESSION['temp_attachments']['post']['files'], $attachment['name']) && in_array($attachment['name'], $_SESSION['temp_attachments']['post']['files'])) || in_array($attachID, $keep_temp) || strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
 					continue;
+		}
 
 				unset($_SESSION['temp_attachments'][$attachID]);
 				unlink($attachment['tmp_name']);
@@ -1368,24 +1436,28 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Though the topic should be there, it might have vanished.
-		if (!is_array($topic_info))
-			fatal_lang_error('topic_doesnt_exist', 404);
+		if (!is_array($topic_info)) {
+					fatal_lang_error('topic_doesnt_exist', 404);
+		}
 
 		// Did this topic suddenly move? Just checking...
-		if ($topic_info['id_board'] != $board)
-			fatal_lang_error('not_a_topic');
+		if ($topic_info['id_board'] != $board) {
+					fatal_lang_error('not_a_topic');
+		}
 	}
 
 	// Replying to a topic?
 	if (!empty($topic) && !isset($_REQUEST['msg']))
 	{
 		// Don't allow a post if it's locked.
-		if ($topic_info['locked'] != 0 && !allowedTo('moderate_board'))
-			fatal_lang_error('topic_locked', false);
+		if ($topic_info['locked'] != 0 && !allowedTo('moderate_board')) {
+					fatal_lang_error('topic_locked', false);
+		}
 
 		// Sorry, multiple polls aren't allowed... yet.  You should stop giving me ideas :P.
-		if (isset($_REQUEST['poll']) && $topic_info['id_poll'] > 0)
-			unset($_REQUEST['poll']);
+		if (isset($_REQUEST['poll']) && $topic_info['id_poll'] > 0) {
+					unset($_REQUEST['poll']);
+		}
 
 		// Do the permissions and approval stuff...
 		$becomesApproved = true;
@@ -1401,44 +1473,43 @@ 
 
 			// Set a nice session var...
 			$_SESSION['becomesUnapproved'] = true;
-		}
-
-		elseif ($topic_info['id_member_started'] != $user_info['id'])
+		} elseif ($topic_info['id_member_started'] != $user_info['id'])
 		{
-			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any'))
-				$becomesApproved = false;
-
-			else
-				isAllowedTo('post_reply_any');
-		}
-		elseif (!allowedTo('post_reply_any'))
+			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any')) {
+							$becomesApproved = false;
+			} else {
+							isAllowedTo('post_reply_any');
+			}
+		} elseif (!allowedTo('post_reply_any'))
 		{
-			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own'))
-				$becomesApproved = false;
-
-			else
-				isAllowedTo('post_reply_own');
+			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own')) {
+							$becomesApproved = false;
+			} else {
+							isAllowedTo('post_reply_own');
+			}
 		}
 
 		if (isset($_POST['lock']))
 		{
 			// Nothing is changed to the lock.
-			if ((empty($topic_info['locked']) && empty($_POST['lock'])) || (!empty($_POST['lock']) && !empty($topic_info['locked'])))
-				unset($_POST['lock']);
+			if ((empty($topic_info['locked']) && empty($_POST['lock'])) || (!empty($_POST['lock']) && !empty($topic_info['locked']))) {
+							unset($_POST['lock']);
+			}
 
 			// You're have no permission to lock this topic.
-			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started']))
-				unset($_POST['lock']);
+			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started'])) {
+							unset($_POST['lock']);
+			}
 
 			// You are allowed to (un)lock your own topic only.
 			elseif (!allowedTo('lock_any'))
 			{
 				// You cannot override a moderator lock.
-				if ($topic_info['locked'] == 1)
-					unset($_POST['lock']);
-
-				else
-					$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+				if ($topic_info['locked'] == 1) {
+									unset($_POST['lock']);
+				} else {
+									$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+				}
 			}
 			// Hail mighty moderator, (un)lock this topic immediately.
 			else
@@ -1446,19 +1517,21 @@ 
 				$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
 
 				// Did someone (un)lock this while you were posting?
-				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked'])
-					$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
+				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked']) {
+									$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
+				}
 			}
 		}
 
 		// So you wanna (un)sticky this...let's see.
-		if (isset($_POST['sticky']) && ($_POST['sticky'] == $topic_info['is_sticky'] || !allowedTo('make_sticky')))
-			unset($_POST['sticky']);
-		elseif (isset($_POST['sticky']))
+		if (isset($_POST['sticky']) && ($_POST['sticky'] == $topic_info['is_sticky'] || !allowedTo('make_sticky'))) {
+					unset($_POST['sticky']);
+		} elseif (isset($_POST['sticky']))
 		{
 			// Did someone (un)sticky this while you were posting?
-			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky'])
-				$post_errors[] = 'topic_' . (empty($topic_info['is_sticky']) ? 'un' : '') . 'sticky';
+			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky']) {
+							$post_errors[] = 'topic_' . (empty($topic_info['is_sticky']) ? 'un' : '') . 'sticky';
+			}
 		}
 
 		// If drafts are enabled, then pass this off
@@ -1485,26 +1558,31 @@ 
 
 		// Do like, the permissions, for safety and stuff...
 		$becomesApproved = true;
-		if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics'))
-			$becomesApproved = false;
-		else
-			isAllowedTo('post_new');
+		if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics')) {
+					$becomesApproved = false;
+		} else {
+					isAllowedTo('post_new');
+		}
 
 		if (isset($_POST['lock']))
 		{
 			// New topics are by default not locked.
-			if (empty($_POST['lock']))
-				unset($_POST['lock']);
+			if (empty($_POST['lock'])) {
+							unset($_POST['lock']);
+			}
 			// Besides, you need permission.
-			elseif (!allowedTo(array('lock_any', 'lock_own')))
-				unset($_POST['lock']);
+			elseif (!allowedTo(array('lock_any', 'lock_own'))) {
+							unset($_POST['lock']);
+			}
 			// A moderator-lock (1) can override a user-lock (2).
-			else
-				$_POST['lock'] = allowedTo('lock_any') ? 1 : 2;
+			else {
+							$_POST['lock'] = allowedTo('lock_any') ? 1 : 2;
+			}
 		}
 
-		if (isset($_POST['sticky']) && (empty($_POST['sticky']) || !allowedTo('make_sticky')))
-			unset($_POST['sticky']);
+		if (isset($_POST['sticky']) && (empty($_POST['sticky']) || !allowedTo('make_sticky'))) {
+					unset($_POST['sticky']);
+		}
 
 		// Saving your new topic as a draft first?
 		if (!empty($modSettings['drafts_post_enabled']) && isset($_POST['save_draft']))
@@ -1529,31 +1607,37 @@ 
 				'id_msg' => $_REQUEST['msg'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('cant_find_messages', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('cant_find_messages', false);
+		}
 		$row = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($topic_info['locked']) && !allowedTo('moderate_board'))
-			fatal_lang_error('topic_locked', false);
+		if (!empty($topic_info['locked']) && !allowedTo('moderate_board')) {
+					fatal_lang_error('topic_locked', false);
+		}
 
 		if (isset($_POST['lock']))
 		{
 			// Nothing changes to the lock status.
-			if ((empty($_POST['lock']) && empty($topic_info['locked'])) || (!empty($_POST['lock']) && !empty($topic_info['locked'])))
-				unset($_POST['lock']);
+			if ((empty($_POST['lock']) && empty($topic_info['locked'])) || (!empty($_POST['lock']) && !empty($topic_info['locked']))) {
+							unset($_POST['lock']);
+			}
 			// You're simply not allowed to (un)lock this.
-			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started']))
-				unset($_POST['lock']);
+			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started'])) {
+							unset($_POST['lock']);
+			}
 			// You're only allowed to lock your own topics.
 			elseif (!allowedTo('lock_any'))
 			{
 				// You're not allowed to break a moderator's lock.
-				if ($topic_info['locked'] == 1)
-					unset($_POST['lock']);
+				if ($topic_info['locked'] == 1) {
+									unset($_POST['lock']);
+				}
 				// Lock it with a soft lock or unlock it.
-				else
-					$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+				else {
+									$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+				}
 			}
 			// You must be the moderator.
 			else
@@ -1561,44 +1645,46 @@ 
 				$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
 
 				// Did someone (un)lock this while you were posting?
-				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked'])
-					$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
+				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked']) {
+									$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
+				}
 			}
 		}
 
 		// Change the sticky status of this topic?
-		if (isset($_POST['sticky']) && (!allowedTo('make_sticky') || $_POST['sticky'] == $topic_info['is_sticky']))
-			unset($_POST['sticky']);
-		elseif (isset($_POST['sticky']))
+		if (isset($_POST['sticky']) && (!allowedTo('make_sticky') || $_POST['sticky'] == $topic_info['is_sticky'])) {
+					unset($_POST['sticky']);
+		} elseif (isset($_POST['sticky']))
 		{
 			// Did someone (un)sticky this while you were posting?
-			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky'])
-				$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'stickied';
+			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky']) {
+							$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'stickied';
+			}
 		}
 
 		if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
 		{
-			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
-				fatal_lang_error('modify_post_time_passed', false);
-			elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_own'))
-				isAllowedTo('modify_replies');
-			else
-				isAllowedTo('modify_own');
-		}
-		elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_any'))
+			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
+							fatal_lang_error('modify_post_time_passed', false);
+			} elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_own')) {
+							isAllowedTo('modify_replies');
+			} else {
+							isAllowedTo('modify_own');
+			}
+		} elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_any'))
 		{
 			isAllowedTo('modify_replies');
 
 			// If you're modifying a reply, I say it better be logged...
 			$moderationAction = true;
-		}
-		else
+		} else
 		{
 			isAllowedTo('modify_any');
 
 			// Log it, assuming you're not modifying your own post.
-			if ($row['id_member'] != $user_info['id'])
-				$moderationAction = true;
+			if ($row['id_member'] != $user_info['id']) {
+							$moderationAction = true;
+			}
 		}
 
 		// If drafts are enabled, then lets send this off to save
@@ -1635,20 +1721,24 @@ 
 		$_POST['guestname'] = !isset($_POST['guestname']) ? '' : trim($_POST['guestname']);
 		$_POST['email'] = !isset($_POST['email']) ? '' : trim($_POST['email']);
 
-		if ($_POST['guestname'] == '' || $_POST['guestname'] == '_')
-			$post_errors[] = 'no_name';
-		if ($smcFunc['strlen']($_POST['guestname']) > 25)
-			$post_errors[] = 'long_name';
+		if ($_POST['guestname'] == '' || $_POST['guestname'] == '_') {
+					$post_errors[] = 'no_name';
+		}
+		if ($smcFunc['strlen']($_POST['guestname']) > 25) {
+					$post_errors[] = 'long_name';
+		}
 
 		if (empty($modSettings['guest_post_no_email']))
 		{
 			// Only check if they changed it!
 			if (!isset($row) || $row['poster_email'] != $_POST['email'])
 			{
-				if (!allowedTo('moderate_forum') && (!isset($_POST['email']) || $_POST['email'] == ''))
-					$post_errors[] = 'no_email';
-				if (!allowedTo('moderate_forum') && !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL))
-					$post_errors[] = 'bad_email';
+				if (!allowedTo('moderate_forum') && (!isset($_POST['email']) || $_POST['email'] == '')) {
+									$post_errors[] = 'no_email';
+				}
+				if (!allowedTo('moderate_forum') && !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
+									$post_errors[] = 'bad_email';
+				}
 			}
 
 			// Now make sure this email address is not banned from posting.
@@ -1664,75 +1754,89 @@ 
 	}
 
 	// Coming from the quickReply?
-	if(isset($_POST['quickReply']))
-		$_POST['message'] = $_POST['quickReply'];
+	if(isset($_POST['quickReply'])) {
+			$_POST['message'] = $_POST['quickReply'];
+	}
 
 	// Check the subject and message.
-	if (!isset($_POST['subject']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['subject'])) === '')
-		$post_errors[] = 'no_subject';
-	if (!isset($_POST['message']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['message']), ENT_QUOTES) === '')
-		$post_errors[] = 'no_message';
-	elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength'])
-		$post_errors[] = array('long_message', array($modSettings['max_messageLength']));
-	else
+	if (!isset($_POST['subject']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['subject'])) === '') {
+			$post_errors[] = 'no_subject';
+	}
+	if (!isset($_POST['message']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['message']), ENT_QUOTES) === '') {
+			$post_errors[] = 'no_message';
+	} elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength']) {
+			$post_errors[] = array('long_message', array($modSettings['max_messageLength']));
+	} else
 	{
 		// Prepare the message a bit for some additional testing.
 		$_POST['message'] = $smcFunc['htmlspecialchars']($_POST['message'], ENT_QUOTES);
 
 		// Preparse code. (Zef)
-		if ($user_info['is_guest'])
-			$user_info['name'] = $_POST['guestname'];
+		if ($user_info['is_guest']) {
+					$user_info['name'] = $_POST['guestname'];
+		}
 		preparsecode($_POST['message']);
 
 		// Let's see if there's still some content left without the tags.
-		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($_POST['message'], false), implode('', $context['allowed_html_tags']))) === '' && (!allowedTo('admin_forum') || strpos($_POST['message'], '[html]') === false))
-			$post_errors[] = 'no_message';
+		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($_POST['message'], false), implode('', $context['allowed_html_tags']))) === '' && (!allowedTo('admin_forum') || strpos($_POST['message'], '[html]') === false)) {
+					$post_errors[] = 'no_message';
+		}
+	}
+	if (isset($_POST['calendar']) && !isset($_REQUEST['deleteevent']) && $smcFunc['htmltrim']($_POST['evtitle']) === '') {
+			$post_errors[] = 'no_event';
 	}
-	if (isset($_POST['calendar']) && !isset($_REQUEST['deleteevent']) && $smcFunc['htmltrim']($_POST['evtitle']) === '')
-		$post_errors[] = 'no_event';
 	// You are not!
-	if (isset($_POST['message']) && strtolower($_POST['message']) == 'i am the administrator.' && !$user_info['is_admin'])
-		fatal_error('Knave! Masquerader! Charlatan!', false);
+	if (isset($_POST['message']) && strtolower($_POST['message']) == 'i am the administrator.' && !$user_info['is_admin']) {
+			fatal_error('Knave! Masquerader! Charlatan!', false);
+	}
 
 	// Validate the poll...
 	if (isset($_REQUEST['poll']) && $modSettings['pollMode'] == '1')
 	{
-		if (!empty($topic) && !isset($_REQUEST['msg']))
-			fatal_lang_error('no_access', false);
+		if (!empty($topic) && !isset($_REQUEST['msg'])) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// This is a new topic... so it's a new poll.
-		if (empty($topic))
-			isAllowedTo('poll_post');
+		if (empty($topic)) {
+					isAllowedTo('poll_post');
+		}
 		// Can you add to your own topics?
-		elseif ($user_info['id'] == $topic_info['id_member_started'] && !allowedTo('poll_add_any'))
-			isAllowedTo('poll_add_own');
+		elseif ($user_info['id'] == $topic_info['id_member_started'] && !allowedTo('poll_add_any')) {
+					isAllowedTo('poll_add_own');
+		}
 		// Can you add polls to any topic, then?
-		else
-			isAllowedTo('poll_add_any');
+		else {
+					isAllowedTo('poll_add_any');
+		}
 
-		if (!isset($_POST['question']) || trim($_POST['question']) == '')
-			$post_errors[] = 'no_question';
+		if (!isset($_POST['question']) || trim($_POST['question']) == '') {
+					$post_errors[] = 'no_question';
+		}
 
 		$_POST['options'] = empty($_POST['options']) ? array() : htmltrim__recursive($_POST['options']);
 
 		// Get rid of empty ones.
-		foreach ($_POST['options'] as $k => $option)
-			if ($option == '')
+		foreach ($_POST['options'] as $k => $option) {
+					if ($option == '')
 				unset($_POST['options'][$k], $_POST['options'][$k]);
+		}
 
 		// What are you going to vote between with one choice?!?
-		if (count($_POST['options']) < 2)
-			$post_errors[] = 'poll_few';
-		elseif (count($_POST['options']) > 256)
-			$post_errors[] = 'poll_many';
+		if (count($_POST['options']) < 2) {
+					$post_errors[] = 'poll_few';
+		} elseif (count($_POST['options']) > 256) {
+					$post_errors[] = 'poll_many';
+		}
 	}
 
 	if ($posterIsGuest)
 	{
 		// If user is a guest, make sure the chosen name isn't taken.
 		require_once($sourcedir . '/Subs-Members.php');
-		if (isReservedName($_POST['guestname'], 0, true, false) && (!isset($row['poster_name']) || $_POST['guestname'] != $row['poster_name']))
-			$post_errors[] = 'bad_name';
+		if (isReservedName($_POST['guestname'], 0, true, false) && (!isset($row['poster_name']) || $_POST['guestname'] != $row['poster_name'])) {
+					$post_errors[] = 'bad_name';
+		}
 	}
 	// If the user isn't a guest, get his or her name and email.
 	elseif (!isset($_REQUEST['msg']))
@@ -1763,8 +1867,9 @@ 
 	}
 
 	// Make sure the user isn't spamming the board.
-	if (!isset($_REQUEST['msg']))
-		spamProtection('post');
+	if (!isset($_REQUEST['msg'])) {
+			spamProtection('post');
+	}
 
 	// At about this point, we're posting and that's that.
 	ignore_user_abort(true);
@@ -1777,32 +1882,36 @@ 
 	$_POST['modify_reason'] = empty($_POST['modify_reason']) ? '' : strtr($smcFunc['htmlspecialchars']($_POST['modify_reason']), array("\r" => '', "\n" => '', "\t" => ''));
 
 	// At this point, we want to make sure the subject isn't too long.
-	if ($smcFunc['strlen']($_POST['subject']) > 100)
-		$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
+	if ($smcFunc['strlen']($_POST['subject']) > 100) {
+			$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
+	}
 
 	// Same with the "why did you edit this" text.
-	if ($smcFunc['strlen']($_POST['modify_reason']) > 100)
-		$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
+	if ($smcFunc['strlen']($_POST['modify_reason']) > 100) {
+			$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
+	}
 
 	// Make the poll...
 	if (isset($_REQUEST['poll']))
 	{
 		// Make sure that the user has not entered a ridiculous number of options..
-		if (empty($_POST['poll_max_votes']) || $_POST['poll_max_votes'] <= 0)
-			$_POST['poll_max_votes'] = 1;
-		elseif ($_POST['poll_max_votes'] > count($_POST['options']))
-			$_POST['poll_max_votes'] = count($_POST['options']);
-		else
-			$_POST['poll_max_votes'] = (int) $_POST['poll_max_votes'];
+		if (empty($_POST['poll_max_votes']) || $_POST['poll_max_votes'] <= 0) {
+					$_POST['poll_max_votes'] = 1;
+		} elseif ($_POST['poll_max_votes'] > count($_POST['options'])) {
+					$_POST['poll_max_votes'] = count($_POST['options']);
+		} else {
+					$_POST['poll_max_votes'] = (int) $_POST['poll_max_votes'];
+		}
 
 		$_POST['poll_expire'] = (int) $_POST['poll_expire'];
 		$_POST['poll_expire'] = $_POST['poll_expire'] > 9999 ? 9999 : ($_POST['poll_expire'] < 0 ? 0 : $_POST['poll_expire']);
 
 		// Just set it to zero if it's not there..
-		if (!isset($_POST['poll_hide']))
-			$_POST['poll_hide'] = 0;
-		else
-			$_POST['poll_hide'] = (int) $_POST['poll_hide'];
+		if (!isset($_POST['poll_hide'])) {
+					$_POST['poll_hide'] = 0;
+		} else {
+					$_POST['poll_hide'] = (int) $_POST['poll_hide'];
+		}
 		$_POST['poll_change_vote'] = isset($_POST['poll_change_vote']) ? 1 : 0;
 
 		$_POST['poll_guest_vote'] = isset($_POST['poll_guest_vote']) ? 1 : 0;
@@ -1811,16 +1920,19 @@ 
 		{
 			require_once($sourcedir . '/Subs-Members.php');
 			$allowedVoteGroups = groupsAllowedTo('poll_vote', $board);
-			if (!in_array(-1, $allowedVoteGroups['allowed']))
-				$_POST['poll_guest_vote'] = 0;
+			if (!in_array(-1, $allowedVoteGroups['allowed'])) {
+							$_POST['poll_guest_vote'] = 0;
+			}
 		}
 
 		// If the user tries to set the poll too far in advance, don't let them.
-		if (!empty($_POST['poll_expire']) && $_POST['poll_expire'] < 1)
-			fatal_lang_error('poll_range_error', false);
+		if (!empty($_POST['poll_expire']) && $_POST['poll_expire'] < 1) {
+					fatal_lang_error('poll_range_error', false);
+		}
 		// Don't allow them to select option 2 for hidden results if it's not time limited.
-		elseif (empty($_POST['poll_expire']) && $_POST['poll_hide'] == 2)
-			$_POST['poll_hide'] = 1;
+		elseif (empty($_POST['poll_expire']) && $_POST['poll_hide'] == 2) {
+					$_POST['poll_hide'] = 1;
+		}
 
 		// Clean up the question and answers.
 		$_POST['question'] = $smcFunc['htmlspecialchars']($_POST['question']);
@@ -1834,13 +1946,15 @@ 
 	{
 		$attachIDs = array();
 		$attach_errors = array();
-		if (!empty($context['we_are_history']))
-			$attach_errors[] = '<dd>' . $txt['error_temp_attachments_flushed'] . '<br><br></dd>';
+		if (!empty($context['we_are_history'])) {
+					$attach_errors[] = '<dd>' . $txt['error_temp_attachments_flushed'] . '<br><br></dd>';
+		}
 
 		foreach ($_SESSION['temp_attachments'] as  $attachID => $attachment)
 		{
-			if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
-				continue;
+			if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false) {
+							continue;
+			}
 
 			// If there was an initial error just show that message.
 			if ($attachID == 'initial_error')
@@ -1869,12 +1983,13 @@ 
 				if (createAttachment($attachmentOptions))
 				{
 					$attachIDs[] = $attachmentOptions['id'];
-					if (!empty($attachmentOptions['thumb']))
-						$attachIDs[] = $attachmentOptions['thumb'];
+					if (!empty($attachmentOptions['thumb'])) {
+											$attachIDs[] = $attachmentOptions['thumb'];
+					}
 				}
+			} else {
+							$attach_errors[] = '<dt>&nbsp;</dt>';
 			}
-			else
-				$attach_errors[] = '<dt>&nbsp;</dt>';
 
 			if (!empty($attachmentOptions['errors']))
 			{
@@ -1886,14 +2001,16 @@ 
 					if (!is_array($error))
 					{
 						$attach_errors[] = '<dd>' . $txt[$error] . '</dd>';
-						if (in_array($error, $log_these))
-							log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						if (in_array($error, $log_these)) {
+													log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						}
+					} else {
+											$attach_errors[] = '<dd>' . vsprintf($txt[$error[0]], $error[1]) . '</dd>';
 					}
-					else
-						$attach_errors[] = '<dd>' . vsprintf($txt[$error[0]], $error[1]) . '</dd>';
 				}
-				if (file_exists($attachment['tmp_name']))
-					unlink($attachment['tmp_name']);
+				if (file_exists($attachment['tmp_name'])) {
+									unlink($attachment['tmp_name']);
+				}
 			}
 		}
 		unset($_SESSION['temp_attachments']);
@@ -1934,24 +2051,24 @@ 
 		);
 
 		call_integration_hook('integrate_poll_add_edit', array($id_poll, false));
+	} else {
+			$id_poll = 0;
 	}
-	else
-		$id_poll = 0;
 
 	// Creating a new topic?
 	$newTopic = empty($_REQUEST['msg']) && empty($topic);
 
 	// Check the icon.
-	if (!isset($_POST['icon']))
-		$_POST['icon'] = 'xx';
-
-	else
+	if (!isset($_POST['icon'])) {
+			$_POST['icon'] = 'xx';
+	} else
 	{
 		$_POST['icon'] = $smcFunc['htmlspecialchars']($_POST['icon']);
 
 		// Need to figure it out if this is a valid icon name.
-		if ((!file_exists($settings['theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')) && (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')))
-			$_POST['icon'] = 'xx';
+		if ((!file_exists($settings['theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')) && (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon'] . '.png'))) {
+					$_POST['icon'] = 'xx';
+		}
 	}
 
 	// Collect all parameters for the creation or modification of a post.
@@ -1992,8 +2109,9 @@ 
 		}
 
 		// This will save some time...
-		if (empty($approve_has_changed))
-			unset($msgOptions['approved']);
+		if (empty($approve_has_changed)) {
+					unset($msgOptions['approved']);
+		}
 
 		modifyPost($msgOptions, $topicOptions, $posterOptions);
 	}
@@ -2002,8 +2120,9 @@ 
 	{
 		createPost($msgOptions, $topicOptions, $posterOptions);
 
-		if (isset($topicOptions['id']))
-			$topic = $topicOptions['id'];
+		if (isset($topicOptions['id'])) {
+					$topic = $topicOptions['id'];
+		}
 	}
 
 	// Assign the previously uploaded attachments to the brand new message.
@@ -2015,8 +2134,9 @@ 
 	}
 
 	// If we had a draft for this, its time to remove it since it was just posted
-	if (!empty($modSettings['drafts_post_enabled']) && !empty($_POST['id_draft']))
-		DeleteDraft($_POST['id_draft']);
+	if (!empty($modSettings['drafts_post_enabled']) && !empty($_POST['id_draft'])) {
+			DeleteDraft($_POST['id_draft']);
+	}
 
 	// Editing or posting an event?
 	if (isset($_POST['calendar']) && (!isset($_REQUEST['eventid']) || $_REQUEST['eventid'] == -1))
@@ -2036,8 +2156,7 @@ 
 			'span' => isset($_POST['span']) && $_POST['span'] > 0 ? min((int) $modSettings['cal_maxspan'], (int) $_POST['span'] - 1) : 0,
 		);
 		insertEvent($eventOptions);
-	}
-	elseif (isset($_POST['calendar']))
+	} elseif (isset($_POST['calendar']))
 	{
 		$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
 
@@ -2065,14 +2184,15 @@ 
 		}
 
 		// Delete it?
-		if (isset($_REQUEST['deleteevent']))
-			$smcFunc['db_query']('', '
+		if (isset($_REQUEST['deleteevent'])) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}calendar
 				WHERE id_event = {int:id_event}',
 				array(
 					'id_event' => $_REQUEST['eventid'],
 				)
 			);
+		}
 		// ... or just update it?
 		else
 		{
@@ -2116,9 +2236,8 @@ 
 			array($user_info['id'], $topic, 0),
 			array('id_member', 'id_topic', 'id_board')
 		);
-	}
-	elseif (!$newTopic)
-		$smcFunc['db_query']('', '
+	} elseif (!$newTopic) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_notify
 			WHERE id_member = {int:current_member}
 				AND id_topic = {int:current_topic}',
@@ -2127,16 +2246,20 @@ 
 				'current_topic' => $topic,
 			)
 		);
+	}
 
 	// Log an act of moderation - modifying.
-	if (!empty($moderationAction))
-		logAction('modify', array('topic' => $topic, 'message' => (int) $_REQUEST['msg'], 'member' => $row['id_member'], 'board' => $board));
+	if (!empty($moderationAction)) {
+			logAction('modify', array('topic' => $topic, 'message' => (int) $_REQUEST['msg'], 'member' => $row['id_member'], 'board' => $board));
+	}
 
-	if (isset($_POST['lock']) && $_POST['lock'] != 2)
-		logAction(empty($_POST['lock']) ? 'unlock' : 'lock', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+	if (isset($_POST['lock']) && $_POST['lock'] != 2) {
+			logAction(empty($_POST['lock']) ? 'unlock' : 'lock', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+	}
 
-	if (isset($_POST['sticky']))
-		logAction(empty($_POST['sticky']) ? 'unsticky' : 'sticky', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+	if (isset($_POST['sticky'])) {
+			logAction(empty($_POST['sticky']) ? 'unsticky' : 'sticky', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+	}
 
 	// Returning to the topic?
 	if (!empty($_REQUEST['goback']))
@@ -2155,26 +2278,31 @@ 
 		);
 	}
 
-	if ($board_info['num_topics'] == 0)
-		cache_put_data('board-' . $board, null, 120);
+	if ($board_info['num_topics'] == 0) {
+			cache_put_data('board-' . $board, null, 120);
+	}
 
 	call_integration_hook('integrate_post2_end');
 
-	if (!empty($_POST['announce_topic']))
-		redirectexit('action=announce;sa=selectgroup;topic=' . $topic . (!empty($_POST['move']) && allowedTo('move_any') ? ';move' : '') . (empty($_REQUEST['goback']) ? '' : ';goback'));
+	if (!empty($_POST['announce_topic'])) {
+			redirectexit('action=announce;sa=selectgroup;topic=' . $topic . (!empty($_POST['move']) && allowedTo('move_any') ? ';move' : '') . (empty($_REQUEST['goback']) ? '' : ';goback'));
+	}
 
-	if (!empty($_POST['move']) && allowedTo('move_any'))
-		redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
+	if (!empty($_POST['move']) && allowedTo('move_any')) {
+			redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
+	}
 
 	// Return to post if the mod is on.
-	if (isset($_REQUEST['msg']) && !empty($_REQUEST['goback']))
-		redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg'], isBrowser('ie'));
-	elseif (!empty($_REQUEST['goback']))
-		redirectexit('topic=' . $topic . '.new#new', isBrowser('ie'));
+	if (isset($_REQUEST['msg']) && !empty($_REQUEST['goback'])) {
+			redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg'], isBrowser('ie'));
+	} elseif (!empty($_REQUEST['goback'])) {
+			redirectexit('topic=' . $topic . '.new#new', isBrowser('ie'));
+	}
 	// Dut-dut-duh-duh-DUH-duh-dut-duh-duh!  *dances to the Final Fantasy Fanfare...*
-	else
-		redirectexit('board=' . $board . '.0');
-}
+	else {
+			redirectexit('board=' . $board . '.0');
+	}
+	}
 
 /**
  * Handle the announce topic function (action=announce).
@@ -2192,8 +2320,9 @@ 
 
 	validateSession();
 
-	if (empty($topic))
-		fatal_lang_error('topic_gone', false);
+	if (empty($topic)) {
+			fatal_lang_error('topic_gone', false);
+	}
 
 	loadLanguage('Post');
 	loadTemplate('Post');
@@ -2220,8 +2349,9 @@ 
 	global $txt, $context, $topic, $board, $board_info, $smcFunc;
 
 	$groups = array_merge($board_info['groups'], array(1));
-	foreach ($groups as $id => $group)
-		$groups[$id] = (int) $group;
+	foreach ($groups as $id => $group) {
+			$groups[$id] = (int) $group;
+	}
 
 	$context['groups'] = array();
 	if (in_array(0, $groups))
@@ -2264,8 +2394,9 @@ 
 			'group_list' => $groups,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['groups'][$row['id_group']]['name'] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['groups'][$row['id_group']]['name'] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get the subject of the topic we're about to announce.
@@ -2307,16 +2438,19 @@ 
 	$context['start'] = empty($_REQUEST['start']) ? 0 : (int) $_REQUEST['start'];
 	$groups = array_merge($board_info['groups'], array(1));
 
-	if (isset($_POST['membergroups']))
-		$_POST['who'] = explode(',', $_POST['membergroups']);
+	if (isset($_POST['membergroups'])) {
+			$_POST['who'] = explode(',', $_POST['membergroups']);
+	}
 
 	// Check whether at least one membergroup was selected.
-	if (empty($_POST['who']))
-		fatal_lang_error('no_membergroup_selected');
+	if (empty($_POST['who'])) {
+			fatal_lang_error('no_membergroup_selected');
+	}
 
 	// Make sure all membergroups are integers and can access the board of the announcement.
-	foreach ($_POST['who'] as $id => $mg)
-		$_POST['who'][$id] = in_array((int) $mg, $groups) ? (int) $mg : 0;
+	foreach ($_POST['who'] as $id => $mg) {
+			$_POST['who'][$id] = in_array((int) $mg, $groups) ? (int) $mg : 0;
+	}
 
 	// Get the topic subject and censor it.
 	$request = $smcFunc['db_query']('', '
@@ -2362,12 +2496,13 @@ 
 	if ($smcFunc['db_num_rows']($request) == 0)
 	{
 		logAction('announce_topic', array('topic' => $topic), 'user');
-		if (!empty($_REQUEST['move']) && allowedTo('move_any'))
-			redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
-		elseif (!empty($_REQUEST['goback']))
-			redirectexit('topic=' . $topic . '.new;boardseen#new', isBrowser('ie'));
-		else
-			redirectexit('board=' . $board . '.0');
+		if (!empty($_REQUEST['move']) && allowedTo('move_any')) {
+					redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
+		} elseif (!empty($_REQUEST['goback'])) {
+					redirectexit('topic=' . $topic . '.new;boardseen#new', isBrowser('ie'));
+		} else {
+					redirectexit('board=' . $board . '.0');
+		}
 	}
 
 	$announcements = array();
@@ -2386,8 +2521,9 @@ 
 	foreach ($rows as $row)
 	{
 		// Force them to have it?
-		if (empty($prefs[$row['id_member']]['announcements']))
-			continue;
+		if (empty($prefs[$row['id_member']]['announcements'])) {
+					continue;
+		}
 
 		$cur_language = empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile'];
 
@@ -2415,8 +2551,9 @@ 
 	}
 
 	// For each language send a different mail - low priority...
-	foreach ($announcements as $lang => $mail)
-		sendmail($mail['recipients'], $mail['subject'], $mail['body'], null, 'ann-' . $lang, $mail['is_html'], 5);
+	foreach ($announcements as $lang => $mail) {
+			sendmail($mail['recipients'], $mail['subject'], $mail['body'], null, 'ann-' . $lang, $mail['is_html'], 5);
+	}
 
 	$context['percentage_done'] = round(100 * $context['start'] / $modSettings['latestMember'], 1);
 
@@ -2426,9 +2563,10 @@ 
 	$context['sub_template'] = 'announcement_send';
 
 	// Go back to the correct language for the user ;).
-	if (!empty($modSettings['userLanguage']))
-		loadLanguage('Post');
-}
+	if (!empty($modSettings['userLanguage'])) {
+			loadLanguage('Post');
+	}
+	}
 
 /**
  * Get the topic for display purposes.
@@ -2441,12 +2579,13 @@ 
 {
 	global $topic, $modSettings, $context, $smcFunc, $counter, $options;
 
-	if (isset($_REQUEST['xml']))
-		$limit = '
+	if (isset($_REQUEST['xml'])) {
+			$limit = '
 		LIMIT ' . (empty($context['new_replies']) ? '0' : $context['new_replies']);
-	else
-		$limit = empty($modSettings['topicSummaryPosts']) ? '' : '
+	} else {
+			$limit = empty($modSettings['topicSummaryPosts']) ? '' : '
 		LIMIT ' . (int) $modSettings['topicSummaryPosts'];
+	}
 
 	// If you're modifying, get only those posts before the current one. (otherwise get all.)
 	$request = $smcFunc['db_query']('', '
@@ -2484,8 +2623,9 @@ 
 			'is_ignored' => !empty($modSettings['enable_buddylist']) && !empty($options['posts_apply_ignore_list']) && in_array($row['id_member'], $context['user']['ignoreusers']),
 		);
 
-		if (!empty($context['new_replies']))
-			$context['new_replies']--;
+		if (!empty($context['new_replies'])) {
+					$context['new_replies']--;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 }
@@ -2502,8 +2642,9 @@ 
 	global $sourcedir, $smcFunc;
 
 	loadLanguage('Post');
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('Post');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('Post');
+	}
 
 	include_once($sourcedir . '/Subs-Post.php');
 
@@ -2534,8 +2675,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	$context['sub_template'] = 'quotefast';
-	if (!empty($row))
-		$can_view_post = $row['approved'] || ($row['id_member'] != 0 && $row['id_member'] == $user_info['id']) || allowedTo('approve_posts', $row['id_board']);
+	if (!empty($row)) {
+			$can_view_post = $row['approved'] || ($row['id_member'] != 0 && $row['id_member'] == $user_info['id']) || allowedTo('approve_posts', $row['id_board']);
+	}
 
 	if (!empty($can_view_post))
 	{
@@ -2568,8 +2710,9 @@ 
 		}
 
 		// Remove any nested quotes.
-		if (!empty($modSettings['removeNestedQuotes']))
-			$row['body'] = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $row['body']);
+		if (!empty($modSettings['removeNestedQuotes'])) {
+					$row['body'] = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $row['body']);
+		}
 
 		$lb = "\n";
 
@@ -2595,14 +2738,14 @@ 
 				'time' => '',
 			),
 		);
-	}
-	else
-		$context['quote'] = array(
+	} else {
+			$context['quote'] = array(
 			'xml' => '',
 			'mozilla' => '',
 			'text' => '',
 		);
-}
+	}
+	}
 
 /**
  * Used to edit the body or subject of a message inline
@@ -2614,8 +2757,9 @@ 
 	global $user_info, $context, $smcFunc, $language, $board_info;
 
 	// We have to have a topic!
-	if (empty($topic))
-		obExit(false);
+	if (empty($topic)) {
+			obExit(false);
+	}
 
 	checkSession('get');
 	require_once($sourcedir . '/Subs-Post.php');
@@ -2641,31 +2785,35 @@ 
 			'guest_id' => 0,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board', false);
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
 	// Change either body or subject requires permissions to modify messages.
 	if (isset($_POST['message']) || isset($_POST['subject']) || isset($_REQUEST['icon']))
 	{
-		if (!empty($row['locked']))
-			isAllowedTo('moderate_board');
+		if (!empty($row['locked'])) {
+					isAllowedTo('moderate_board');
+		}
 
 		if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
 		{
-			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
-				fatal_lang_error('modify_post_time_passed', false);
-			elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_own'))
-				isAllowedTo('modify_replies');
-			else
-				isAllowedTo('modify_own');
+			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
+							fatal_lang_error('modify_post_time_passed', false);
+			} elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_own')) {
+							isAllowedTo('modify_replies');
+			} else {
+							isAllowedTo('modify_own');
+			}
 		}
 		// Otherwise, they're locked out; someone who can modify the replies is needed.
-		elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_any'))
-			isAllowedTo('modify_replies');
-		else
-			isAllowedTo('modify_any');
+		elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_any')) {
+					isAllowedTo('modify_replies');
+		} else {
+					isAllowedTo('modify_any');
+		}
 
 		// Only log this action if it wasn't your message.
 		$moderationAction = $row['id_member'] != $user_info['id'];
@@ -2677,10 +2825,10 @@ 
 		$_POST['subject'] = strtr($smcFunc['htmlspecialchars']($_POST['subject']), array("\r" => '', "\n" => '', "\t" => ''));
 
 		// Maximum number of characters.
-		if ($smcFunc['strlen']($_POST['subject']) > 100)
-			$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
-	}
-	elseif (isset($_POST['subject']))
+		if ($smcFunc['strlen']($_POST['subject']) > 100) {
+					$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
+		}
+	} elseif (isset($_POST['subject']))
 	{
 		$post_errors[] = 'no_subject';
 		unset($_POST['subject']);
@@ -2692,13 +2840,11 @@ 
 		{
 			$post_errors[] = 'no_message';
 			unset($_POST['message']);
-		}
-		elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength'])
+		} elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength'])
 		{
 			$post_errors[] = 'long_message';
 			unset($_POST['message']);
-		}
-		else
+		} else
 		{
 			$_POST['message'] = $smcFunc['htmlspecialchars']($_POST['message'], ENT_QUOTES);
 
@@ -2714,31 +2860,34 @@ 
 
 	if (isset($_POST['lock']))
 	{
-		if (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $row['id_member']))
-			unset($_POST['lock']);
-		elseif (!allowedTo('lock_any'))
+		if (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $row['id_member'])) {
+					unset($_POST['lock']);
+		} elseif (!allowedTo('lock_any'))
 		{
-			if ($row['locked'] == 1)
-				unset($_POST['lock']);
-			else
-				$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+			if ($row['locked'] == 1) {
+							unset($_POST['lock']);
+			} else {
+							$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+			}
+		} elseif (!empty($row['locked']) && !empty($_POST['lock']) || $_POST['lock'] == $row['locked']) {
+					unset($_POST['lock']);
+		} else {
+					$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
 		}
-		elseif (!empty($row['locked']) && !empty($_POST['lock']) || $_POST['lock'] == $row['locked'])
-			unset($_POST['lock']);
-		else
-			$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
 	}
 
-	if (isset($_POST['sticky']) && !allowedTo('make_sticky'))
-		unset($_POST['sticky']);
+	if (isset($_POST['sticky']) && !allowedTo('make_sticky')) {
+			unset($_POST['sticky']);
+	}
 
 	if (isset($_POST['modify_reason']))
 	{
 		$_POST['modify_reason'] = strtr($smcFunc['htmlspecialchars']($_POST['modify_reason']), array("\r" => '', "\n" => '', "\t" => ''));
 
 		// Maximum number of characters.
-		if ($smcFunc['strlen']($_POST['modify_reason']) > 100)
-			$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
+		if ($smcFunc['strlen']($_POST['modify_reason']) > 100) {
+					$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
+		}
 	}
 
 	if (empty($post_errors))
@@ -2775,8 +2924,9 @@ 
 			}
 		}
 		// If nothing was changed there's no need to add an entry to the moderation log.
-		else
-			$moderationAction = false;
+		else {
+					$moderationAction = false;
+		}
 
 		modifyPost($msgOptions, $topicOptions, $posterOptions);
 
@@ -2794,9 +2944,9 @@ 
 			// Get the proper (default language) response prefix first.
 			if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 			{
-				if ($language === $user_info['language'])
-					$context['response_prefix'] = $txt['response_prefix'];
-				else
+				if ($language === $user_info['language']) {
+									$context['response_prefix'] = $txt['response_prefix'];
+				} else
 				{
 					loadLanguage('index', $language, false);
 					$context['response_prefix'] = $txt['response_prefix'];
@@ -2818,8 +2968,9 @@ 
 			);
 		}
 
-		if (!empty($moderationAction))
-			logAction('modify', array('topic' => $topic, 'message' => $row['id_msg'], 'member' => $row['id_member'], 'board' => $board));
+		if (!empty($moderationAction)) {
+					logAction('modify', array('topic' => $topic, 'message' => $row['id_msg'], 'member' => $row['id_member'], 'board' => $board));
+		}
 	}
 
 	if (isset($_REQUEST['xml']))
@@ -2860,8 +3011,7 @@ 
 			);
 
 			censorText($context['message']['subject']);
-		}
-		else
+		} else
 		{
 			$context['message'] = array(
 				'id' => $row['id_msg'],
@@ -2873,15 +3023,16 @@ 
 			loadLanguage('Errors');
 			foreach ($post_errors as $post_error)
 			{
-				if ($post_error == 'long_message')
-					$context['message']['errors'][] = sprintf($txt['error_' . $post_error], $modSettings['max_messageLength']);
-				else
-					$context['message']['errors'][] = $txt['error_' . $post_error];
+				if ($post_error == 'long_message') {
+									$context['message']['errors'][] = sprintf($txt['error_' . $post_error], $modSettings['max_messageLength']);
+				} else {
+									$context['message']['errors'][] = $txt['error_' . $post_error];
+				}
 			}
 		}
+	} else {
+			obExit(false);
+	}
 	}
-	else
-		obExit(false);
-}
 
 ?>
\ No newline at end of file

Sources/Memberlist.php

Spacing +3 added lines, -3 removed lines

@@ -510,7 +510,7 @@ 
 				LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:regular_id_group} THEN mem.id_post_group ELSE mem.id_group END)' .
 				(empty($customJoin) ? '' : implode('
 				', $customJoin)) . '
-			WHERE (' . implode( ' ' . $query . ' OR ', $fields) . ' ' . $query . ')
+			WHERE (' . implode(' ' . $query . ' OR ', $fields) . ' ' . $query . ')
 				AND mem.is_activated = {int:is_activated}',
 			$query_parameters
 		);
@@ -527,7 +527,7 @@ 
 				LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:regular_id_group} THEN mem.id_post_group ELSE mem.id_group END)' .
 				(empty($customJoin) ? '' : implode('
 				', $customJoin)) . '
-			WHERE (' . implode( ' ' . $query . ' OR ', $fields) . ' ' . $query . ')
+			WHERE (' . implode(' ' . $query . ' OR ', $fields) . ' ' . $query . ')
 				AND mem.is_activated = {int:is_activated}
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
@@ -700,7 +700,7 @@ 
 				'up' => 't' . $row['col_name'] . '.value ASC'
 			);
 
-		$cpf['join'][$row['col_name']] = 'LEFT JOIN {db_prefix}themes AS t' .  $row['col_name'] . ' ON (t' .  $row['col_name'] . '.variable = {literal:' .  $row['col_name'] . '} AND t' .  $row['col_name'] . '.id_theme = 1 AND t' .  $row['col_name'] . '.id_member = mem.id_member)';
+		$cpf['join'][$row['col_name']] = 'LEFT JOIN {db_prefix}themes AS t' . $row['col_name'] . ' ON (t' . $row['col_name'] . '.variable = {literal:' . $row['col_name'] . '} AND t' . $row['col_name'] . '.id_theme = 1 AND t' . $row['col_name'] . '.id_member = mem.id_member)';
 	}
 	$smcFunc['db_free_result']($request);
 

Braces +78 added lines, -61 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Shows a listing of registered members.
@@ -110,8 +111,9 @@ 
 
 	$context['custom_profile_fields'] = getCustFieldsMList();
 
-	if (!empty($context['custom_profile_fields']['columns']))
-		$context['columns'] += $context['custom_profile_fields']['columns'];
+	if (!empty($context['custom_profile_fields']['columns'])) {
+			$context['columns'] += $context['custom_profile_fields']['columns'];
+	}
 
 	$context['colspan'] = 0;
 	$context['disabled_fields'] = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array();
@@ -147,12 +149,12 @@ 
 	call_integration_hook('integrate_memberlist_buttons');
 
 	// Jump to the sub action.
-	if (isset($subActions[$context['listing_by']]))
-		call_helper($subActions[$context['listing_by']][1]);
-
-	else
-		call_helper($subActions['all'][1]);
-}
+	if (isset($subActions[$context['listing_by']])) {
+			call_helper($subActions[$context['listing_by']][1]);
+	} else {
+			call_helper($subActions['all'][1]);
+	}
+	}
 
 /**
  * List all members, page by page, with sorting.
@@ -177,8 +179,9 @@ 
 	if ($use_cache)
 	{
 		// Maybe there's something cached already.
-		if (!empty($modSettings['memberlist_cache']))
-			$memberlist_cache = smf_json_decode($modSettings['memberlist_cache'], true);
+		if (!empty($modSettings['memberlist_cache'])) {
+					$memberlist_cache = smf_json_decode($modSettings['memberlist_cache'], true);
+		}
 
 		// The chunk size for the cached index.
 		$cache_step_size = 500;
@@ -234,13 +237,15 @@ 
 	}
 
 	// Set defaults for sort (real_name) and start. (0)
-	if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']]))
-		$_REQUEST['sort'] = 'real_name';
+	if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) {
+			$_REQUEST['sort'] = 'real_name';
+	}
 
 	if (!is_numeric($_REQUEST['start']))
 	{
-		if (preg_match('~^[^\'\\\\/]~' . ($context['utf8'] ? 'u' : ''), $smcFunc['strtolower']($_REQUEST['start']), $match) === 0)
-			fatal_error('Hacker?', false);
+		if (preg_match('~^[^\'\\\\/]~' . ($context['utf8'] ? 'u' : ''), $smcFunc['strtolower']($_REQUEST['start']), $match) === 0) {
+					fatal_error('Hacker?', false);
+		}
 
 		$_REQUEST['start'] = $match[0];
 
@@ -259,16 +264,18 @@ 
 	}
 
 	$context['letter_links'] = '';
-	for ($i = 97; $i < 123; $i++)
-		$context['letter_links'] .= '<a href="' . $scripturl . '?action=mlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . strtoupper(chr($i)) . '</a> ';
+	for ($i = 97; $i < 123; $i++) {
+			$context['letter_links'] .= '<a href="' . $scripturl . '?action=mlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . strtoupper(chr($i)) . '</a> ';
+	}
 
 	// Sort out the column information.
 	foreach ($context['columns'] as $col => $column_details)
 	{
 		$context['columns'][$col]['href'] = $scripturl . '?action=mlist;sort=' . $col . ';start=0';
 
-		if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev'])))
-			$context['columns'][$col]['href'] .= ';desc';
+		if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) {
+					$context['columns'][$col]['href'] .= ';desc';
+		}
 
 		$context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>';
 		$context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col;
@@ -317,8 +324,9 @@ 
 	elseif ($use_cache && $_REQUEST['sort'] === 'real_name')
 	{
 		$first_offset = floor(($memberlist_cache['num_members'] - $modSettings['defaultMaxMembers'] - $_REQUEST['start']) / $cache_step_size) * $cache_step_size;
-		if ($first_offset < 0)
-			$first_offset = 0;
+		if ($first_offset < 0) {
+					$first_offset = 0;
+		}
 		$second_offset = ceil(($memberlist_cache['num_members'] - $_REQUEST['start']) / $cache_step_size) * $cache_step_size;
 
 		$where = 'mem.real_name BETWEEN {string:real_name_low} AND {string:real_name_high}';
@@ -395,12 +403,13 @@ 
 		)
 	);
 	$context['custom_search_fields'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['custom_search_fields'][$row['col_name']] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['custom_search_fields'][$row['col_name']] = array(
 			'colname' => $row['col_name'],
 			'name' => $row['field_name'],
 			'desc' => $row['field_desc'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// They're searching..
@@ -413,23 +422,27 @@ 
 		$context['old_search_value'] = urlencode($_REQUEST['search']);
 
 		// No fields?  Use default...
-		if (empty($_POST['fields']))
-			$_POST['fields'] = array('name');
+		if (empty($_POST['fields'])) {
+					$_POST['fields'] = array('name');
+		}
 
 		// Set defaults for how the results are sorted
-		if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']]))
-			$_REQUEST['sort'] = 'real_name';
+		if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) {
+					$_REQUEST['sort'] = 'real_name';
+		}
 
 		// Build the column link / sort information.
 		foreach ($context['columns'] as $col => $column_details)
 		{
 			$context['columns'][$col]['href'] = $scripturl . '?action=mlist;sa=search;start=0;sort=' . $col;
 
-			if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev'])))
-				$context['columns'][$col]['href'] .= ';desc';
+			if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) {
+							$context['columns'][$col]['href'] .= ';desc';
+			}
 
-			if (isset($_POST['search']) && isset($_POST['fields']))
-				$context['columns'][$col]['href'] .= ';search=' . $_POST['search'] . ';fields=' . implode(',', $_POST['fields']);
+			if (isset($_POST['search']) && isset($_POST['fields'])) {
+							$context['columns'][$col]['href'] .= ';search=' . $_POST['search'] . ';fields=' . implode(',', $_POST['fields']);
+			}
 
 			$context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>';
 			$context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col;
@@ -452,8 +465,7 @@ 
 		{
 			$fields = allowedTo('moderate_forum') ? array('member_name', 'real_name') : array('real_name');
 			$search_fields[] = 'name';
-		}
-		else
+		} else
 		{
 			$fields = array();
 			$search_fields = array();
@@ -478,9 +490,10 @@ 
 			$search_fields[] = 'email';
 		}
 
-		if ($smcFunc['db_case_sensitive'])
-			foreach ($fields as $key => $field)
+		if ($smcFunc['db_case_sensitive']) {
+					foreach ($fields as $key => $field)
 				$fields[$key] = 'LOWER(' . $field . ')';
+		}
 
 		$customJoin = array();
 		$customCount = 10;
@@ -499,8 +512,9 @@ 
 		}
 
 		// No search fields? That means you're trying to hack things
-		if (empty($search_fields))
-			fatal_lang_error('invalid_search_string', false);
+		if (empty($search_fields)) {
+					fatal_lang_error('invalid_search_string', false);
+		}
 
 		$query = $_POST['search'] == '' ? '= {string:blank_string}' : ($smcFunc['db_case_sensitive'] ? 'LIKE LOWER({string:search})' : 'LIKE {string:search}');
 
@@ -538,8 +552,7 @@ 
 		);
 		printMemberListRows($request);
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		// These are all the possible fields.
 		$context['search_fields'] = array(
@@ -554,14 +567,14 @@ 
 		{
 			unset($context['search_fields']['email']);
 			$context['search_defaults'] = array('name');
-		}
-		else
+		} else
 		{
 			$context['search_defaults'] = array('name', 'email');
 		}
 
-		foreach ($context['custom_search_fields'] as $field)
-			$context['search_fields']['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']);
+		foreach ($context['custom_search_fields'] as $field) {
+					$context['search_fields']['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']);
+		}
 
 		$context['sub_template'] = 'search';
 		$context['old_search'] = isset($_GET['search']) ? $_GET['search'] : (isset($_POST['search']) ? $smcFunc['htmlspecialchars']($_POST['search']) : '');
@@ -603,12 +616,14 @@ 
 	$smcFunc['db_free_result']($result);
 
 	// Avoid division by zero...
-	if ($most_posts == 0)
-		$most_posts = 1;
+	if ($most_posts == 0) {
+			$most_posts = 1;
+	}
 
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[] = $row['id_member'];
+	}
 
 	// Load all the members for display.
 	loadMemberData($members);
@@ -616,8 +631,9 @@ 
 	$context['members'] = array();
 	foreach ($members as $member)
 	{
-		if (!loadMemberContext($member))
-			continue;
+		if (!loadMemberContext($member)) {
+					continue;
+		}
 
 		$context['members'][$member] = $memberContext[$member];
 		$context['members'][$member]['post_percent'] = round(($context['members'][$member]['real_posts'] * 100) / $most_posts);
@@ -634,20 +650,21 @@ 
 					continue;
 				}
 
-				if ($column['bbc'] && !empty($context['members'][$member]['options'][$key]))
-					$context['members'][$member]['options'][$key] = strip_tags(parse_bbc($context['members'][$member]['options'][$key]));
-
-				elseif ($column['type'] == 'check')
-					$context['members'][$member]['options'][$key] = $context['members'][$member]['options'][$key] == 0 ? $txt['no'] : $txt['yes'];
+				if ($column['bbc'] && !empty($context['members'][$member]['options'][$key])) {
+									$context['members'][$member]['options'][$key] = strip_tags(parse_bbc($context['members'][$member]['options'][$key]));
+				} elseif ($column['type'] == 'check') {
+									$context['members'][$member]['options'][$key] = $context['members'][$member]['options'][$key] == 0 ? $txt['no'] : $txt['yes'];
+				}
 
 				// Enclosing the user input within some other text?
-				if (!empty($column['enclose']))
-					$context['members'][$member]['options'][$key] = strtr($column['enclose'], array(
+				if (!empty($column['enclose'])) {
+									$context['members'][$member]['options'][$key] = strtr($column['enclose'], array(
 						'{SCRIPTURL}' => $scripturl,
 						'{IMAGES_URL}' => $settings['images_url'],
 						'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 						'{INPUT}' => $context['members'][$member]['options'][$key],
 					));
+				}
 			}
 		}
 	}
@@ -688,17 +705,17 @@ 
 		);
 
 		// Get the right sort method depending on the cust field type.
-		if ($row['field_type'] != 'check')
-			$cpf['columns'][$row['col_name']]['sort'] = array(
+		if ($row['field_type'] != 'check') {
+					$cpf['columns'][$row['col_name']]['sort'] = array(
 				'down' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 ASC, COALESCE(t' . $row['col_name'] . '.value, "") DESC',
 				'up' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 DESC, COALESCE(t' . $row['col_name'] . '.value, "") ASC'
 			);
-
-		else
-			$cpf['columns'][$row['col_name']]['sort'] = array(
+		} else {
+					$cpf['columns'][$row['col_name']]['sort'] = array(
 				'down' => 't' . $row['col_name'] . '.value DESC',
 				'up' => 't' . $row['col_name'] . '.value ASC'
 			);
+		}
 
 		$cpf['join'][$row['col_name']] = 'LEFT JOIN {db_prefix}themes AS t' .  $row['col_name'] . ' ON (t' .  $row['col_name'] . '.variable = {literal:' .  $row['col_name'] . '} AND t' .  $row['col_name'] . '.id_theme = 1 AND t' .  $row['col_name'] . '.id_member = mem.id_member)';
 	}

Sources/ManageSearch.php

Spacing +6 added lines, -6 removed lines

@@ -231,7 +231,7 @@ 
 				)
 			);
 
-			$request = $smcFunc['db_query']('','
+			$request = $smcFunc['db_query']('', '
 				SHOW default_text_search_config',
 				array()
 			);
@@ -426,8 +426,8 @@ 
 			WHERE t.schemaname= {string:schema} and (
 				indexname = {string:messages_ftx} OR indexname = {string:log_search_words} )',
 			array(
-				'messages_ftx' => $db_prefix. 'messages_ftx',
-				'log_search_words' => $db_prefix. 'log_search_words',
+				'messages_ftx' => $db_prefix . 'messages_ftx',
+				'log_search_words' => $db_prefix . 'log_search_words',
 				'schema' => 'public',
 			)
 		);
@@ -442,7 +442,7 @@ 
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['fulltext_length'] = (int) $row['index_size'];
 				}
-				elseif ($row['indexname'] == $db_prefix. 'log_search_words')
+				elseif ($row['indexname'] == $db_prefix . 'log_search_words')
 				{
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['custom_index_length'] = (int) $row['index_size'];
@@ -799,7 +799,7 @@ 
 	// We need this for db_get_version
 	db_extend();
 
-	if ($smcFunc['db_title'] == 'PostgreSQL'){
+	if ($smcFunc['db_title'] == 'PostgreSQL') {
 		$request = $smcFunc['db_query']('', '
 			SELECT
 				indexname
@@ -814,7 +814,7 @@ 
 			WHERE t.schemaname= {string:schema} and indexname = {string:messages_ftx}',
 			array(
 				'schema' => 'public',
-				'messages_ftx' => $db_prefix.'messages_ftx',
+				'messages_ftx' => $db_prefix . 'messages_ftx',
 			)
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))

Braces +109 added lines, -90 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Main entry point for the admin search settings screen.
@@ -107,11 +108,13 @@ 
 	// Perhaps the search method wants to add some settings?
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'searchSettings')))
-		call_user_func_array(array($searchAPI, 'searchSettings'), array(&$config_vars));
+	if (is_callable(array($searchAPI, 'searchSettings'))) {
+			call_user_func_array(array($searchAPI, 'searchSettings'), array(&$config_vars));
+	}
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['page_title'] = $txt['search_settings_title'];
 	$context['sub_template'] = 'show_settings';
@@ -126,8 +129,9 @@ 
 
 		call_integration_hook('integrate_save_search_settings');
 
-		if (empty($_POST['search_results_per_page']))
-			$_POST['search_results_per_page'] = !empty($modSettings['search_results_per_page']) ? $modSettings['search_results_per_page'] : $modSettings['defaultMaxMessages'];
+		if (empty($_POST['search_results_per_page'])) {
+					$_POST['search_results_per_page'] = !empty($modSettings['search_results_per_page']) ? $modSettings['search_results_per_page'] : $modSettings['defaultMaxMessages'];
+		}
 		saveDBSettings($config_vars);
 		$_SESSION['adm-save'] = true;
 		redirectexit('action=admin;area=managesearch;sa=settings;' . $context['session_var'] . '=' . $context['session_id']);
@@ -177,17 +181,20 @@ 
 		call_integration_hook('integrate_save_search_weights');
 
 		$changes = array();
-		foreach ($factors as $factor)
-			$changes[$factor] = (int) $_POST[$factor];
+		foreach ($factors as $factor) {
+					$changes[$factor] = (int) $_POST[$factor];
+		}
 		updateSettings($changes);
 	}
 
 	$context['relative_weights'] = array('total' => 0);
-	foreach ($factors as $factor)
-		$context['relative_weights']['total'] += isset($modSettings[$factor]) ? $modSettings[$factor] : 0;
+	foreach ($factors as $factor) {
+			$context['relative_weights']['total'] += isset($modSettings[$factor]) ? $modSettings[$factor] : 0;
+	}
 
-	foreach ($factors as $factor)
-		$context['relative_weights'][$factor] = round(100 * (isset($modSettings[$factor]) ? $modSettings[$factor] : 0) / $context['relative_weights']['total'], 1);
+	foreach ($factors as $factor) {
+			$context['relative_weights'][$factor] = round(100 * (isset($modSettings[$factor]) ? $modSettings[$factor] : 0) / $context['relative_weights']['total'], 1);
+	}
 
 	createToken('admin-msw');
 }
@@ -215,8 +222,9 @@ 
 	$context['search_apis'] = loadSearchAPIs();
 
 	// Detect whether a fulltext index is set.
-	if ($context['supports_fulltext'])
-		detectFulltextIndex();
+	if ($context['supports_fulltext']) {
+			detectFulltextIndex();
+	}
 
 	if (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'createfulltext')
 	{
@@ -250,8 +258,7 @@ 
 					'language' => $language_ftx
 				)
 			);
-		}
-		else
+		} else
 		{
 			// Make sure it's gone before creating it.
 			$smcFunc['db_query']('', '
@@ -271,8 +278,7 @@ 
 		}
 
 		$context['fulltext_index'] = 'body';
-	}
-	elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removefulltext' && !empty($context['fulltext_index']))
+	} elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removefulltext' && !empty($context['fulltext_index']))
 	{
 		checkSession('get');
 		validateToken('admin-msm', 'get');
@@ -289,12 +295,12 @@ 
 		$context['fulltext_index'] = '';
 
 		// Go back to the default search method.
-		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext')
-			updateSettings(array(
+		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext') {
+					updateSettings(array(
 				'search_index' => '',
 			));
-	}
-	elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removecustom')
+		}
+	} elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removecustom')
 	{
 		checkSession('get');
 		validateToken('admin-msm', 'get');
@@ -316,12 +322,12 @@ 
 		));
 
 		// Go back to the default search method.
-		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom')
-			updateSettings(array(
+		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom') {
+					updateSettings(array(
 				'search_index' => '',
 			));
-	}
-	elseif (isset($_POST['save']))
+		}
+	} elseif (isset($_POST['save']))
 	{
 		checkSession();
 		validateToken('admin-msmpost');
@@ -343,8 +349,8 @@ 
 	// Get some info about the messages table, to show its size and index size.
 	if ($db_type == 'mysql' || $db_type == 'mysqli')
 	{
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				FROM {string:database_name}
 				LIKE {string:table_name}',
@@ -353,14 +359,15 @@ 
 					'table_name' => str_replace('_', '\_', $match[2]) . 'messages',
 				)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				LIKE {string:table_name}',
 				array(
 					'table_name' => str_replace('_', '\_', $db_prefix) . 'messages',
 				)
 			);
+		}
 		if ($request !== false && $smcFunc['db_num_rows']($request) == 1)
 		{
 			// Only do this if the user has permission to execute this query.
@@ -372,8 +379,8 @@ 
 		}
 
 		// Now check the custom index table, if it exists at all.
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				FROM {string:database_name}
 				LIKE {string:table_name}',
@@ -382,14 +389,15 @@ 
 					'table_name' => str_replace('_', '\_', $match[2]) . 'log_search_words',
 				)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				LIKE {string:table_name}',
 				array(
 					'table_name' => str_replace('_', '\_', $db_prefix) . 'log_search_words',
 				)
 			);
+		}
 		if ($request !== false && $smcFunc['db_num_rows']($request) == 1)
 		{
 			// Only do this if the user has permission to execute this query.
@@ -398,8 +406,7 @@ 
 			$context['table_info']['custom_index_length'] = $row['Data_length'] + $row['Index_length'];
 			$smcFunc['db_free_result']($request);
 		}
-	}
-	elseif ($db_type == 'postgresql')
+	} elseif ($db_type == 'postgresql')
 	{
 		// In order to report the sizes correctly we need to perform vacuum (optimize) on the tables we will be using.
 		//db_extend();
@@ -441,38 +448,38 @@ 
 					$context['table_info']['data_length'] = (int) $row['table_size'];
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['fulltext_length'] = (int) $row['index_size'];
-				}
-				elseif ($row['indexname'] == $db_prefix. 'log_search_words')
+				} elseif ($row['indexname'] == $db_prefix. 'log_search_words')
 				{
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['custom_index_length'] = (int) $row['index_size'];
 				}
 			}
 			$smcFunc['db_free_result']($request);
-		}
-		else
-			// Didn't work for some reason...
+		} else {
+					// Didn't work for some reason...
 			$context['table_info'] = array(
 				'data_length' => $txt['not_applicable'],
 				'index_length' => $txt['not_applicable'],
 				'fulltext_length' => $txt['not_applicable'],
 				'custom_index_length' => $txt['not_applicable'],
 			);
-	}
-	else
-		$context['table_info'] = array(
+		}
+	} else {
+			$context['table_info'] = array(
 			'data_length' => $txt['not_applicable'],
 			'index_length' => $txt['not_applicable'],
 			'fulltext_length' => $txt['not_applicable'],
 			'custom_index_length' => $txt['not_applicable'],
 		);
+	}
 
 	// Format the data and index length in kilobytes.
 	foreach ($context['table_info'] as $type => $size)
 	{
 		// If it's not numeric then just break.  This database engine doesn't support size.
-		if (!is_numeric($size))
-			break;
+		if (!is_numeric($size)) {
+					break;
+		}
 
 		$context['table_info'][$type] = comma_format($context['table_info'][$type] / 1024) . ' ' . $txt['search_method_kilobytes'];
 	}
@@ -501,8 +508,9 @@ 
 
 	// Scotty, we 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();
+	}
 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'method';
 	$context['page_title'] = $txt['search_index_custom'];
@@ -532,8 +540,7 @@ 
 		$context['start'] = (int) $context['index_settings']['resume_at'];
 		unset($context['index_settings']['resume_at']);
 		$context['step'] = 1;
-	}
-	else
+	} else
 	{
 		$context['index_settings'] = array(
 			'bytes_per_word' => isset($_REQUEST['bytes_per_word']) && isset($index_properties[$_REQUEST['bytes_per_word']]) ? (int) $_REQUEST['bytes_per_word'] : 2,
@@ -542,12 +549,14 @@ 
 		$context['step'] = isset($_REQUEST['step']) ? (int) $_REQUEST['step'] : 0;
 
 		// admin timeouts are painful when building these long indexes - but only if we actually have such things enabled
-		if (empty($modSettings['securityDisable']) && $_SESSION['admin_time'] + 3300 < time() && $context['step'] >= 1)
-			$_SESSION['admin_time'] = time();
+		if (empty($modSettings['securityDisable']) && $_SESSION['admin_time'] + 3300 < time() && $context['step'] >= 1) {
+					$_SESSION['admin_time'] = time();
+		}
 	}
 
-	if ($context['step'] !== 0)
-		checkSession('request');
+	if ($context['step'] !== 0) {
+			checkSession('request');
+	}
 
 	// Step 0: let the user determine how they like their index.
 	if ($context['step'] === 0)
@@ -576,12 +585,14 @@ 
 			$smcFunc['db_create_word_search']($index_properties[$context['index_settings']['bytes_per_word']]['column_definition']);
 
 			// Temporarily switch back to not using a search index.
-			if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom')
-				updateSettings(array('search_index' => ''));
+			if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom') {
+							updateSettings(array('search_index' => ''));
+			}
 
 			// Don't let simultanious processes be updating the search index.
-			if (!empty($modSettings['search_custom_index_config']))
-				updateSettings(array('search_custom_index_config' => ''));
+			if (!empty($modSettings['search_custom_index_config'])) {
+							updateSettings(array('search_custom_index_config' => ''));
+			}
 		}
 
 		$num_messages = array(
@@ -597,16 +608,16 @@ 
 				'starting_id' => $context['start'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+		}
 
 		if (empty($num_messages['todo']))
 		{
 			$context['step'] = 2;
 			$context['percentage'] = 80;
 			$context['start'] = 0;
-		}
-		else
+		} else
 		{
 			// Number of seconds before the next step.
 			$stop = time() + 3;
@@ -647,21 +658,22 @@ 
 
 				$context['start'] += $forced_break ? $number_processed : $messages_per_batch;
 
-				if (!empty($inserts))
-					$smcFunc['db_insert']('ignore',
+				if (!empty($inserts)) {
+									$smcFunc['db_insert']('ignore',
 						'{db_prefix}log_search_words',
 						array('id_word' => 'int', 'id_msg' => 'int'),
 						$inserts,
 						array('id_word', 'id_msg')
 					);
+				}
 				if ($num_messages['todo'] === 0)
 				{
 					$context['step'] = 2;
 					$context['start'] = 0;
 					break;
+				} else {
+									updateSettings(array('search_custom_index_resume' => json_encode(array_merge($context['index_settings'], array('resume_at' => $context['start'])))));
 				}
-				else
-					updateSettings(array('search_custom_index_resume' => json_encode(array_merge($context['index_settings'], array('resume_at' => $context['start'])))));
 			}
 
 			// Since there are still two steps to go, 80% is the maximum here.
@@ -672,9 +684,9 @@ 
 	// Step 2: removing the words that occur too often and are of no use.
 	elseif ($context['step'] === 2)
 	{
-		if ($context['index_settings']['bytes_per_word'] < 4)
-			$context['step'] = 3;
-		else
+		if ($context['index_settings']['bytes_per_word'] < 4) {
+					$context['step'] = 3;
+		} else
 		{
 			$stop_words = $context['start'] === 0 || empty($modSettings['search_stopwords']) ? array() : explode(',', $modSettings['search_stopwords']);
 			$stop = time() + 3;
@@ -695,20 +707,22 @@ 
 						'minimum_messages' => $max_messages,
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$stop_words[] = $row['id_word'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$stop_words[] = $row['id_word'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				updateSettings(array('search_stopwords' => implode(',', $stop_words)));
 
-				if (!empty($stop_words))
-					$smcFunc['db_query']('', '
+				if (!empty($stop_words)) {
+									$smcFunc['db_query']('', '
 						DELETE FROM {db_prefix}log_search_words
 						WHERE id_word in ({array_int:stop_words})',
 						array(
 							'stop_words' => $stop_words,
 						)
 					);
+				}
 
 				$context['start'] += $index_properties[$context['index_settings']['bytes_per_word']]['step_size'];
 				if ($context['start'] > $index_properties[$context['index_settings']['bytes_per_word']]['max_size'])
@@ -769,8 +783,9 @@ 
 					$searchAPI = new $search_class_name();
 
 					// No Support?  NEXT!
-					if (!$searchAPI->is_supported)
-						continue;
+					if (!$searchAPI->is_supported) {
+											continue;
+					}
 
 					$apis[$index_name] = array(
 						'filename' => $file,
@@ -817,10 +832,10 @@ 
 				'messages_ftx' => $db_prefix.'messages_ftx',
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['fulltext_index'][] = $row['indexname'];
-	}
-	else
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['fulltext_index'][] = $row['indexname'];
+		}
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SHOW INDEX
@@ -831,17 +846,19 @@ 
 		$context['fulltext_index'] = '';
 		if ($request !== false || $smcFunc['db_num_rows']($request) != 0)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-			if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+						if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
 				$context['fulltext_index'][] = $row['Key_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (is_array($context['fulltext_index']))
-				$context['fulltext_index'] = array_unique($context['fulltext_index']);
+			if (is_array($context['fulltext_index'])) {
+							$context['fulltext_index'] = array_unique($context['fulltext_index']);
+			}
 		}
 
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 			SHOW TABLE STATUS
 			FROM {string:database_name}
 			LIKE {string:table_name}',
@@ -850,20 +867,22 @@ 
 				'table_name' => str_replace('_', '\_', $match[2]) . 'messages',
 			)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 			SHOW TABLE STATUS
 			LIKE {string:table_name}',
 			array(
 				'table_name' => str_replace('_', '\_', $db_prefix) . 'messages',
 			)
 			);
+		}
 
 		if ($request !== false)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare($smcFunc['db_get_version'], '5.6.4', '>=')))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+						if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare($smcFunc['db_get_version'], '5.6.4', '>=')))
 				$context['cannot_create_fulltext'] = true;
+			}
 			$smcFunc['db_free_result']($request);
 		}
 	}

Sources/Stats.php

Spacing +1 added lines, -1 removed lines

@@ -555,7 +555,7 @@
 				'subject' => $row_liked_message['subject'],
 				'num' => $row_liked_message['likes'],
 				'href' => $scripturl . '?msg=' . $row_liked_message['id_msg'],
-				'link' => '<a href="' . $scripturl . '?msg=' . $row_liked_message['id_msg'] .'">' . $row_liked_message['subject'] . '</a>'
+				'link' => '<a href="' . $scripturl . '?msg=' . $row_liked_message['id_msg'] . '">' . $row_liked_message['subject'] . '</a>'
 			);
 
 			if ($max_liked_message < $row_liked_message['likes'])

Braces +112 added lines, -78 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Display some useful/interesting board statistics.
@@ -30,8 +31,9 @@ 
 
 	isAllowedTo('view_stats');
 	// Page disabled - redirect them out
-	if (empty($modSettings['trackStats']))
-		fatal_lang_error('feature_disabled', true);
+	if (empty($modSettings['trackStats'])) {
+			fatal_lang_error('feature_disabled', true);
+	}
 
 	if (!empty($_REQUEST['expand']))
 	{
@@ -39,31 +41,34 @@ 
 
 		$month = (int) substr($_REQUEST['expand'], 4);
 		$year = (int) substr($_REQUEST['expand'], 0, 4);
-		if ($year > 1900 && $year < 2200 && $month >= 1 && $month <= 12)
-			$_SESSION['expanded_stats'][$year][] = $month;
-	}
-	elseif (!empty($_REQUEST['collapse']))
+		if ($year > 1900 && $year < 2200 && $month >= 1 && $month <= 12) {
+					$_SESSION['expanded_stats'][$year][] = $month;
+		}
+	} elseif (!empty($_REQUEST['collapse']))
 	{
 		$context['robot_no_index'] = true;
 
 		$month = (int) substr($_REQUEST['collapse'], 4);
 		$year = (int) substr($_REQUEST['collapse'], 0, 4);
-		if (!empty($_SESSION['expanded_stats'][$year]))
-			$_SESSION['expanded_stats'][$year] = array_diff($_SESSION['expanded_stats'][$year], array($month));
+		if (!empty($_SESSION['expanded_stats'][$year])) {
+					$_SESSION['expanded_stats'][$year] = array_diff($_SESSION['expanded_stats'][$year], array($month));
+		}
 	}
 
 	// Handle the XMLHttpRequest.
 	if (isset($_REQUEST['xml']))
 	{
 		// Collapsing stats only needs adjustments of the session variables.
-		if (!empty($_REQUEST['collapse']))
-			obExit(false);
+		if (!empty($_REQUEST['collapse'])) {
+					obExit(false);
+		}
 
 		$context['sub_template'] = 'stats';
 		$context['yearly'] = array();
 
-		if (empty($month) || empty($year))
-			return;
+		if (empty($month) || empty($year)) {
+					return;
+		}
 
 		getDailyStats('YEAR(date) = {int:year} AND MONTH(date) = {int:month}', array('year' => $year, 'month' => $month));
 		$context['yearly'][$year]['months'][$month]['date'] = array(
@@ -220,8 +225,9 @@ 
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
 		);
 
-		if ($max_num_posts < $row_members['posts'])
-			$max_num_posts = $row_members['posts'];
+		if ($max_num_posts < $row_members['posts']) {
+					$max_num_posts = $row_members['posts'];
+		}
 	}
 	$smcFunc['db_free_result']($members_result);
 
@@ -257,8 +263,9 @@ 
 			'link' => '<a href="' . $scripturl . '?board=' . $row_board['id_board'] . '.0">' . $row_board['name'] . '</a>'
 		);
 
-		if ($max_num_posts < $row_board['num_posts'])
-			$max_num_posts = $row_board['num_posts'];
+		if ($max_num_posts < $row_board['num_posts']) {
+					$max_num_posts = $row_board['num_posts'];
+		}
 	}
 	$smcFunc['db_free_result']($boards_result);
 
@@ -284,12 +291,13 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$topic_ids = array();
 	}
-	else
-		$topic_ids = array();
 
 	// Topic replies top 10.
 	$topic_reply_result = $smcFunc['db_query']('', '
@@ -329,8 +337,9 @@ 
 			'link' => '<a href="' . $scripturl . '?topic=' . $row_topic_reply['id_topic'] . '.0">' . $row_topic_reply['subject'] . '</a>'
 		);
 
-		if ($max_num_replies < $row_topic_reply['num_replies'])
-			$max_num_replies = $row_topic_reply['num_replies'];
+		if ($max_num_replies < $row_topic_reply['num_replies']) {
+					$max_num_replies = $row_topic_reply['num_replies'];
+		}
 	}
 	$smcFunc['db_free_result']($topic_reply_result);
 
@@ -354,12 +363,13 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$topic_ids = array();
 	}
-	else
-		$topic_ids = array();
 
 	// Topic views top 10.
 	$topic_view_result = $smcFunc['db_query']('', '
@@ -399,8 +409,9 @@ 
 			'link' => '<a href="' . $scripturl . '?topic=' . $row_topic_views['id_topic'] . '.0">' . $row_topic_views['subject'] . '</a>'
 		);
 
-		if ($max_num < $row_topic_views['num_views'])
-			$max_num = $row_topic_views['num_views'];
+		if ($max_num < $row_topic_views['num_views']) {
+					$max_num = $row_topic_views['num_views'];
+		}
 	}
 	$smcFunc['db_free_result']($topic_view_result);
 
@@ -425,15 +436,17 @@ 
 			)
 		);
 		$members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member_started']] = $row['hits'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member_started']] = $row['hits'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		cache_put_data('stats_top_starters', $members, 360);
 	}
 
-	if (empty($members))
-		$members = array(0 => 0);
+	if (empty($members)) {
+			$members = array(0 => 0);
+	}
 
 	// Topic poster top 10.
 	$members_result = $smcFunc['db_query']('', '
@@ -458,8 +471,9 @@ 
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
 		);
 
-		if ($max_num < $members[$row_members['id_member']])
-			$max_num = $members[$row_members['id_member']];
+		if ($max_num < $members[$row_members['id_member']]) {
+					$max_num = $members[$row_members['id_member']];
+		}
 	}
 	ksort($context['stats_blocks']['starters']);
 	$smcFunc['db_free_result']($members_result);
@@ -488,8 +502,9 @@ 
 	while ($row_members = $smcFunc['db_fetch_assoc']($members_result))
 	{
 		$temp2[] = (int) $row_members['id_member'];
-		if (count($context['stats_blocks']['time_online']) >= 10)
-			continue;
+		if (count($context['stats_blocks']['time_online']) >= 10) {
+					continue;
+		}
 
 		// Figure out the days, hours and minutes.
 		$timeDays = floor($row_members['total_time_logged_in'] / 86400);
@@ -497,10 +512,12 @@ 
 
 		// Figure out which things to show... (days, hours, minutes, etc.)
 		$timelogged = '';
-		if ($timeDays > 0)
-			$timelogged .= $timeDays . $txt['totalTimeLogged5'];
-		if ($timeHours > 0)
-			$timelogged .= $timeHours . $txt['totalTimeLogged6'];
+		if ($timeDays > 0) {
+					$timelogged .= $timeDays . $txt['totalTimeLogged5'];
+		}
+		if ($timeHours > 0) {
+					$timelogged .= $timeHours . $txt['totalTimeLogged6'];
+		}
 		$timelogged .= floor(($row_members['total_time_logged_in'] % 3600) / 60) . $txt['totalTimeLogged7'];
 
 		$context['stats_blocks']['time_online'][] = array(
@@ -512,17 +529,20 @@ 
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
 		);
 
-		if ($max_time_online < $row_members['total_time_logged_in'])
-			$max_time_online = $row_members['total_time_logged_in'];
+		if ($max_time_online < $row_members['total_time_logged_in']) {
+					$max_time_online = $row_members['total_time_logged_in'];
+		}
 	}
 	$smcFunc['db_free_result']($members_result);
 
-	foreach ($context['stats_blocks']['time_online'] as $i => $member)
-		$context['stats_blocks']['time_online'][$i]['percent'] = round(($member['seconds_online'] * 100) / $max_time_online);
+	foreach ($context['stats_blocks']['time_online'] as $i => $member) {
+			$context['stats_blocks']['time_online'][$i]['percent'] = round(($member['seconds_online'] * 100) / $max_time_online);
+	}
 
 	// Cache the ones we found for a bit, just so we don't have to look again.
-	if ($temp !== $temp2)
-		cache_put_data('stats_total_time_members', $temp2, 480);
+	if ($temp !== $temp2) {
+			cache_put_data('stats_total_time_members', $temp2, 480);
+	}
 
 	// Likes.
 	if (!empty($modSettings['enable_likes']))
@@ -558,13 +578,15 @@ 
 				'link' => '<a href="' . $scripturl . '?msg=' . $row_liked_message['id_msg'] .'">' . $row_liked_message['subject'] . '</a>'
 			);
 
-			if ($max_liked_message < $row_liked_message['likes'])
-				$max_liked_message = $row_liked_message['likes'];
+			if ($max_liked_message < $row_liked_message['likes']) {
+							$max_liked_message = $row_liked_message['likes'];
+			}
 		}
 		$smcFunc['db_free_result']($liked_messages);
 
-		foreach ($context['stats_blocks']['liked_messages'] as $i => $liked_messages)
-			$context['stats_blocks']['liked_messages'][$i]['percent'] = round(($liked_messages['num'] * 100) / $max_liked_message);
+		foreach ($context['stats_blocks']['liked_messages'] as $i => $liked_messages) {
+					$context['stats_blocks']['liked_messages'][$i]['percent'] = round(($liked_messages['num'] * 100) / $max_liked_message);
+		}
 
 		// Liked users top 10.
 		$context['stats_blocks']['liked_users'] = array();
@@ -595,14 +617,16 @@ 
 				'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_liked_users['liked_user'] . '">' . $row_liked_users['real_name'] . '</a>',
 			);
 
-			if ($max_liked_users < $row_liked_users['count'])
-				$max_liked_users = $row_liked_users['count'];
+			if ($max_liked_users < $row_liked_users['count']) {
+							$max_liked_users = $row_liked_users['count'];
+			}
 		}
 
 		$smcFunc['db_free_result']($liked_users);
 
-		foreach ($context['stats_blocks']['liked_users'] as $i => $liked_users)
-			$context['stats_blocks']['liked_users'][$i]['percent'] = round(($liked_users['num'] * 100) / $max_liked_users);
+		foreach ($context['stats_blocks']['liked_users'] as $i => $liked_users) {
+					$context['stats_blocks']['liked_users'][$i]['percent'] = round(($liked_users['num'] * 100) / $max_liked_users);
+		}
 	}
 
 	// Activity by month.
@@ -620,8 +644,8 @@ 
 		$ID_MONTH = $row_months['stats_year'] . sprintf('%02d', $row_months['stats_month']);
 		$expanded = !empty($_SESSION['expanded_stats'][$row_months['stats_year']]) && in_array($row_months['stats_month'], $_SESSION['expanded_stats'][$row_months['stats_year']]);
 
-		if (!isset($context['yearly'][$row_months['stats_year']]))
-			$context['yearly'][$row_months['stats_year']] = array(
+		if (!isset($context['yearly'][$row_months['stats_year']])) {
+					$context['yearly'][$row_months['stats_year']] = array(
 				'year' => $row_months['stats_year'],
 				'new_topics' => 0,
 				'new_posts' => 0,
@@ -633,6 +657,7 @@ 
 				'expanded' => false,
 				'current_year' => $row_months['stats_year'] == date('Y'),
 			);
+		}
 
 		$context['yearly'][$row_months['stats_year']]['months'][(int) $row_months['stats_month']] = array(
 			'id' => $ID_MONTH,
@@ -678,26 +703,30 @@ 
 		$context['yearly'][$year]['hits'] = comma_format($data['hits']);
 
 		// Keep a list of collapsed years.
-		if (!$data['expanded'] && !$data['current_year'])
-			$context['collapsed_years'][] = $year;
+		if (!$data['expanded'] && !$data['current_year']) {
+					$context['collapsed_years'][] = $year;
+		}
 	}
 
-	if (empty($_SESSION['expanded_stats']))
-		return;
+	if (empty($_SESSION['expanded_stats'])) {
+			return;
+	}
 
 	$condition_text = array();
 	$condition_params = array();
-	foreach ($_SESSION['expanded_stats'] as $year => $months)
-		if (!empty($months))
+	foreach ($_SESSION['expanded_stats'] as $year => $months) {
+			if (!empty($months))
 		{
 			$condition_text[] = 'YEAR(date) = {int:year_' . $year . '} AND MONTH(date) IN ({array_int:months_' . $year . '})';
+	}
 			$condition_params['year_' . $year] = $year;
 			$condition_params['months_' . $year] = $months;
 		}
 
 	// No daily stats to even look at?
-	if (empty($condition_text))
-		return;
+	if (empty($condition_text)) {
+			return;
+	}
 
 	getDailyStats(implode(' OR ', $condition_text), $condition_params);
 
@@ -723,8 +752,8 @@ 
 		ORDER BY stats_day ASC',
 		$condition_parameters
 	);
-	while ($row_days = $smcFunc['db_fetch_assoc']($days_result))
-		$context['yearly'][$row_days['stats_year']]['months'][(int) $row_days['stats_month']]['days'][] = array(
+	while ($row_days = $smcFunc['db_fetch_assoc']($days_result)) {
+			$context['yearly'][$row_days['stats_year']]['months'][(int) $row_days['stats_month']]['days'][] = array(
 			'day' => sprintf('%02d', $row_days['stats_day']),
 			'month' => sprintf('%02d', $row_days['stats_month']),
 			'year' => $row_days['stats_year'],
@@ -734,6 +763,7 @@ 
 			'most_members_online' => comma_format($row_days['most_on']),
 			'hits' => comma_format($row_days['hits'])
 		);
+	}
 	$smcFunc['db_free_result']($days_result);
 }
 
@@ -752,16 +782,19 @@ 
 	global $modSettings, $user_info, $forum_version, $sourcedir;
 
 	// First, is it disabled?
-	if (empty($modSettings['allow_sm_stats']))
-		die();
+	if (empty($modSettings['allow_sm_stats'])) {
+			die();
+	}
 
 	// Are we saying who we are, and are we right? (OR an admin)
-	if (!$user_info['is_admin'] && (!isset($_GET['sid']) || $_GET['sid'] != $modSettings['allow_sm_stats']))
-		die();
+	if (!$user_info['is_admin'] && (!isset($_GET['sid']) || $_GET['sid'] != $modSettings['allow_sm_stats'])) {
+			die();
+	}
 
 	// Verify the referer...
-	if (!$user_info['is_admin'] && (!isset($_SERVER['HTTP_REFERER']) || md5($_SERVER['HTTP_REFERER']) != '746cb59a1a0d5cf4bd240e5a67c73085'))
-		die();
+	if (!$user_info['is_admin'] && (!isset($_SERVER['HTTP_REFERER']) || md5($_SERVER['HTTP_REFERER']) != '746cb59a1a0d5cf4bd240e5a67c73085')) {
+			die();
+	}
 
 	// Get some server versions.
 	require_once($sourcedir . '/Subs-Admin.php');
@@ -787,16 +820,17 @@ 
 	);
 
 	// Encode all the data, for security.
-	foreach ($stats_to_send as $k => $v)
-		$stats_to_send[$k] = urlencode($k) . '=' . urlencode($v);
+	foreach ($stats_to_send as $k => $v) {
+			$stats_to_send[$k] = urlencode($k) . '=' . urlencode($v);
+	}
 
 	// Turn this into the query string!
 	$stats_to_send = implode('&', $stats_to_send);
 
 	// If we're an admin, just plonk them out.
-	if ($user_info['is_admin'])
-		echo $stats_to_send;
-	else
+	if ($user_info['is_admin']) {
+			echo $stats_to_send;
+	} else
 	{
 		// Connect to the collection script.
 		$fp = @fsockopen('www.simplemachines.org', 80, $errno, $errstr);

Sources/Admin.php

Braces +75 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-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 @@ 
 		'http://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]);
+		}
 	}
 
 	$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();
 }

Sources/Modlog.php

Spacing +2 added lines, -2 removed lines

@@ -256,7 +256,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($entry)
+					'function' => function($entry)
 					{
 						return '<input type="checkbox" class="input_check" name="delete[]" value="' . $entry['id'] . '"' . ($entry['editable'] ? '' : ' disabled') . '>';
 					},
@@ -638,7 +638,7 @@ 
 		if (empty($entries[$k]['action_text']))
 			$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
 		$entries[$k]['action_text'] = preg_replace_callback('~\{([A-Za-z\d_]+)\}~i',
-			function ($matches) use ($entries, $k)
+			function($matches) use ($entries, $k)
 			{
 				return isset($entries[$k]['extra'][$matches[1]]) ? $entries[$k]['extra'][$matches[1]] : '';
 			}, $entries[$k]['action_text']);

Braces +97 added lines, -73 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Prepares the information from the moderation log for viewing.
@@ -32,14 +33,16 @@ 
 
 	// Are we looking at the moderation log or the administration log.
 	$context['log_type'] = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'adminlog' ? 3 : 1;
-	if ($context['log_type'] == 3)
-		isAllowedTo('admin_forum');
+	if ($context['log_type'] == 3) {
+			isAllowedTo('admin_forum');
+	}
 
 	// These change dependant on whether we are viewing the moderation or admin log.
-	if ($context['log_type'] == 3 || $_REQUEST['action'] == 'admin')
-		$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
-	else
-		$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
+	if ($context['log_type'] == 3 || $_REQUEST['action'] == 'admin') {
+			$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
+	} else {
+			$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
+	}
 
 	$context['can_delete'] = allowedTo('admin_forum');
 
@@ -67,8 +70,7 @@ 
 		$log_type = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'adminlog' ? 'admin' : 'moderate';
 		logAction('clearlog_' . $log_type, array(), $log_type);
 
-	}
-	elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $context['can_delete'])
+	} elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $context['can_delete'])
 	{
 		checkSession();
 		validateToken('mod-ml');
@@ -114,15 +116,17 @@ 
 		'ip' => array('sql' => 'lm.ip', 'label' => $txt['modlog_ip'])
 	);
 
-	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search']))
-		$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
-	else
-		$search_params_string = $search_params['string'];
+	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search'])) {
+			$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
+	} else {
+			$search_params_string = $search_params['string'];
+	}
 
-	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
-		$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
-	else
-		$search_params_type = $search_params['type'];
+	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']])) {
+			$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
+	} else {
+			$search_params_type = $search_params['type'];
+	}
 
 	$search_params_column = $searchTypes[$search_params_type]['sql'];
 	$search_params = array(
@@ -297,13 +301,14 @@ 
 	$context['sub_template'] = 'show_list';
 	$context['default_list'] = 'moderation_log_list';
 
-	if (isset($context['moderation_menu_name']))
-		$context[$context['moderation_menu_name']]['tab_data'] = array(
+	if (isset($context['moderation_menu_name'])) {
+			$context[$context['moderation_menu_name']]['tab_data'] = array(
 			'title' => $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log'],
 			'help' => $context['log_type'] == 3 ? 'adminlog' : 'modlog',
 			'description' => $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log_desc']
 		);
-}
+	}
+	}
 
 /**
  * Get the number of mod log entries.
@@ -407,30 +412,35 @@ 
 		// Add on some of the column stuff info
 		if (!empty($row['id_board']))
 		{
-			if ($row['action'] == 'move')
-				$row['extra']['board_to'] = $row['id_board'];
-			else
-				$row['extra']['board'] = $row['id_board'];
+			if ($row['action'] == 'move') {
+							$row['extra']['board_to'] = $row['id_board'];
+			} else {
+							$row['extra']['board'] = $row['id_board'];
+			}
 		}
 
-		if (!empty($row['id_topic']))
-			$row['extra']['topic'] = $row['id_topic'];
-		if (!empty($row['id_msg']))
-			$row['extra']['message'] = $row['id_msg'];
+		if (!empty($row['id_topic'])) {
+					$row['extra']['topic'] = $row['id_topic'];
+		}
+		if (!empty($row['id_msg'])) {
+					$row['extra']['message'] = $row['id_msg'];
+		}
 
 		// Is this associated with a topic?
-		if (isset($row['extra']['topic']))
-			$topics[(int) $row['extra']['topic']][] = $row['id_action'];
-		if (isset($row['extra']['new_topic']))
-			$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
+		if (isset($row['extra']['topic'])) {
+					$topics[(int) $row['extra']['topic']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['new_topic'])) {
+					$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
+		}
 
 		// How about a member?
 		if (isset($row['extra']['member']))
 		{
 			// Guests don't have names!
-			if (empty($row['extra']['member']))
-				$row['extra']['member'] = $txt['modlog_parameter_guest'];
-			else
+			if (empty($row['extra']['member'])) {
+							$row['extra']['member'] = $txt['modlog_parameter_guest'];
+			} else
 			{
 				// Try to find it...
 				$members[(int) $row['extra']['member']][] = $row['id_action'];
@@ -438,35 +448,42 @@ 
 		}
 
 		// Associated with a board?
-		if (isset($row['extra']['board_to']))
-			$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
-		if (isset($row['extra']['board_from']))
-			$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
-		if (isset($row['extra']['board']))
-			$boards[(int) $row['extra']['board']][] = $row['id_action'];
+		if (isset($row['extra']['board_to'])) {
+					$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['board_from'])) {
+					$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['board'])) {
+					$boards[(int) $row['extra']['board']][] = $row['id_action'];
+		}
 
 		// A message?
-		if (isset($row['extra']['message']))
-			$messages[(int) $row['extra']['message']][] = $row['id_action'];
+		if (isset($row['extra']['message'])) {
+					$messages[(int) $row['extra']['message']][] = $row['id_action'];
+		}
 
 		// IP Info?
-		if (isset($row['extra']['ip_range']))
-			if ($seeIP)
+		if (isset($row['extra']['ip_range'])) {
+					if ($seeIP)
 				$row['extra']['ip_range'] = '<a href="' . $scripturl . '?action=trackip;searchip=' . $row['extra']['ip_range'] . '">' . $row['extra']['ip_range'] . '</a>';
-			else
-				$row['extra']['ip_range'] = $txt['logged'];
+		} else {
+							$row['extra']['ip_range'] = $txt['logged'];
+			}
 
 		// Email?
-		if (isset($row['extra']['email']))
-			$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
+		if (isset($row['extra']['email'])) {
+					$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
+		}
 
 		// Bans are complex.
 		if ($row['action'] == 'ban' || $row['action'] == 'banremove')
 		{
 			$row['action_text'] = $txt['modlog_ac_ban' . ($row['action'] == 'banremove' ? '_remove' : '')];
-			foreach (array('member', 'email', 'ip_range', 'hostname') as $type)
-				if (isset($row['extra'][$type]))
+			foreach (array('member', 'email', 'ip_range', 'hostname') as $type) {
+							if (isset($row['extra'][$type]))
 					$row['action_text'] .= $txt['modlog_ac_ban_trigger_' . $type];
+			}
 		}
 
 		// The array to go to the template. Note here that action is set to a "default" value of the action doesn't match anything in the descriptions. Allows easy adding of logging events with basic details.
@@ -502,12 +519,13 @@ 
 			foreach ($boards[$row['id_board']] as $action)
 			{
 				// Make the board number into a link - dealing with moving too.
-				if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board'])
-					$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
-				elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board'])
-					$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
-				elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board'])
-					$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board']) {
+									$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				} elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board']) {
+									$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				} elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board']) {
+									$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -541,10 +559,11 @@ 
 				);
 
 				// Make the topic number into a link - dealing with splitting too.
-				if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic'])
-					$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
-				elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic'])
-					$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic']) {
+									$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				} elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic']) {
+									$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -577,8 +596,9 @@ 
 				);
 
 				// Make the message number into a link.
-				if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg'])
-					$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+				if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg']) {
+									$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -618,25 +638,29 @@ 
 	foreach ($entries as $k => $entry)
 	{
 		// Make any message info links so its easier to go find that message.
-		if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id'])))
-			$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
+		if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id']))) {
+					$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
+		}
 
 		// Mark up any deleted members, topics and boards.
-		foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type)
-			if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
+		foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type) {
+					if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
 				$entries[$k]['extra'][$type] = sprintf($txt['modlog_id'], $entry['extra'][$type]);
+		}
 
 		if (isset($entry['extra']['report']))
 		{
 			// Member profile reports go in a different area
-			if (stristr($entry['action'], 'user_report'))
-				$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
-			else
-				$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			if (stristr($entry['action'], 'user_report')) {
+							$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			} else {
+							$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			}
 		}
 
-		if (empty($entries[$k]['action_text']))
-			$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
+		if (empty($entries[$k]['action_text'])) {
+					$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
+		}
 		$entries[$k]['action_text'] = preg_replace_callback('~\{([A-Za-z\d_]+)\}~i',
 			function ($matches) use ($entries, $k)
 			{

Sources/DbExtra-postgresql.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
 
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
 
-	$pg_tables = array('pg_catalog','information_schema');
+	$pg_tables = array('pg_catalog', 'information_schema');
 
 	$request = $smcFunc['db_query']('', '
 		SELECT pg_relation_size(C.oid) AS "size"
@@ -369,7 +369,7 @@ 
 {
 	static $ver;
 
-	if(!empty($ver))
+	if (!empty($ver))
 		return $ver;
 
 	global $smcFunc;

Braces +37 added lines, -27 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the functions implemented in this file to the $smcFunc array.
@@ -23,8 +24,8 @@ 
 {
 	global $smcFunc;
 
-	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table')
-		$smcFunc += array(
+	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table') {
+			$smcFunc += array(
 			'db_backup_table' => 'smf_db_backup_table',
 			'db_optimize_table' => 'smf_db_optimize_table',
 			'db_table_sql' => 'smf_db_table_sql',
@@ -32,7 +33,8 @@ 
 			'db_get_version' => 'smf_db_get_version',
 			'db_get_engine' => 'smf_db_get_engine',
 		);
-}
+	}
+	}
 
 /**
  * Backup $table to $backup_table.
@@ -48,13 +50,14 @@ 
 
 	// Do we need to drop it first?
 	$tables = smf_db_list_tables(false, $backup_table);
-	if (!empty($tables))
-		$smcFunc['db_query']('', '
+	if (!empty($tables)) {
+			$smcFunc['db_query']('', '
 			DROP TABLE {raw:backup_table}',
 			array(
 				'backup_table' => $backup_table,
 			)
 		);
+	}
 
 	/**
 	 * @todo Should we create backups of sequences as well?
@@ -117,8 +120,9 @@ 
 			)
 		);
 
-	if (!$request)
-		return -1;
+	if (!$request) {
+			return -1;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT pg_relation_size(C.oid) AS "size"
@@ -136,11 +140,12 @@ 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
-	if (isset($row['size']))
-			return ($old_size - $row['size']) / 1024;
-	else
-		return 0;
-}
+	if (isset($row['size'])) {
+				return ($old_size - $row['size']) / 1024;
+	} else {
+			return 0;
+	}
+	}
 
 /**
  * This function lists all tables in the database.
@@ -167,8 +172,9 @@ 
 	);
 
 	$tables = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$tables[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$tables[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $tables;
@@ -209,12 +215,14 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if ($row['data_type'] == 'character varying')
-			$row['data_type'] = 'varchar';
-		elseif ($row['data_type'] == 'character')
-			$row['data_type'] = 'char';
-		if ($row['character_maximum_length'])
-			$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+		if ($row['data_type'] == 'character varying') {
+					$row['data_type'] = 'varchar';
+		} elseif ($row['data_type'] == 'character') {
+					$row['data_type'] = 'char';
+		}
+		if ($row['character_maximum_length']) {
+					$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+		}
 
 		// Make the CREATE for this column.
 		$schema_create .= ' "' . $row['column_name'] . '" ' . $row['data_type'] . ($row['is_nullable'] != 'YES' ? ' NOT NULL' : '');
@@ -265,13 +273,14 @@ 
 	{
 		if ($row['is_primary'])
 		{
-			if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-				continue;
+			if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0) {
+							continue;
+			}
 
 			$index_create .= $crlf . 'ALTER TABLE ' . $tableName . ' ADD PRIMARY KEY ("' . $matches[1] . '");';
+		} else {
+					$index_create .= $crlf . $row['inddef'] . ';';
 		}
-		else
-			$index_create .= $crlf . $row['inddef'] . ';';
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -289,8 +298,9 @@ 
 {
 	static $ver;
 
-	if(!empty($ver))
-		return $ver;
+	if(!empty($ver)) {
+			return $ver;
+	}
 
 	global $smcFunc;
 

Sources/ManageCalendar.php

Spacing +2 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
 					'value' => $txt['date'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						// Recurring every year or just a single year?
 						$year = $rowData['year'] == '0004' ? sprintf('(%1$s)', $txt['every_year']) : $rowData['year'];
@@ -218,7 +218,7 @@ 
 		checkSession();
 
 		// Not too long good sir?
-		$_REQUEST['title'] =  $smcFunc['substr']($_REQUEST['title'], 0, 60);
+		$_REQUEST['title'] = $smcFunc['substr']($_REQUEST['title'], 0, 60);
 		$_REQUEST['holiday'] = isset($_REQUEST['holiday']) ? (int) $_REQUEST['holiday'] : 0;
 
 		if (isset($_REQUEST['delete']))

Braces +37 added lines, -28 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main controlling function doesn't have much to do... yet.
@@ -43,8 +44,7 @@ 
 			'settings' => 'ModifyCalendarSettings'
 		);
 		$default = 'holidays';
-	}
-	else
+	} else
 	{
 		$subActions = array(
 			'settings' => 'ModifyCalendarSettings'
@@ -60,8 +60,8 @@ 
 		'help' => 'calendar',
 		'description' => $txt['calendar_settings_desc'],
 	);
-	if (!empty($modSettings['cal_enabled']))
-		$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
+	if (!empty($modSettings['cal_enabled'])) {
+			$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
 			'holidays' => array(
 				'description' => $txt['manage_holidays_desc'],
 			),
@@ -69,6 +69,7 @@ 
 				'description' => $txt['calendar_settings_desc'],
 			),
 		);
+	}
 
 	call_integration_hook('integrate_manage_calendar', array(&$subActions));
 
@@ -88,8 +89,9 @@ 
 		checkSession();
 		validateToken('admin-mc');
 
-		foreach ($_REQUEST['holiday'] as $id => $value)
-			$_REQUEST['holiday'][$id] = (int) $id;
+		foreach ($_REQUEST['holiday'] as $id => $value) {
+					$_REQUEST['holiday'][$id] = (int) $id;
+		}
 
 		// Now the IDs are "safe" do the delete...
 		require_once($sourcedir . '/Subs-Calendar.php');
@@ -209,8 +211,9 @@ 
 	$context['sub_template'] = 'edit_holiday';
 
 	// Cast this for safety...
-	if (isset($_REQUEST['holiday']))
-		$_REQUEST['holiday'] = (int) $_REQUEST['holiday'];
+	if (isset($_REQUEST['holiday'])) {
+			$_REQUEST['holiday'] = (int) $_REQUEST['holiday'];
+	}
 
 	// Submitting?
 	if (isset($_POST[$context['session_var']]) && (isset($_REQUEST['delete']) || $_REQUEST['title'] != ''))
@@ -221,19 +224,19 @@ 
 		$_REQUEST['title'] =  $smcFunc['substr']($_REQUEST['title'], 0, 60);
 		$_REQUEST['holiday'] = isset($_REQUEST['holiday']) ? (int) $_REQUEST['holiday'] : 0;
 
-		if (isset($_REQUEST['delete']))
-			$smcFunc['db_query']('', '
+		if (isset($_REQUEST['delete'])) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}calendar_holidays
 				WHERE id_holiday = {int:selected_holiday}',
 				array(
 					'selected_holiday' => $_REQUEST['holiday'],
 				)
 			);
-		else
+		} else
 		{
 			$date = strftime($_REQUEST['year'] <= 4 ? '0004-%m-%d' : '%Y-%m-%d', mktime(0, 0, 0, $_REQUEST['month'], $_REQUEST['day'], $_REQUEST['year']));
-			if (isset($_REQUEST['edit']))
-				$smcFunc['db_query']('', '
+			if (isset($_REQUEST['edit'])) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}calendar_holidays
 					SET event_date = {date:holiday_date}, title = {string:holiday_title}
 					WHERE id_holiday = {int:selected_holiday}',
@@ -243,8 +246,8 @@ 
 						'holiday_title' => $_REQUEST['title'],
 					)
 				);
-			else
-				$smcFunc['db_insert']('',
+			} else {
+							$smcFunc['db_insert']('',
 					'{db_prefix}calendar_holidays',
 					array(
 						'event_date' => 'date', 'title' => 'string-60',
@@ -254,6 +257,7 @@ 
 					),
 					array('id_holiday')
 				);
+			}
 		}
 
 		updateSettings(array(
@@ -265,14 +269,15 @@ 
 	}
 
 	// Default states...
-	if ($context['is_new'])
-		$context['holiday'] = array(
+	if ($context['is_new']) {
+			$context['holiday'] = array(
 			'id' => 0,
 			'day' => date('d'),
 			'month' => date('m'),
 			'year' => '0000',
 			'title' => ''
 		);
+	}
 	// If it's not new load the data.
 	else
 	{
@@ -285,14 +290,15 @@ 
 				'selected_holiday' => $_REQUEST['holiday'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['holiday'] = array(
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['holiday'] = array(
 				'id' => $row['id_holiday'],
 				'day' => $row['day'],
 				'month' => $row['month'],
 				'year' => $row['year'] <= 4 ? 0 : $row['year'],
 				'title' => $row['title']
 			);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -319,16 +325,17 @@ 
 		array(
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	require_once($sourcedir . '/Subs-Boards.php');
 	sortBoards($boards);
 
 	// Look, all the calendar settings - of which there are many!
-	if (!empty($modSettings['cal_enabled']))
-		$config_vars = array(
+	if (!empty($modSettings['cal_enabled'])) {
+			$config_vars = array(
 				array('check', 'cal_enabled'),
 			'',
 				// All the permissions:
@@ -371,14 +378,16 @@ 
 				array('check', 'cal_short_days'),
 				array('check', 'cal_short_months'),
 		);
-	else
-		$config_vars = array(
+	} else {
+			$config_vars = array(
 			array('check', 'cal_enabled'),
 		);
+	}
 
 	call_integration_hook('integrate_modify_calendar_settings', array(&$config_vars));
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template fired up.
 	require_once($sourcedir . '/ManageServer.php');

Sources/Class-BrowserDetect.php

Indentation +33 added lines, -33 removed lines

@@ -101,9 +101,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Opera or not
-	* @return boolean Whether or not this is Opera
-	*/
+	 * Determine if the browser is Opera or not
+	 * @return boolean Whether or not this is Opera
+	 */
 	function isOpera()
 	{
 		if (!isset($this->_browsers['is_opera']))
@@ -112,9 +112,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is IE or not
-	* @return boolean true Whether or not the browser is IE
-	*/
+	 * Determine if the browser is IE or not
+	 * @return boolean true Whether or not the browser is IE
+	 */
 	function isIe()
 	{
 		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
@@ -124,9 +124,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is IE11 or not
-	* @return boolean Whether or not the browser is IE11
-	*/
+	 * Determine if the browser is IE11 or not
+	 * @return boolean Whether or not the browser is IE11
+	 */
 	function isIe11()
 	{
 		// IE11 is a bit different than earlier versions
@@ -137,9 +137,9 @@ 
  	}
 
 	/**
-	* Determine if the browser is Edge or not
-	* @return boolean Whether or not the browser is Edge
-	*/
+	 * Determine if the browser is Edge or not
+	 * @return boolean Whether or not the browser is Edge
+	 */
 	function isEdge()
 	{
 		if (!isset($this->_browsers['is_edge']))
@@ -148,9 +148,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is a Webkit based one or not
-	* @return boolean Whether or not this is a Webkit-based browser
-	*/
+	 * Determine if the browser is a Webkit based one or not
+	 * @return boolean Whether or not this is a Webkit-based browser
+	 */
 	function isWebkit()
 	{
 		if (!isset($this->_browsers['is_webkit']))
@@ -159,9 +159,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Firefox or one of its variants
-	* @return boolean Whether or not this is Firefox (or one of its variants)
-	*/
+	 * Determine if the browser is Firefox or one of its variants
+	 * @return boolean Whether or not this is Firefox (or one of its variants)
+	 */
 	function isFirefox()
 	{
 		if (!isset($this->_browsers['is_firefox']))
@@ -170,9 +170,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is WebTv or not
-	* @return boolean Whether or not this is WebTV
-	*/
+	 * Determine if the browser is WebTv or not
+	 * @return boolean Whether or not this is WebTV
+	 */
 	function isWebTv()
 	{
 		if (!isset($this->_browsers['is_web_tv']))
@@ -181,9 +181,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is konqueror or not
-	* @return boolean Whether or not this is Konqueror
-	*/
+	 * Determine if the browser is konqueror or not
+	 * @return boolean Whether or not this is Konqueror
+	 */
 	function isKonqueror()
 	{
 		if (!isset($this->_browsers['is_konqueror']))
@@ -192,9 +192,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Gecko or not
-	* @return boolean Whether or not this is a Gecko-based browser
-	*/
+	 * Determine if the browser is Gecko or not
+	 * @return boolean Whether or not this is a Gecko-based browser
+	 */
 	function isGecko()
 	{
 		if (!isset($this->_browsers['is_gecko']))
@@ -203,9 +203,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Opera Mini or not
-	* @return boolean Whether or not this is Opera Mini
-	*/
+	 * Determine if the browser is Opera Mini or not
+	 * @return boolean Whether or not this is Opera Mini
+	 */
 	function isOperaMini()
 	{
 		if (!isset($this->_browsers['is_opera_mini']))
@@ -216,9 +216,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Opera Mobile or not
-	* @return boolean Whether or not this is Opera Mobile
-	*/
+	 * Determine if the browser is Opera Mobile or not
+	 * @return boolean Whether or not this is Opera Mobile
+	 */
 	function isOperaMobi()
 	{
 		if (!isset($this->_browsers['is_opera_mobi']))

Braces +88 added lines, -60 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class browser_detector
@@ -55,20 +56,25 @@ 
 		$this->_browsers['needs_size_fix'] = false;
 
 		// One at a time, one at a time, and in this order too
-		if ($this->isOpera())
-			$this->setupOpera();
+		if ($this->isOpera()) {
+					$this->setupOpera();
+		}
 		// Meh...
-		elseif ($this->isEdge())
-			$this->setupEdge();
+		elseif ($this->isEdge()) {
+					$this->setupEdge();
+		}
 		// Them webkits need to be set up too
-		elseif ($this->isWebkit())
-			$this->setupWebkit();
+		elseif ($this->isWebkit()) {
+					$this->setupWebkit();
+		}
 		// We may have work to do on Firefox...
-		elseif ($this->isFirefox())
-			$this->setupFirefox();
+		elseif ($this->isFirefox()) {
+					$this->setupFirefox();
+		}
 		// Old friend, old frenemy
-		elseif ($this->isIe())
-			$this->setupIe();
+		elseif ($this->isIe()) {
+					$this->setupIe();
+		}
 
 		// Just a few mobile checks
 		$this->isOperaMini();
@@ -84,11 +90,12 @@ 
 			$this->_browsers['possibly_robot'] = !empty($user_info['possibly_robot']);
 
 			// Robots shouldn't be logging in or registering.  So, they aren't a bot.  Better to be wrong than sorry (or people won't be able to log in!), anyway.
-			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register', 'signup'))) || !$user_info['is_guest'])
-				$this->_browsers['possibly_robot'] = false;
+			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register', 'signup'))) || !$user_info['is_guest']) {
+							$this->_browsers['possibly_robot'] = false;
+			}
+		} else {
+					$this->_browsers['possibly_robot'] = false;
 		}
-		else
-			$this->_browsers['possibly_robot'] = false;
 
 		// Fill out the historical array as needed to support old mods that don't use isBrowser
 		$this->fillInformation();
@@ -106,8 +113,9 @@ 
 	*/
 	function isOpera()
 	{
-		if (!isset($this->_browsers['is_opera']))
-			$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		if (!isset($this->_browsers['is_opera'])) {
+					$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		}
 		return $this->_browsers['is_opera'];
 	}
 
@@ -118,8 +126,9 @@ 
 	function isIe()
 	{
 		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
-		if (!isset($this->_browsers['is_ie']))
-			$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		if (!isset($this->_browsers['is_ie'])) {
+					$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		}
 		return $this->_browsers['is_ie'];
 	}
 
@@ -131,8 +140,9 @@ 
 	{
 		// IE11 is a bit different than earlier versions
 		// The isGecko() part is to ensure we get this right...
-		if (!isset($this->_browsers['is_ie11']))
-			$this->_browsers['is_ie11'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false && $this->isGecko();
+		if (!isset($this->_browsers['is_ie11'])) {
+					$this->_browsers['is_ie11'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false && $this->isGecko();
+		}
 		return $this->_browsers['is_ie11'];
  	}
 
@@ -142,8 +152,9 @@ 
 	*/
 	function isEdge()
 	{
-		if (!isset($this->_browsers['is_edge']))
-			$this->_browsers['is_edge'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false;
+		if (!isset($this->_browsers['is_edge'])) {
+					$this->_browsers['is_edge'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false;
+		}
 		return $this->_browsers['is_edge'];
 	}
 
@@ -153,8 +164,9 @@ 
 	*/
 	function isWebkit()
 	{
-		if (!isset($this->_browsers['is_webkit']))
-			$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		if (!isset($this->_browsers['is_webkit'])) {
+					$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		}
 		return $this->_browsers['is_webkit'];
 	}
 
@@ -164,8 +176,9 @@ 
 	*/
 	function isFirefox()
 	{
-		if (!isset($this->_browsers['is_firefox']))
-			$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1 && $this->isGecko();
+		if (!isset($this->_browsers['is_firefox'])) {
+					$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1 && $this->isGecko();
+		}
 		return $this->_browsers['is_firefox'];
 	}
 
@@ -175,8 +188,9 @@ 
 	*/
 	function isWebTv()
 	{
-		if (!isset($this->_browsers['is_web_tv']))
-			$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		if (!isset($this->_browsers['is_web_tv'])) {
+					$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		}
 		return $this->_browsers['is_web_tv'];
 	}
 
@@ -186,8 +200,9 @@ 
 	*/
 	function isKonqueror()
 	{
-		if (!isset($this->_browsers['is_konqueror']))
-			$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		if (!isset($this->_browsers['is_konqueror'])) {
+					$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		}
 		return $this->_browsers['is_konqueror'];
 	}
 
@@ -197,8 +212,9 @@ 
 	*/
 	function isGecko()
 	{
-		if (!isset($this->_browsers['is_gecko']))
-			$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		if (!isset($this->_browsers['is_gecko'])) {
+					$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		}
 		return $this->_browsers['is_gecko'];
 	}
 
@@ -208,10 +224,12 @@ 
 	*/
 	function isOperaMini()
 	{
-		if (!isset($this->_browsers['is_opera_mini']))
-			$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
-		if ($this->_browsers['is_opera_mini'])
-			$this->_is_mobile = true;
+		if (!isset($this->_browsers['is_opera_mini'])) {
+					$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
+		}
+		if ($this->_browsers['is_opera_mini']) {
+					$this->_is_mobile = true;
+		}
 		return $this->_browsers['is_opera_mini'];
 	}
 
@@ -221,10 +239,12 @@ 
 	*/
 	function isOperaMobi()
 	{
-		if (!isset($this->_browsers['is_opera_mobi']))
-			$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
-		if ($this->_browsers['is_opera_mobi'])
-			$this->_is_mobile = true;
+		if (!isset($this->_browsers['is_opera_mobi'])) {
+					$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
+		}
+		if ($this->_browsers['is_opera_mobi']) {
+					$this->_is_mobile = true;
+		}
 		return $this->_browsers['is_opera_mini'];
 	}
 
@@ -244,8 +264,9 @@ 
 		);
 
 		// blackberry, playbook, iphone, nokia, android and ipods set a mobile flag
-		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia'])
-			$this->_is_mobile = true;
+		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia']) {
+					$this->_is_mobile = true;
+		}
 
 		// @todo what to do with the blaPad? ... for now leave it detected as Safari ...
 		$this->_browsers['is_safari'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Safari') !== false && !$this->_browsers['is_chrome'] && !$this->_browsers['is_iphone'];
@@ -254,15 +275,17 @@ 
 		// if Chrome, get the major version
 		if ($this->_browsers['is_chrome'])
 		{
-			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-				$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+							$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			}
 		}
 
 		// or if Safari get its major version
 		if ($this->_browsers['is_safari'])
 		{
-			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-				$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+							$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			}
 		}
 	}
 
@@ -291,8 +314,9 @@ 
 			$this->_browsers['is_ie' . ((int) $trident_match[1] + 4)] = true;
 
 			// If trident is set, see the (if any) msie tag in the user agent matches ... if not its in some compatibility view
-			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4))
-				$this->_browsers['is_ie_compat_view'] = true;
+			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4)) {
+							$this->_browsers['is_ie_compat_view'] = true;
+			}
 		}
 
 		// Detect true IE6 and IE7 and not IE in compat mode.
@@ -326,8 +350,9 @@ 
 	 */
 	private function setupFirefox()
 	{
-		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-			$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+					$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -338,11 +363,13 @@ 
 	private function setupOpera()
 	{
 		// Opera 10+ uses the version tag at the end of the string
-		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match)) {
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 		// Opera pre 10 is supposed to uses the Opera tag alone, as do some spoofers
-		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match)) {
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 
 		// Needs size fix?
 		$this->_browsers['needs_size_fix'] = !empty($this->_browsers['is_opera6']);
@@ -353,8 +380,9 @@ 
 	 */
 	private function setupEdge()
 	{
-		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-			$this->_browsers['is_edge' . (int) $match[1]] = true;
+		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+					$this->_browsers['is_edge' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -367,9 +395,9 @@ 
 	{
 		global $context;
 
-		if ($this->_is_mobile)
-			$context['browser_body_id'] = 'mobile';
-		else
+		if ($this->_is_mobile) {
+					$context['browser_body_id'] = 'mobile';
+		} else
 		{
 			// add in any specific detection conversions here if you want a special body id e.g. 'is_opera9' => 'opera9'
 			$browser_priority = array(