SimpleMachines / SMF2.1

Sources/ManageSmileys.php

Braces +297 added lines, -211 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the dispatcher of smileys administration.
@@ -91,8 +92,9 @@ 
 	);
 
 	// Some settings may not be enabled, disallow these from the tabs as appropriate.
-	if (empty($modSettings['messageIcons_enable']))
-		$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+	if (empty($modSettings['messageIcons_enable'])) {
+			$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+	}
 	if (empty($modSettings['smiley_enable']))
 	{
 		$context[$context['admin_menu_name']]['tab_data']['tabs']['addsmiley']['disabled'] = true;
@@ -125,8 +127,9 @@ 
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
 
 	$smiley_context = array();
-	foreach ($smiley_sets as $i => $set)
-		$smiley_context[$set] = $set_names[$i];
+	foreach ($smiley_sets as $i => $set) {
+			$smiley_context[$set] = $set_names[$i];
+	}
 
 	// All the settings for the page...
 	$config_vars = array(
@@ -147,8 +150,9 @@ 
 
 	call_integration_hook('integrate_modify_smiley_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the basics of the settings template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -207,8 +211,9 @@ 
 			foreach ($_POST['smiley_set'] as $id => $val)
 			{
 				// If this is the set you've marked as default, or the only one remaining, you can't delete it
-				if ($modSettings['smiley_sets_default'] != $set_paths[$id] && count($set_paths) != 1 && isset($set_paths[$id], $set_names[$id]))
-					unset($set_paths[$id], $set_names[$id]);
+				if ($modSettings['smiley_sets_default'] != $set_paths[$id] && count($set_paths) != 1 && isset($set_paths[$id], $set_names[$id])) {
+									unset($set_paths[$id], $set_names[$id]);
+				}
 			}
 
 			// Shortcut... array_merge() on a single array resets the numeric keys
@@ -222,8 +227,9 @@ 
 			));
 		}
 		// Add a new smiley set.
-		elseif (!empty($_POST['add']))
-			$context['sub_action'] = 'modifyset';
+		elseif (!empty($_POST['add'])) {
+					$context['sub_action'] = 'modifyset';
+		}
 		// Create or modify a smiley set.
 		elseif (isset($_POST['set']))
 		{
@@ -233,8 +239,9 @@ 
 			// Create a new smiley set.
 			if ($_POST['set'] == -1 && isset($_POST['smiley_sets_path']))
 			{
-				if (in_array($_POST['smiley_sets_path'], $set_paths))
-					fatal_lang_error('smiley_set_already_exists');
+				if (in_array($_POST['smiley_sets_path'], $set_paths)) {
+									fatal_lang_error('smiley_set_already_exists');
+				}
 
 				updateSettings(array(
 					'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . $_POST['smiley_sets_path'],
@@ -246,12 +253,14 @@ 
 			else
 			{
 				// Make sure the smiley set exists.
-				if (!isset($set_paths[$_POST['set']]) || !isset($set_names[$_POST['set']]))
-					fatal_lang_error('smiley_set_not_found');
+				if (!isset($set_paths[$_POST['set']]) || !isset($set_names[$_POST['set']])) {
+									fatal_lang_error('smiley_set_not_found');
+				}
 
 				// Make sure the path is not yet used by another smileyset.
-				if (in_array($_POST['smiley_sets_path'], $set_paths) && $_POST['smiley_sets_path'] != $set_paths[$_POST['set']])
-					fatal_lang_error('smiley_set_path_already_used');
+				if (in_array($_POST['smiley_sets_path'], $set_paths) && $_POST['smiley_sets_path'] != $set_paths[$_POST['set']]) {
+									fatal_lang_error('smiley_set_path_already_used');
+				}
 
 				$set_paths[$_POST['set']] = $_POST['smiley_sets_path'];
 				$set_names[$_POST['set']] = $_POST['smiley_sets_name'];
@@ -263,8 +272,9 @@ 
 			}
 
 			// The user might have checked to also import smileys.
-			if (!empty($_POST['smiley_sets_import']))
-				ImportSmileys($_POST['smiley_sets_path']);
+			if (!empty($_POST['smiley_sets_import'])) {
+							ImportSmileys($_POST['smiley_sets_path']);
+			}
 		}
 		cache_put_data('parsing_smileys', null, 480);
 		cache_put_data('posting_smileys', null, 480);
@@ -273,13 +283,14 @@ 
 	// Load all available smileysets...
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Importing any smileys from an existing set?
 	if ($context['sub_action'] == 'import')
@@ -290,8 +301,9 @@ 
 		$_GET['set'] = (int) $_GET['set'];
 
 		// Sanity check - then import.
-		if (isset($context['smiley_sets'][$_GET['set']]))
-			ImportSmileys(un_htmlspecialchars($context['smiley_sets'][$_GET['set']]['path']));
+		if (isset($context['smiley_sets'][$_GET['set']])) {
+					ImportSmileys(un_htmlspecialchars($context['smiley_sets'][$_GET['set']]['path']));
+		}
 
 		// Force the process to continue.
 		$context['sub_action'] = 'modifyset';
@@ -301,15 +313,15 @@ 
 	if ($context['sub_action'] == 'modifyset')
 	{
 		$_GET['set'] = !isset($_GET['set']) ? -1 : (int) $_GET['set'];
-		if ($_GET['set'] == -1 || !isset($context['smiley_sets'][$_GET['set']]))
-			$context['current_set'] = array(
+		if ($_GET['set'] == -1 || !isset($context['smiley_sets'][$_GET['set']])) {
+					$context['current_set'] = array(
 				'id' => '-1',
 				'path' => '',
 				'name' => '',
 				'selected' => false,
 				'is_new' => true,
 			);
-		else
+		} else
 		{
 			$context['current_set'] = &$context['smiley_sets'][$_GET['set']];
 			$context['current_set']['is_new'] = false;
@@ -321,13 +333,15 @@ 
 				$dir = dir($modSettings['smileys_dir'] . '/' . $context['current_set']['path']);
 				while ($entry = $dir->read())
 				{
-					if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-						$smileys[strtolower($entry)] = $entry;
+					if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+											$smileys[strtolower($entry)] = $entry;
+					}
 				}
 				$dir->close();
 
-				if (empty($smileys))
-					fatal_lang_error('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+				if (empty($smileys)) {
+									fatal_lang_error('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+				}
 
 				// Exclude the smileys that are already in the database.
 				$request = $smcFunc['db_query']('', '
@@ -338,9 +352,10 @@ 
 						'smiley_list' => $smileys,
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					if (isset($smileys[strtolower($row['filename'])]))
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									if (isset($smileys[strtolower($row['filename'])]))
 						unset($smileys[strtolower($row['filename'])]);
+				}
 				$smcFunc['db_free_result']($request);
 
 				$context['current_set']['can_import'] = count($smileys);
@@ -355,13 +370,14 @@ 
 			$dir = dir($modSettings['smileys_dir']);
 			while ($entry = $dir->read())
 			{
-				if (!in_array($entry, array('.', '..')) && is_dir($modSettings['smileys_dir'] . '/' . $entry))
-					$context['smiley_set_dirs'][] = array(
+				if (!in_array($entry, array('.', '..')) && is_dir($modSettings['smileys_dir'] . '/' . $entry)) {
+									$context['smiley_set_dirs'][] = array(
 						'id' => $entry,
 						'path' => $modSettings['smileys_dir'] . '/' . $entry,
 						'selectable' => $entry == $context['current_set']['path'] || !in_array($entry, explode(',', $modSettings['smiley_sets_known'])),
 						'current' => $entry == $context['current_set']['path'],
 					);
+				}
 			}
 			$dir->close();
 		}
@@ -371,8 +387,9 @@ 
 	createToken('admin-mss', 'request');
 
 	// In case we need to import smileys, we need to add the token in now.
-	if (isset($context['current_set']['import_url']))
-		$context['current_set']['import_url'] .= ';' . $context['admin-mss_token_var'] . '=' . $context['admin-mss_token'];
+	if (isset($context['current_set']['import_url'])) {
+			$context['current_set']['import_url'] .= ';' . $context['admin-mss_token_var'] . '=' . $context['admin-mss_token'];
+	}
 
 	$listOptions = array(
 		'id' => 'smiley_set_list',
@@ -510,21 +527,23 @@ 
 		$cols['name'][] = $set_names[$i];
 	}
 	$sort_flag = strpos($sort, 'DESC') === false ? SORT_ASC : SORT_DESC;
-	if (substr($sort, 0, 4) === 'name')
-		array_multisort($cols['name'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['selected'], $cols['id']);
-	elseif (substr($sort, 0, 4) === 'path')
-		array_multisort($cols['path'], $sort_flag, SORT_REGULAR, $cols['name'], $cols['selected'], $cols['id']);
-	else
-		array_multisort($cols['selected'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['name'], $cols['id']);
+	if (substr($sort, 0, 4) === 'name') {
+			array_multisort($cols['name'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['selected'], $cols['id']);
+	} elseif (substr($sort, 0, 4) === 'path') {
+			array_multisort($cols['path'], $sort_flag, SORT_REGULAR, $cols['name'], $cols['selected'], $cols['id']);
+	} else {
+			array_multisort($cols['selected'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['name'], $cols['id']);
+	}
 
 	$smiley_sets = array();
-	foreach ($cols['id'] as $i => $id)
-		$smiley_sets[] = array(
+	foreach ($cols['id'] as $i => $id) {
+			$smiley_sets[] = array(
 			'id' => $id,
 			'path' => $cols['path'][$i],
 			'name' => $cols['name'][$i],
 			'selected' => $cols['path'][$i] == $modSettings['smiley_sets_default']
 		);
+	}
 
 	return $smiley_sets;
 }
@@ -553,13 +572,14 @@ 
 	$context['smileys_dir_found'] = is_dir($context['smileys_dir']);
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Submitting a form?
 	if (isset($_POST[$context['session_var']], $_POST['smiley_code']))
@@ -575,8 +595,9 @@ 
 		$_POST['smiley_filename'] = htmltrim__recursive($_POST['smiley_filename']);
 
 		// Make sure some code was entered.
-		if (empty($_POST['smiley_code']))
-			fatal_lang_error('smiley_has_no_code');
+		if (empty($_POST['smiley_code'])) {
+					fatal_lang_error('smiley_has_no_code');
+		}
 
 		// Check whether the new code has duplicates. It should be unique.
 		$request = $smcFunc['db_query']('', '
@@ -588,8 +609,9 @@ 
 				'smiley_code' => $_POST['smiley_code'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) > 0)
-			fatal_lang_error('smiley_not_unique');
+		if ($smcFunc['db_num_rows']($request) > 0) {
+					fatal_lang_error('smiley_not_unique');
+		}
 		$smcFunc['db_free_result']($request);
 
 		// If we are uploading - check all the smiley sets are writable!
@@ -598,38 +620,44 @@ 
 			$writeErrors = array();
 			foreach ($context['smiley_sets'] as $set)
 			{
-				if (!is_writable($context['smileys_dir'] . '/' . un_htmlspecialchars($set['path'])))
-					$writeErrors[] = $set['path'];
+				if (!is_writable($context['smileys_dir'] . '/' . un_htmlspecialchars($set['path']))) {
+									$writeErrors[] = $set['path'];
+				}
+			}
+			if (!empty($writeErrors)) {
+							fatal_lang_error('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
 			}
-			if (!empty($writeErrors))
-				fatal_lang_error('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
 		}
 
 		// Uploading just one smiley for all of them?
 		if (isset($_POST['sameall']) && isset($_FILES['uploadSmiley']['name']) && $_FILES['uploadSmiley']['name'] != '')
 		{
-			if (!is_uploaded_file($_FILES['uploadSmiley']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['uploadSmiley']['tmp_name'])))
-				fatal_lang_error('smileys_upload_error');
+			if (!is_uploaded_file($_FILES['uploadSmiley']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['uploadSmiley']['tmp_name']))) {
+							fatal_lang_error('smileys_upload_error');
+			}
 
 			// Sorry, no spaces, dots, or anything else but letters allowed.
 			$_FILES['uploadSmiley']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['uploadSmiley']['name']);
 
 			// We only allow image files - it's THAT simple - no messing around here...
-			if (!in_array(strtolower(substr(strrchr($_FILES['uploadSmiley']['name'], '.'), 1)), $allowedTypes))
-				fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+			if (!in_array(strtolower(substr(strrchr($_FILES['uploadSmiley']['name'], '.'), 1)), $allowedTypes)) {
+							fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+			}
 
 			// We only need the filename...
 			$destName = basename($_FILES['uploadSmiley']['name']);
 
 			// Make sure they aren't trying to upload a nasty file - for their own good here!
-			if (in_array(strtolower($destName), $disabledFiles))
-				fatal_lang_error('smileys_upload_error_illegal');
+			if (in_array(strtolower($destName), $disabledFiles)) {
+							fatal_lang_error('smileys_upload_error_illegal');
+			}
 
 			// Check if the file already exists... and if not move it to EVERY smiley set directory.
 			$i = 0;
 			// Keep going until we find a set the file doesn't exist in. (or maybe it exists in all of them?)
-			while (isset($context['smiley_sets'][$i]) && file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName))
-				$i++;
+			while (isset($context['smiley_sets'][$i]) && file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName)) {
+							$i++;
+			}
 
 			// Okay, we're going to put the smiley right here, since it's not there yet!
 			if (isset($context['smiley_sets'][$i]['path']))
@@ -644,8 +672,9 @@ 
 					$currentPath = $context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName;
 
 					// The file is already there!  Don't overwrite it!
-					if (file_exists($currentPath))
-						continue;
+					if (file_exists($currentPath)) {
+											continue;
+					}
 
 					// Okay, so copy the first one we made to here.
 					copy($smileyLocation, $currentPath);
@@ -662,13 +691,15 @@ 
 			$newName = '';
 			foreach ($_FILES as $name => $data)
 			{
-				if ($_FILES[$name]['name'] == '')
-					fatal_lang_error('smileys_upload_error_blank');
+				if ($_FILES[$name]['name'] == '') {
+									fatal_lang_error('smileys_upload_error_blank');
+				}
 
-				if (empty($newName))
-					$newName = basename($_FILES[$name]['name']);
-				elseif (basename($_FILES[$name]['name']) != $newName)
-					fatal_lang_error('smileys_upload_error_name');
+				if (empty($newName)) {
+									$newName = basename($_FILES[$name]['name']);
+				} elseif (basename($_FILES[$name]['name']) != $newName) {
+									fatal_lang_error('smileys_upload_error_name');
+				}
 			}
 
 			foreach ($context['smiley_sets'] as $i => $set)
@@ -676,31 +707,36 @@ 
 				$set['name'] = un_htmlspecialchars($set['name']);
 				$set['path'] = un_htmlspecialchars($set['path']);
 
-				if (!isset($_FILES['individual_' . $set['name']]['name']) || $_FILES['individual_' . $set['name']]['name'] == '')
-					continue;
+				if (!isset($_FILES['individual_' . $set['name']]['name']) || $_FILES['individual_' . $set['name']]['name'] == '') {
+									continue;
+				}
 
 				// Got one...
-				if (!is_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['individual_' . $set['name']]['tmp_name'])))
-					fatal_lang_error('smileys_upload_error');
+				if (!is_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['individual_' . $set['name']]['tmp_name']))) {
+									fatal_lang_error('smileys_upload_error');
+				}
 
 				// Sorry, no spaces, dots, or anything else but letters allowed.
 				$_FILES['individual_' . $set['name']]['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['individual_' . $set['name']]['name']);
 
 				// We only allow image files - it's THAT simple - no messing around here...
-				if (!in_array(strtolower(substr(strrchr($_FILES['individual_' . $set['name']]['name'], '.'), 1)), $allowedTypes))
-					fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				if (!in_array(strtolower(substr(strrchr($_FILES['individual_' . $set['name']]['name'], '.'), 1)), $allowedTypes)) {
+									fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				}
 
 				// We only need the filename...
 				$destName = basename($_FILES['individual_' . $set['name']]['name']);
 
 				// Make sure they aren't trying to upload a nasty file - for their own good here!
-				if (in_array(strtolower($destName), $disabledFiles))
-					fatal_lang_error('smileys_upload_error_illegal');
+				if (in_array(strtolower($destName), $disabledFiles)) {
+									fatal_lang_error('smileys_upload_error_illegal');
+				}
 
 				// If the file exists - ignore it.
 				$smileyLocation = $context['smileys_dir'] . '/' . $set['path'] . '/' . $destName;
-				if (file_exists($smileyLocation))
-					continue;
+				if (file_exists($smileyLocation)) {
+									continue;
+				}
 
 				// Finally - move the image!
 				move_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name'], $smileyLocation);
@@ -712,8 +748,9 @@ 
 		}
 
 		// Also make sure a filename was given.
-		if (empty($_POST['smiley_filename']))
-			fatal_lang_error('smiley_has_no_filename');
+		if (empty($_POST['smiley_filename'])) {
+					fatal_lang_error('smiley_has_no_filename');
+		}
 
 		// Find the position on the right.
 		$smiley_order = '0';
@@ -732,8 +769,9 @@ 
 			list ($smiley_order) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (empty($smiley_order))
-				$smiley_order = '0';
+			if (empty($smiley_order)) {
+							$smiley_order = '0';
+			}
 		}
 		$smcFunc['db_insert']('',
 			'{db_prefix}smileys',
@@ -761,17 +799,19 @@ 
 	{
 		foreach ($context['smiley_sets'] as $smiley_set)
 		{
-			if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-				continue;
+			if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']))) {
+							continue;
+			}
 
 			$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 			while ($entry = $dir->read())
 			{
-				if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-					$context['filenames'][strtolower($entry)] = array(
+				if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+									$context['filenames'][strtolower($entry)] = array(
 						'id' => $smcFunc['htmlspecialchars']($entry),
 						'selected' => false,
 					);
+				}
 			}
 			$dir->close();
 		}
@@ -809,17 +849,19 @@ 
 		// Changing the selected smileys?
 		if (isset($_POST['smiley_action']) && !empty($_POST['checked_smileys']))
 		{
-			foreach ($_POST['checked_smileys'] as $id => $smiley_id)
-				$_POST['checked_smileys'][$id] = (int) $smiley_id;
+			foreach ($_POST['checked_smileys'] as $id => $smiley_id) {
+							$_POST['checked_smileys'][$id] = (int) $smiley_id;
+			}
 
-			if ($_POST['smiley_action'] == 'delete')
-				$smcFunc['db_query']('', '
+			if ($_POST['smiley_action'] == 'delete') {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}smileys
 					WHERE id_smiley IN ({array_int:checked_smileys})',
 					array(
 						'checked_smileys' => $_POST['checked_smileys'],
 					)
 				);
+			}
 			// Changing the status of the smiley?
 			else
 			{
@@ -829,8 +871,8 @@ 
 					'hidden' => 1,
 					'popup' => 2
 				);
-				if (isset($displayTypes[$_POST['smiley_action']]))
-					$smcFunc['db_query']('', '
+				if (isset($displayTypes[$_POST['smiley_action']])) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}smileys
 						SET hidden = {int:display_type}
 						WHERE id_smiley IN ({array_int:checked_smileys})',
@@ -839,6 +881,7 @@ 
 							'display_type' => $displayTypes[$_POST['smiley_action']],
 						)
 					);
+				}
 			}
 		}
 		// Create/modify a smiley.
@@ -864,12 +907,14 @@ 
 				$_POST['smiley_location'] = empty($_POST['smiley_location']) || $_POST['smiley_location'] > 2 || $_POST['smiley_location'] < 0 ? 0 : (int) $_POST['smiley_location'];
 
 				// Make sure some code was entered.
-				if (empty($_POST['smiley_code']))
-					fatal_lang_error('smiley_has_no_code');
+				if (empty($_POST['smiley_code'])) {
+									fatal_lang_error('smiley_has_no_code');
+				}
 
 				// Also make sure a filename was given.
-				if (empty($_POST['smiley_filename']))
-					fatal_lang_error('smiley_has_no_filename');
+				if (empty($_POST['smiley_filename'])) {
+									fatal_lang_error('smiley_has_no_filename');
+				}
 
 				// Check whether the new code has duplicates. It should be unique.
 				$request = $smcFunc['db_query']('', '
@@ -883,8 +928,9 @@ 
 						'smiley_code' => $_POST['smiley_code'],
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) > 0)
-					fatal_lang_error('smiley_not_unique');
+				if ($smcFunc['db_num_rows']($request) > 0) {
+									fatal_lang_error('smiley_not_unique');
+				}
 				$smcFunc['db_free_result']($request);
 
 				$smcFunc['db_query']('', '
@@ -913,13 +959,14 @@ 
 	// Load all known smiley sets.
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Prepare overview of all (custom) smileys.
 	if ($context['sub_action'] == 'editsmileys')
@@ -935,9 +982,10 @@ 
 		// Create a list of options for selecting smiley sets.
 		$smileyset_option_list = '
 			<select name="set" onchange="changeSet(this.options[this.selectedIndex].value);">';
-		foreach ($context['smiley_sets'] as $smiley_set)
-			$smileyset_option_list .= '
+		foreach ($context['smiley_sets'] as $smiley_set) {
+					$smileyset_option_list .= '
 				<option value="' . $smiley_set['path'] . '"' . ($modSettings['smiley_sets_default'] == $smiley_set['path'] ? ' selected' : '') . '>' . $smiley_set['name'] . '</option>';
+		}
 		$smileyset_option_list .= '
 			</select>';
 
@@ -999,12 +1047,13 @@ 
 					'data' => array(
 						'function' => function ($rowData) use ($txt)
 						{
-							if (empty($rowData['hidden']))
-								return $txt['smileys_location_form'];
-							elseif ($rowData['hidden'] == 1)
-								return $txt['smileys_location_hidden'];
-							else
-								return $txt['smileys_location_popup'];
+							if (empty($rowData['hidden'])) {
+															return $txt['smileys_location_form'];
+							} elseif ($rowData['hidden'] == 1) {
+															return $txt['smileys_location_hidden'];
+							} else {
+															return $txt['smileys_location_popup'];
+							}
 						},
 					),
 					'sort' => array(
@@ -1019,19 +1068,22 @@ 
 					'data' => array(
 						'function' => function ($rowData) use ($context, $txt, $modSettings, $smcFunc)
 						{
-							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir']))
-								return $smcFunc['htmlspecialchars']($rowData['description']);
+							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'])) {
+															return $smcFunc['htmlspecialchars']($rowData['description']);
+							}
 
 							// Check if there are smileys missing in some sets.
 							$missing_sets = array();
-							foreach ($context['smiley_sets'] as $smiley_set)
-								if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
+							foreach ($context['smiley_sets'] as $smiley_set) {
+															if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
 									$missing_sets[] = $smiley_set['path'];
+							}
 
 							$description = $smcFunc['htmlspecialchars']($rowData['description']);
 
-							if (!empty($missing_sets))
-								$description .= sprintf('<br><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+							if (!empty($missing_sets)) {
+															$description .= sprintf('<br><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+							}
 
 							return $description;
 						},
@@ -1147,13 +1199,14 @@ 
 		$context['smileys_dir_found'] = is_dir($context['smileys_dir']);
 		$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 		$set_names = explode("\n", $modSettings['smiley_sets_names']);
-		foreach ($context['smiley_sets'] as $i => $set)
-			$context['smiley_sets'][$i] = array(
+		foreach ($context['smiley_sets'] as $i => $set) {
+					$context['smiley_sets'][$i] = array(
 				'id' => $i,
 				'path' => $smcFunc['htmlspecialchars']($set),
 				'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 				'selected' => $set == $modSettings['smiley_sets_default']
 			);
+		}
 
 		$context['selected_set'] = $modSettings['smiley_sets_default'];
 
@@ -1163,17 +1216,19 @@ 
 		{
 			foreach ($context['smiley_sets'] as $smiley_set)
 			{
-				if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-					continue;
+				if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']))) {
+									continue;
+				}
 
 				$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 				while ($entry = $dir->read())
 				{
-					if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-						$context['filenames'][strtolower($entry)] = array(
+					if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+											$context['filenames'][strtolower($entry)] = array(
 							'id' => $smcFunc['htmlspecialchars']($entry),
 							'selected' => false,
 						);
+					}
 				}
 				$dir->close();
 			}
@@ -1188,8 +1243,9 @@ 
 				'current_smiley' => (int) $_REQUEST['smiley'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 1)
-			fatal_lang_error('smiley_not_found');
+		if ($smcFunc['db_num_rows']($request) != 1) {
+					fatal_lang_error('smiley_not_found');
+		}
 		$context['current_smiley'] = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1197,8 +1253,9 @@ 
 		$context['current_smiley']['filename'] = $smcFunc['htmlspecialchars']($context['current_smiley']['filename']);
 		$context['current_smiley']['description'] = $smcFunc['htmlspecialchars']($context['current_smiley']['description']);
 
-		if (isset($context['filenames'][strtolower($context['current_smiley']['filename'])]))
-			$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+		if (isset($context['filenames'][strtolower($context['current_smiley']['filename'])])) {
+					$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+		}
 	}
 }
 
@@ -1223,8 +1280,9 @@ 
 		)
 	);
 	$smileys = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$smileys[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$smileys[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $smileys;
@@ -1264,8 +1322,9 @@ 
 		$_GET['location'] = empty($_GET['location']) || $_GET['location'] != 'popup' ? 0 : 2;
 		$_GET['source'] = empty($_GET['source']) ? 0 : (int) $_GET['source'];
 
-		if (empty($_GET['source']))
-			fatal_lang_error('smiley_not_found');
+		if (empty($_GET['source'])) {
+					fatal_lang_error('smiley_not_found');
+		}
 
 		if (!empty($_GET['after']))
 		{
@@ -1281,12 +1340,12 @@ 
 					'after_smiley' => $_GET['after'],
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) != 1)
-				fatal_lang_error('smiley_not_found');
+			if ($smcFunc['db_num_rows']($request) != 1) {
+							fatal_lang_error('smiley_not_found');
+			}
 			list ($smiley_row, $smiley_order, $smileyLocation) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$smiley_row = (int) $_GET['row'];
 			$smiley_order = -1;
@@ -1360,14 +1419,15 @@ 
 	$context['move_smiley'] = empty($_REQUEST['move']) ? 0 : (int) $_REQUEST['move'];
 
 	// Make sure all rows are sequential.
-	foreach (array_keys($context['smileys']) as $location)
-		$context['smileys'][$location] = array(
+	foreach (array_keys($context['smileys']) as $location) {
+			$context['smileys'][$location] = array(
 			'id' => $location,
 			'title' => $location == 'postform' ? $txt['smileys_location_form'] : $txt['smileys_location_popup'],
 			'description' => $location == 'postform' ? $txt['smileys_location_form_description'] : $txt['smileys_location_popup_description'],
 			'last_row' => count($context['smileys'][$location]['rows']),
 			'rows' => array_values($context['smileys'][$location]['rows']),
 		);
+	}
 
 	// Check & fix smileys that are not ordered properly in the database.
 	foreach (array_keys($context['smileys']) as $location)
@@ -1392,8 +1452,8 @@ 
 				$context['smileys'][$location]['rows'][$id][0]['row'] = $id;
 			}
 			// Make sure the smiley order is always sequential.
-			foreach ($smiley_row as $order_id => $smiley)
-				if ($order_id != $smiley['order'])
+			foreach ($smiley_row as $order_id => $smiley) {
+							if ($order_id != $smiley['order'])
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}smileys
 						SET smiley_order = {int:new_order}
@@ -1403,6 +1463,7 @@ 
 							'current_smiley' => $smiley['id'],
 						)
 					);
+			}
 		}
 	}
 
@@ -1436,19 +1497,20 @@ 
 
 		// Check that the smiley is from simplemachines.org, for now... maybe add mirroring later.
 		// @ TODO: Our current xml files serve http links.  Allowing both for now until we serve https.
-		if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['set_gz']) == 0 || strpos($_REQUEST['set_gz'], 'dlattach') !== false)
-			fatal_lang_error('not_on_simplemachines');
+		if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['set_gz']) == 0 || strpos($_REQUEST['set_gz'], 'dlattach') !== false) {
+					fatal_lang_error('not_on_simplemachines');
+		}
 
 		$destination = $packagesdir . '/' . $base_name;
 
-		if (file_exists($destination))
-			fatal_lang_error('package_upload_error_exists');
+		if (file_exists($destination)) {
+					fatal_lang_error('package_upload_error_exists');
+		}
 
 		// Let's copy it to the Packages directory
 		file_put_contents($destination, fetch_web_data($_REQUEST['set_gz']));
 		$testing = true;
-	}
-	elseif (isset($_REQUEST['package']))
+	} elseif (isset($_REQUEST['package']))
 	{
 		$base_name = basename($_REQUEST['package']);
 		$name = $smcFunc['htmlspecialchars'](strtok(basename($_REQUEST['package']), '.'));
@@ -1457,12 +1519,14 @@ 
 		$destination = $packagesdir . '/' . basename($_REQUEST['package']);
 	}
 
-	if (empty($destination) || !file_exists($destination))
-		fatal_lang_error('package_no_file', false);
+	if (empty($destination) || !file_exists($destination)) {
+			fatal_lang_error('package_no_file', false);
+	}
 
 	// Make sure temp directory exists and is empty.
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp', false);
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp', false);
+	}
 
 	if (!mktree($packagesdir . '/temp', 0755))
 	{
@@ -1474,31 +1538,37 @@ 
 			create_chmod_control(array($packagesdir . '/temp/delme.tmp'), array('destination_url' => $scripturl . '?action=admin;area=smileys;sa=install;set_gz=' . $_REQUEST['set_gz'], 'crash_on_error' => true));
 
 			deltree($packagesdir . '/temp', false);
-			if (!mktree($packagesdir . '/temp', 0777))
-				fatal_lang_error('package_cant_download', false);
+			if (!mktree($packagesdir . '/temp', 0777)) {
+							fatal_lang_error('package_cant_download', false);
+			}
 		}
 	}
 
 	$extracted = read_tgz_file($destination, $packagesdir . '/temp');
-	if (!$extracted)
-		fatal_lang_error('packageget_unable', false, array('https://custom.simplemachines.org/mods/index.php?action=search;type=12;basic_search=' . $name));
-	if ($extracted && !file_exists($packagesdir . '/temp/package-info.xml'))
-		foreach ($extracted as $file)
+	if (!$extracted) {
+			fatal_lang_error('packageget_unable', false, array('https://custom.simplemachines.org/mods/index.php?action=search;type=12;basic_search=' . $name));
+	}
+	if ($extracted && !file_exists($packagesdir . '/temp/package-info.xml')) {
+			foreach ($extracted as $file)
 			if (basename($file['filename']) == 'package-info.xml')
 			{
 				$base_path = dirname($file['filename']) . '/';
+	}
 				break;
 			}
 
-	if (!isset($base_path))
-		$base_path = '';
+	if (!isset($base_path)) {
+			$base_path = '';
+	}
 
-	if (!file_exists($packagesdir . '/temp/' . $base_path . 'package-info.xml'))
-		fatal_lang_error('package_get_error_missing_xml', false);
+	if (!file_exists($packagesdir . '/temp/' . $base_path . 'package-info.xml')) {
+			fatal_lang_error('package_get_error_missing_xml', false);
+	}
 
 	$smileyInfo = getPackageInfo($context['filename']);
-	if (!is_array($smileyInfo))
-		fatal_lang_error($smileyInfo);
+	if (!is_array($smileyInfo)) {
+			fatal_lang_error($smileyInfo);
+	}
 
 	// See if it is installed?
 	$request = $smcFunc['db_query']('', '
@@ -1514,8 +1584,9 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) > 0)
-		fatal_lang_error('package_installed_warning1');
+	if ($smcFunc['db_num_rows']($request) > 0) {
+			fatal_lang_error('package_installed_warning1');
+	}
 
 	// Everything is fine, now it's time to do something
 	$actions = parsePackageInfo($smileyInfo['xml'], true, 'install');
@@ -1530,23 +1601,23 @@ 
 		if ($action['type'] == 'readme' || $action['type'] == 'license')
 		{
 			$type = 'package_' . $action['type'];
-			if (file_exists($packagesdir . '/temp/' . $base_path . $action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $base_path . $action['filename']), "\n\r"));
-			elseif (file_exists($action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			if (file_exists($packagesdir . '/temp/' . $base_path . $action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $base_path . $action['filename']), "\n\r"));
+			} elseif (file_exists($action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			}
 
 			if (!empty($action['parse_bbc']))
 			{
 				require_once($sourcedir . '/Subs-Post.php');
 				preparsecode($context[$type]);
 				$context[$type] = parse_bbc($context[$type]);
+			} else {
+							$context[$type] = nl2br($context[$type]);
 			}
-			else
-				$context[$type] = nl2br($context[$type]);
 
 			continue;
-		}
-		elseif ($action['type'] == 'require-dir')
+		} elseif ($action['type'] == 'require-dir')
 		{
 			// Do this one...
 			$thisAction = array(
@@ -1565,12 +1636,12 @@ 
 				);
 			}
 			// @todo None given?
-			if (empty($thisAction['description']))
-				$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+			if (empty($thisAction['description'])) {
+							$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+			}
 
 			$context['actions'][] = $thisAction;
-		}
-		elseif ($action['type'] == 'credits')
+		} elseif ($action['type'] == 'credits')
 		{
 			// Time to build the billboard
 			$credits_tag = array(
@@ -1630,12 +1701,14 @@ 
 		cache_put_data('posting_smileys', null, 480);
 	}
 
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp');
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp');
+	}
 
-	if (!$testing)
-		redirectexit('action=admin;area=smileys');
-}
+	if (!$testing) {
+			redirectexit('action=admin;area=smileys');
+	}
+	}
 
 /**
  * A function to import new smileys from an existing directory into the database.
@@ -1646,15 +1719,17 @@ 
 {
 	global $modSettings, $smcFunc;
 
-	if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'] . '/' . $smileyPath))
-		fatal_lang_error('smiley_set_unable_to_import');
+	if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'] . '/' . $smileyPath)) {
+			fatal_lang_error('smiley_set_unable_to_import');
+	}
 
 	$smileys = array();
 	$dir = dir($modSettings['smileys_dir'] . '/' . $smileyPath);
 	while ($entry = $dir->read())
 	{
-		if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-			$smileys[strtolower($entry)] = $entry;
+		if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+					$smileys[strtolower($entry)] = $entry;
+		}
 	}
 	$dir->close();
 
@@ -1667,9 +1742,10 @@ 
 			'smiley_list' => $smileys,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (isset($smileys[strtolower($row['filename'])]))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (isset($smileys[strtolower($row['filename'])]))
 			unset($smileys[strtolower($row['filename'])]);
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -1686,9 +1762,10 @@ 
 	$smcFunc['db_free_result']($request);
 
 	$new_smileys = array();
-	foreach ($smileys as $smiley)
-		if (strlen($smiley) <= 48)
+	foreach ($smileys as $smiley) {
+			if (strlen($smiley) <= 48)
 			$new_smileys[] = array(':' . strtok($smiley, '.') . ':', $smiley, strtok($smiley, '.'), 0, ++$smiley_order);
+	}
 
 	if (!empty($new_smileys))
 	{
@@ -1753,8 +1830,9 @@ 
 		if (isset($_POST['delete']) && !empty($_POST['checked_icons']))
 		{
 			$deleteIcons = array();
-			foreach ($_POST['checked_icons'] as $icon)
-				$deleteIcons[] = (int) $icon;
+			foreach ($_POST['checked_icons'] as $icon) {
+							$deleteIcons[] = (int) $icon;
+			}
 
 			// Do the actual delete!
 			$smcFunc['db_query']('', '
@@ -1771,35 +1849,41 @@ 
 			$_GET['icon'] = (int) $_GET['icon'];
 
 			// Do some preperation with the data... like check the icon exists *somewhere*
-			if (strpos($_POST['icon_filename'], '.png') !== false)
-				$_POST['icon_filename'] = substr($_POST['icon_filename'], 0, -4);
-			if (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon_filename'] . '.png'))
-				fatal_lang_error('icon_not_found');
+			if (strpos($_POST['icon_filename'], '.png') !== false) {
+							$_POST['icon_filename'] = substr($_POST['icon_filename'], 0, -4);
+			}
+			if (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon_filename'] . '.png')) {
+							fatal_lang_error('icon_not_found');
+			}
 			// There is a 16 character limit on message icons...
-			elseif (strlen($_POST['icon_filename']) > 16)
-				fatal_lang_error('icon_name_too_long');
-			elseif ($_POST['icon_location'] == $_GET['icon'] && !empty($_GET['icon']))
-				fatal_lang_error('icon_after_itself');
+			elseif (strlen($_POST['icon_filename']) > 16) {
+							fatal_lang_error('icon_name_too_long');
+			} elseif ($_POST['icon_location'] == $_GET['icon'] && !empty($_GET['icon'])) {
+							fatal_lang_error('icon_after_itself');
+			}
 
 			// First do the sorting... if this is an edit reduce the order of everything after it by one ;)
 			if ($_GET['icon'] != 0)
 			{
 				$oldOrder = $context['icons'][$_GET['icon']]['true_order'];
-				foreach ($context['icons'] as $id => $data)
-					if ($data['true_order'] > $oldOrder)
+				foreach ($context['icons'] as $id => $data) {
+									if ($data['true_order'] > $oldOrder)
 						$context['icons'][$id]['true_order']--;
+				}
 			}
 
 			// If there are no existing icons and this is a new one, set the id to 1 (mainly for non-mysql)
-			if (empty($_GET['icon']) && empty($context['icons']))
-				$_GET['icon'] = 1;
+			if (empty($_GET['icon']) && empty($context['icons'])) {
+							$_GET['icon'] = 1;
+			}
 
 			// Get the new order.
 			$newOrder = $_POST['icon_location'] == 0 ? 0 : $context['icons'][$_POST['icon_location']]['true_order'] + 1;
 			// Do the same, but with the one that used to be after this icon, done to avoid conflict.
-			foreach ($context['icons'] as $id => $data)
-				if ($data['true_order'] >= $newOrder)
+			foreach ($context['icons'] as $id => $data) {
+							if ($data['true_order'] >= $newOrder)
 					$context['icons'][$id]['true_order']++;
+			}
 
 			// Finally set the current icon's position!
 			$context['icons'][$_GET['icon']]['true_order'] = $newOrder;
@@ -1817,8 +1901,7 @@ 
 				if ($id != 0)
 				{
 					$iconInsert[] = array($id, $icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
-				}
-				else
+				} else
 				{
 					$iconInsert_new[] = array($icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
 				}
@@ -1843,8 +1926,9 @@ 
 		}
 
 		// Unless we're adding a new thing, we'll escape
-		if (!isset($_POST['add']))
-			redirectexit('action=admin;area=smileys;sa=editicons');
+		if (!isset($_POST['add'])) {
+					redirectexit('action=admin;area=smileys;sa=editicons');
+		}
 	}
 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'editicons';
@@ -1954,8 +2038,9 @@ 
 		$context['new_icon'] = !isset($_GET['icon']);
 
 		// Get the properties of the current icon from the icon list.
-		if (!$context['new_icon'])
-			$context['icon'] = $context['icons'][$_GET['icon']];
+		if (!$context['new_icon']) {
+					$context['icon'] = $context['icons'][$_GET['icon']];
+		}
 
 		// Get a list of boards needed for assigning this icon to a specific board.
 		$boardListOptions = array(
@@ -1989,8 +2074,9 @@ 
 	);
 
 	$message_icons = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$message_icons[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$message_icons[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $message_icons;

Spacing +10 added lines, -10 removed lines

@@ -393,7 +393,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return $rowData['selected'] ? '<span class="generic_icons valid"></span>' : '';
 					},
@@ -453,7 +453,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return $rowData['selected'] ? '' : sprintf('<input type="checkbox" name="smiley_set[%1$d]">', $rowData['id']);
 					},
@@ -997,7 +997,7 @@ 
 						'value' => $txt['smileys_location'],
 					),
 					'data' => array(
-						'function' => function ($rowData) use ($txt)
+						'function' => function($rowData) use ($txt)
 						{
 							if (empty($rowData['hidden']))
 								return $txt['smileys_location_form'];
@@ -1008,7 +1008,7 @@ 
 						},
 					),
 					'sort' => array(
-						'default' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations)) ,
+						'default' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations)),
 						'reverse' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations), true),
 					),
 				),
@@ -1017,7 +1017,7 @@ 
 						'value' => $txt['smileys_description'],
 					),
 					'data' => array(
-						'function' => function ($rowData) use ($context, $txt, $modSettings, $smcFunc)
+						'function' => function($rowData) use ($context, $txt, $modSettings, $smcFunc)
 						{
 							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir']))
 								return $smcFunc['htmlspecialchars']($rowData['description']);
@@ -1554,7 +1554,7 @@ 
 				'action' => $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.')))
 			);
 
-			$file =  $packagesdir . '/temp/' . $base_path . $action['filename'];
+			$file = $packagesdir . '/temp/' . $base_path . $action['filename'];
 			if (isset($action['filename']) && (!file_exists($file) || !is_writable(dirname($action['destination']))))
 			{
 				$context['has_failure'] = true;
@@ -1599,7 +1599,7 @@ 
 		{
 			updateSettings(array(
 				'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . basename($action['action']),
-				'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' .  (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''),
+				'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' . (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''),
 			));
 		}
 
@@ -1611,7 +1611,7 @@ 
 			'{db_prefix}log_packages',
 			array(
 				'filename' => 'string', 'name' => 'string', 'package_id' => 'string', 'version' => 'string',
-				'id_member_installed' => 'int', 'member_installed' => 'string','time_installed' => 'int',
+				'id_member_installed' => 'int', 'member_installed' => 'string', 'time_installed' => 'int',
 				'install_state' => 'int', 'failed_steps' => 'string', 'themes_installed' => 'string',
 				'member_removed' => 'int', 'db_changes' => 'string', 'credits' => 'string',
 			),
@@ -1860,7 +1860,7 @@ 
 		'columns' => array(
 			'icon' => array(
 				'data' => array(
-					'function' => function ($rowData) use ($settings, $smcFunc)
+					'function' => function($rowData) use ($settings, $smcFunc)
 					{
 						$images_url = $settings[file_exists(sprintf('%1$s/images/post/%2$s.png', $settings['theme_dir'], $rowData['filename'])) ? 'actual_images_url' : 'default_images_url'];
 						return sprintf('<img src="%1$s/post/%2$s.png" alt="%3$s">', $images_url, $rowData['filename'], $smcFunc['htmlspecialchars']($rowData['title']));
@@ -1894,7 +1894,7 @@ 
 					'value' => $txt['icons_board'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return empty($rowData['board_name']) ? $txt['icons_edit_icons_all_boards'] : $rowData['board_name'];
 					},

Sources/Subs-MessageIndex.php

Braces +13 added lines, -10 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Generates the query to determine the list of available boards for a user
@@ -25,8 +26,9 @@ 
 {
 	global $smcFunc, $sourcedir;
 
-	if (isset($boardListOptions['excluded_boards']) && isset($boardListOptions['included_boards']))
-		trigger_error('getBoardList(): Setting both excluded_boards and included_boards is not allowed.', E_USER_ERROR);
+	if (isset($boardListOptions['excluded_boards']) && isset($boardListOptions['included_boards'])) {
+			trigger_error('getBoardList(): Setting both excluded_boards and included_boards is not allowed.', E_USER_ERROR);
+	}
 
 	$where = array();
 	$where_parameters = array();
@@ -42,11 +44,11 @@ 
 		$where_parameters['included_boards'] = $boardListOptions['included_boards'];
 	}
 
-	if (!empty($boardListOptions['ignore_boards']))
-		$where[] = '{query_wanna_see_board}';
-
-	elseif (!empty($boardListOptions['use_permissions']))
-		$where[] = '{query_see_board}';
+	if (!empty($boardListOptions['ignore_boards'])) {
+			$where[] = '{query_wanna_see_board}';
+	} elseif (!empty($boardListOptions['use_permissions'])) {
+			$where[] = '{query_see_board}';
+	}
 
 	if (!empty($boardListOptions['not_redirection']))
 	{
@@ -68,12 +70,13 @@ 
 	{
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($return_value[$row['id_cat']]))
-				$return_value[$row['id_cat']] = array(
+			if (!isset($return_value[$row['id_cat']])) {
+							$return_value[$row['id_cat']] = array(
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
 					'boards' => array(),
 				);
+			}
 
 			$return_value[$row['id_cat']]['boards'][$row['id_board']] = array(
 				'id' => $row['id_board'],

Sources/DbSearch-mysql.php

Braces +13 added lines, -10 removed lines

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

Sources/CacheAPI-xcache.php

Braces +19 added lines, -13 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -44,8 +45,9 @@ 
 	{
 		$supported = function_exists('xcache_get') && function_exists('xcache_set') && ini_get('xcache.var_size') > 0;
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -66,10 +68,11 @@ 
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
-		if ($value === null)
-			return xcache_unset($key);
-		else
-			return xcache_set($key, $value, $ttl);
+		if ($value === null) {
+					return xcache_unset($key);
+		} else {
+					return xcache_set($key, $value, $ttl);
+		}
 	}
 
 	/**
@@ -88,10 +91,12 @@ 
 		}
 
 		// if passed a type, clear that type out
-		if ($type === '' || $type === 'user')
-			xcache_clear_cache(XC_TYPE_VAR, 0);
-		if ($type === '' || $type === 'data')
-			xcache_clear_cache(XC_TYPE_PHP, 0);
+		if ($type === '' || $type === 'user') {
+					xcache_clear_cache(XC_TYPE_VAR, 0);
+		}
+		if ($type === '' || $type === 'data') {
+					xcache_clear_cache(XC_TYPE_PHP, 0);
+		}
 
 		$this->invalidateCache();
 		return true;
@@ -110,8 +115,9 @@ 
 		// While we could md5 this when saving, this could be tricky to be sure it doesn't get corrupted on additional saves.
 		$config_vars[] = array('xcache_adminpass', $txt['cache_xcache_adminpass'], 'db', 'text', 0);
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {

Sources/Reminder.php

Braces +66 added lines, -46 removed lines

@@ -12,8 +12,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the controlling delegator
@@ -38,13 +39,15 @@ 
 	);
 
 	// Any subaction?  If none, fall through to the main template, which will ask for one.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		call_helper($subActions[$_REQUEST['sa']]);
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			call_helper($subActions[$_REQUEST['sa']]);
+	}
 
 	// Creating a one time token.
-	else
-		createToken('remind');
-}
+	else {
+			createToken('remind');
+	}
+	}
 
 /**
  * Allows the user to pick how they wish to be reminded
@@ -62,8 +65,7 @@ 
 	{
 		$where = 'id_member = {int:id_member}';
 		$where_params['id_member'] = (int) $_REQUEST['uid'];
-	}
-	elseif (isset($_POST['user']) && $_POST['user'] != '')
+	} elseif (isset($_POST['user']) && $_POST['user'] != '')
 	{
 		$where = 'member_name = {string:member_name}';
 		$where_params['member_name'] = $_POST['user'];
@@ -71,8 +73,9 @@ 
 	}
 
 	// You must enter a username/email address.
-	if (empty($where))
-		fatal_lang_error('username_no_exist', false);
+	if (empty($where)) {
+			fatal_lang_error('username_no_exist', false);
+	}
 
 	// Make sure we are not being slammed
 	// Don't call this if you're coming from the "Choose a reminder type" page - otherwise you'll likely get an error
@@ -101,8 +104,9 @@ 
 			LIMIT 1',
 			$where_params
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_user_with_email', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_user_with_email', false);
+		}
 	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
@@ -112,16 +116,18 @@ 
 	if ($row['is_activated'] != 1)
 	{
 		// Awaiting approval...
-		if (trim($row['validation_code']) == '')
-			fatal_error(sprintf($txt['registration_not_approved'], $scripturl . '?action=activate;user=' . $_POST['user']), false);
-		else
-			fatal_error(sprintf($txt['registration_not_activated'], $scripturl . '?action=activate;user=' . $_POST['user']), false);
+		if (trim($row['validation_code']) == '') {
+					fatal_error(sprintf($txt['registration_not_approved'], $scripturl . '?action=activate;user=' . $_POST['user']), false);
+		} else {
+					fatal_error(sprintf($txt['registration_not_activated'], $scripturl . '?action=activate;user=' . $_POST['user']), false);
+		}
 	}
 
 	// You can't get emailed if you have no email address.
 	$row['email_address'] = trim($row['email_address']);
-	if ($row['email_address'] == '')
-		fatal_error($txt['no_reminder_email'] . '<br>' . $txt['send_email'] . ' <a href="mailto:' . $webmaster_email . '">webmaster</a> ' . $txt['to_ask_password'] . '.');
+	if ($row['email_address'] == '') {
+			fatal_error($txt['no_reminder_email'] . '<br>' . $txt['send_email'] . ' <a href="mailto:' . $webmaster_email . '">webmaster</a> ' . $txt['to_ask_password'] . '.');
+	}
 
 	// If they have no secret question then they can only get emailed the item, or they are requesting the email, send them an email.
 	if (empty($row['secret_question']) || (isset($_POST['reminder_type']) && $_POST['reminder_type'] == 'email'))
@@ -176,8 +182,9 @@ 
 	loadLanguage('Login');
 
 	// You need a code!
-	if (!isset($_REQUEST['code']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_REQUEST['code'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Fill the context array.
 	$context += array(
@@ -203,16 +210,19 @@ 
 	checkSession();
 	validateToken('remind-sp');
 
-	if (empty($_POST['u']) || !isset($_POST['passwrd1']) || !isset($_POST['passwrd2']))
-		fatal_lang_error('no_access', false);
+	if (empty($_POST['u']) || !isset($_POST['passwrd1']) || !isset($_POST['passwrd2'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$_POST['u'] = (int) $_POST['u'];
 
-	if ($_POST['passwrd1'] != $_POST['passwrd2'])
-		fatal_lang_error('passwords_dont_match', false);
+	if ($_POST['passwrd1'] != $_POST['passwrd2']) {
+			fatal_lang_error('passwords_dont_match', false);
+	}
 
-	if ($_POST['passwrd1'] == '')
-		fatal_lang_error('no_password', false);
+	if ($_POST['passwrd1'] == '') {
+			fatal_lang_error('no_password', false);
+	}
 
 	loadLanguage('Login');
 
@@ -232,8 +242,9 @@ 
 	);
 
 	// Does this user exist at all?
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('invalid_userid', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('invalid_userid', false);
+	}
 
 	list ($realCode, $username, $email, $flood_value) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
@@ -243,8 +254,9 @@ 
 	$passwordError = validatePassword($_POST['passwrd1'], $username, array($email));
 
 	// What - it's not?
-	if ($passwordError != null)
-		fatal_lang_error('profile_error_password_' . $passwordError, false);
+	if ($passwordError != null) {
+			fatal_lang_error('profile_error_password_' . $passwordError, false);
+	}
 
 	require_once($sourcedir . '/LogInOut.php');
 
@@ -291,8 +303,9 @@ 
 	loadLanguage('Login');
 
 	// Check they entered something...
-	if (empty($_REQUEST['uid']))
-		fatal_lang_error('username_no_exist', false);
+	if (empty($_REQUEST['uid'])) {
+			fatal_lang_error('username_no_exist', false);
+	}
 
 	// Get the stuff....
 	$request = $smcFunc['db_query']('', '
@@ -304,15 +317,17 @@ 
 			'id_member' => (int) $_REQUEST['uid'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('username_no_exist', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('username_no_exist', false);
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
 	// If there is NO secret question - then throw an error.
-	if (trim($row['secret_question']) == '')
-		fatal_lang_error('registration_no_secret_question', false);
+	if (trim($row['secret_question']) == '') {
+			fatal_lang_error('registration_no_secret_question', false);
+	}
 
 	// Ask for the answer...
 	$context['remind_user'] = $row['id_member'];
@@ -335,8 +350,9 @@ 
 	validateToken('remind-sai');
 
 	// Hacker?  How did you get this far without an email or username?
-	if (empty($_REQUEST['uid']))
-		fatal_lang_error('username_no_exist', false);
+	if (empty($_REQUEST['uid'])) {
+			fatal_lang_error('username_no_exist', false);
+	}
 
 	loadLanguage('Login');
 
@@ -350,8 +366,9 @@ 
 			'id_member' => $_REQUEST['uid'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('username_no_exist', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('username_no_exist', false);
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
@@ -364,20 +381,23 @@ 
 	}
 
 	// You can't use a blank one!
-	if (strlen(trim($_POST['passwrd1'])) === 0)
-		fatal_lang_error('no_password', false);
+	if (strlen(trim($_POST['passwrd1'])) === 0) {
+			fatal_lang_error('no_password', false);
+	}
 
 	// They have to be the same too.
-	if ($_POST['passwrd1'] != $_POST['passwrd2'])
-		fatal_lang_error('passwords_dont_match', false);
+	if ($_POST['passwrd1'] != $_POST['passwrd2']) {
+			fatal_lang_error('passwords_dont_match', false);
+	}
 
 	// Make sure they have a strong enough password.
 	require_once($sourcedir . '/Subs-Auth.php');
 	$passwordError = validatePassword($_POST['passwrd1'], $row['member_name'], array($row['email_address']));
 
 	// Invalid?
-	if ($passwordError != null)
-		fatal_lang_error('profile_error_password_' . $passwordError, false);
+	if ($passwordError != null) {
+			fatal_lang_error('profile_error_password_' . $passwordError, false);
+	}
 
 	// Alright, so long as 'yer sure.
 	updateMemberData($row['id_member'], array('passwd' => hash_password($row['member_name'], $_POST['passwrd1'])));

Sources/Subs-Notify.php

Braces +17 added lines, -11 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Fetches the list of preferences (or a single/subset of preferences) for
@@ -30,8 +31,9 @@ 
 	// We want this as an array whether it is or not.
 	$members = is_array($members) ? $members : (array) $members;
 
-	if (!empty($prefs))
-		$prefs = is_array($prefs) ? $prefs : (array) $prefs;
+	if (!empty($prefs)) {
+			$prefs = is_array($prefs) ? $prefs : (array) $prefs;
+	}
 
 	$result = array();
 
@@ -56,9 +58,10 @@ 
 	// We may want to keep the default values separate from a given user's. Or we might not.
 	if ($process_default && isset($result[0]))
 	{
-		foreach ($members as $member)
-			if (!isset($result[$member]))
+		foreach ($members as $member) {
+					if (!isset($result[$member]))
 				$result[$member] = $result[0];
+		}
 
 		unset ($result[0]);
 	}
@@ -76,12 +79,14 @@ 
 {
 	global $smcFunc;
 
-	if (empty($prefs) || !is_int($memID))
-		return;
+	if (empty($prefs) || !is_int($memID)) {
+			return;
+	}
 
 	$update_rows = array();
-	foreach ($prefs as $k => $v)
-		$update_rows[] = array($memID, $k, $v);
+	foreach ($prefs as $k => $v) {
+			$update_rows[] = array($memID, $k, $v);
+	}
 
 	$smcFunc['db_insert']('replace',
 		'{db_prefix}user_alerts_prefs',
@@ -101,8 +106,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($prefs) || empty($memID))
-		return;
+	if (empty($prefs) || empty($memID)) {
+			return;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}user_alerts_prefs

Sources/ViewQuery.php

Braces +34 added lines, -26 removed lines

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

Sources/ManagePermissions.php

Braces +312 added lines, -223 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Dispatches to the right function based on the given subaction.
@@ -176,8 +177,9 @@ 
 		// If it's inherited, just add it as a child.
 		if ($row['id_parent'] != -2)
 		{
-			if (isset($context['groups'][$row['id_parent']]))
-				$context['groups'][$row['id_parent']]['children'][$row['id_group']] = $row['group_name'];
+			if (isset($context['groups'][$row['id_parent']])) {
+							$context['groups'][$row['id_parent']]['children'][$row['id_group']] = $row['group_name'];
+			}
 			continue;
 		}
 
@@ -202,10 +204,11 @@ 
 			'access' => false,
 		);
 
-		if ($row['min_posts'] == -1)
-			$normalGroups[$row['id_group']] = $row['id_group'];
-		else
-			$postGroups[$row['id_group']] = $row['id_group'];
+		if ($row['min_posts'] == -1) {
+					$normalGroups[$row['id_group']] = $row['id_group'];
+		} else {
+					$postGroups[$row['id_group']] = $row['id_group'];
+		}
 	}
 	$smcFunc['db_free_result']($query);
 
@@ -221,8 +224,9 @@ 
 				'post_group_list' => $postGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -238,8 +242,9 @@ 
 				'normal_group_list' => $normalGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 
 		// This one is slower, but it's okay... careful not to count twice!
@@ -256,15 +261,17 @@ 
 				'blank_string' => '',
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
 	foreach ($context['groups'] as $id => $data)
 	{
-		if ($data['href'] != '')
-			$context['groups'][$id]['link'] = '<a href="' . $data['href'] . '">' . $data['num_members'] . '</a>';
+		if ($data['href'] != '') {
+					$context['groups'][$id]['link'] = '<a href="' . $data['href'] . '">' . $data['num_members'] . '</a>';
+		}
 	}
 
 	if (empty($_REQUEST['pid']))
@@ -278,9 +285,10 @@ 
 				'hidden_permissions' => !empty($context['hidden_permissions']) ? $context['hidden_permissions'] : array(),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
 				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] = $row['num_permissions'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Get the "default" profile permissions too.
@@ -297,17 +305,18 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
-				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1)) {
+							$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		$_REQUEST['pid'] = (int) $_REQUEST['pid'];
 
-		if (!isset($context['profiles'][$_REQUEST['pid']]))
-			fatal_lang_error('no_access', false);
+		if (!isset($context['profiles'][$_REQUEST['pid']])) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// Change the selected tab to better reflect that this really is a board profile.
 		$context[$context['admin_menu_name']]['current_subsection'] = 'profiles';
@@ -323,8 +332,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
-				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1)) {
+							$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -366,8 +376,8 @@ 
 
 		if (!empty($changes))
 		{
-			foreach ($changes as $profile => $boards)
-				$smcFunc['db_query']('', '
+			foreach ($changes as $profile => $boards) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET id_profile = {int:current_profile}
 					WHERE id_board IN ({array_int:board_list})',
@@ -376,6 +386,7 @@ 
 						'current_profile' => $profile,
 					)
 				);
+			}
 		}
 
 		$context['edit_all'] = false;
@@ -400,8 +411,9 @@ 
 		);
 		foreach ($boardList[$catid] as $boardid)
 		{
-			if (!isset($context['profiles'][$boards[$boardid]['profile']]))
-				$boards[$boardid]['profile'] = 1;
+			if (!isset($context['profiles'][$boards[$boardid]['profile']])) {
+							$boards[$boardid]['profile'] = 1;
+			}
 
 			$context['categories'][$catid]['boards'][$boardid] = array(
 				'id' => &$boards[$boardid]['id'],
@@ -433,64 +445,74 @@ 
 	loadIllegalGuestPermissions();
 
 	// Make sure only one of the quick options was selected.
-	if ((!empty($_POST['predefined']) && ((isset($_POST['copy_from']) && $_POST['copy_from'] != 'empty') || !empty($_POST['permissions']))) || (!empty($_POST['copy_from']) && $_POST['copy_from'] != 'empty' && !empty($_POST['permissions'])))
-		fatal_lang_error('permissions_only_one_option', false);
+	if ((!empty($_POST['predefined']) && ((isset($_POST['copy_from']) && $_POST['copy_from'] != 'empty') || !empty($_POST['permissions']))) || (!empty($_POST['copy_from']) && $_POST['copy_from'] != 'empty' && !empty($_POST['permissions']))) {
+			fatal_lang_error('permissions_only_one_option', false);
+	}
 
-	if (empty($_POST['group']) || !is_array($_POST['group']))
-		$_POST['group'] = array();
+	if (empty($_POST['group']) || !is_array($_POST['group'])) {
+			$_POST['group'] = array();
+	}
 
 	// Only accept numeric values for selected membergroups.
-	foreach ($_POST['group'] as $id => $group_id)
-		$_POST['group'][$id] = (int) $group_id;
+	foreach ($_POST['group'] as $id => $group_id) {
+			$_POST['group'][$id] = (int) $group_id;
+	}
 	$_POST['group'] = array_unique($_POST['group']);
 
-	if (empty($_REQUEST['pid']))
-		$_REQUEST['pid'] = 0;
-	else
-		$_REQUEST['pid'] = (int) $_REQUEST['pid'];
+	if (empty($_REQUEST['pid'])) {
+			$_REQUEST['pid'] = 0;
+	} else {
+			$_REQUEST['pid'] = (int) $_REQUEST['pid'];
+	}
 
 	// Fix up the old global to the new default!
 	$bid = max(1, $_REQUEST['pid']);
 
 	// No modifying the predefined profiles.
-	if ($_REQUEST['pid'] > 1 && $_REQUEST['pid'] < 5)
-		fatal_lang_error('no_access', false);
+	if ($_REQUEST['pid'] > 1 && $_REQUEST['pid'] < 5) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Clear out any cached authority.
 	updateSettings(array('settings_updated' => time()));
 
 	// No groups where selected.
-	if (empty($_POST['group']))
-		redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+	if (empty($_POST['group'])) {
+			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+	}
 
 	// Set a predefined permission profile.
 	if (!empty($_POST['predefined']))
 	{
 		// Make sure it's a predefined permission set we expect.
-		if (!in_array($_POST['predefined'], array('restrict', 'standard', 'moderator', 'maintenance')))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!in_array($_POST['predefined'], array('restrict', 'standard', 'moderator', 'maintenance'))) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		foreach ($_POST['group'] as $group_id)
 		{
-			if (!empty($_REQUEST['pid']))
-				setPermissionLevel($_POST['predefined'], $group_id, $_REQUEST['pid']);
-			else
-				setPermissionLevel($_POST['predefined'], $group_id);
+			if (!empty($_REQUEST['pid'])) {
+							setPermissionLevel($_POST['predefined'], $group_id, $_REQUEST['pid']);
+			} else {
+							setPermissionLevel($_POST['predefined'], $group_id);
+			}
 		}
 	}
 	// Set a permission profile based on the permissions of a selected group.
 	elseif ($_POST['copy_from'] != 'empty')
 	{
 		// Just checking the input.
-		if (!is_numeric($_POST['copy_from']))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!is_numeric($_POST['copy_from'])) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		// Make sure the group we're copying to is never included.
 		$_POST['group'] = array_diff($_POST['group'], array($_POST['copy_from']));
 
 		// No groups left? Too bad.
-		if (empty($_POST['group']))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (empty($_POST['group'])) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		if (empty($_REQUEST['pid']))
 		{
@@ -504,22 +526,26 @@ 
 				)
 			);
 			$target_perm = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$target_perm[$row['permission']] = $row['add_deny'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$target_perm[$row['permission']] = $row['add_deny'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$inserts = array();
-			foreach ($_POST['group'] as $group_id)
-				foreach ($target_perm as $perm => $add_deny)
+			foreach ($_POST['group'] as $group_id) {
+							foreach ($target_perm as $perm => $add_deny)
 				{
 					// No dodgy permissions please!
 					if (!empty($context['illegal_permissions']) && in_array($perm, $context['illegal_permissions']))
 						continue;
-					if ($group_id == -1 && in_array($perm, $context['non_guest_permissions']))
-						continue;
+			}
+					if ($group_id == -1 && in_array($perm, $context['non_guest_permissions'])) {
+											continue;
+					}
 
-					if ($group_id != 1 && $group_id != 3)
-						$inserts[] = array($perm, $group_id, $add_deny);
+					if ($group_id != 1 && $group_id != 3) {
+											$inserts[] = array($perm, $group_id, $add_deny);
+					}
 				}
 
 			// Delete the previous permissions...
@@ -559,17 +585,19 @@ 
 			)
 		);
 		$target_perm = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$target_perm[$row['permission']] = $row['add_deny'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$target_perm[$row['permission']] = $row['add_deny'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$inserts = array();
-		foreach ($_POST['group'] as $group_id)
-			foreach ($target_perm as $perm => $add_deny)
+		foreach ($_POST['group'] as $group_id) {
+					foreach ($target_perm as $perm => $add_deny)
 			{
 				// Are these for guests?
 				if ($group_id == -1 && in_array($perm, $context['non_guest_permissions']))
 					continue;
+		}
 
 				$inserts[] = array($perm, $group_id, $bid, $add_deny);
 			}
@@ -607,13 +635,14 @@ 
 		list ($permissionType, $permission) = explode('/', $_POST['permissions']);
 
 		// Check whether our input is within expected range.
-		if (!in_array($_POST['add_remove'], array('add', 'clear', 'deny')) || !in_array($permissionType, array('membergroup', 'board')))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!in_array($_POST['add_remove'], array('add', 'clear', 'deny')) || !in_array($permissionType, array('membergroup', 'board'))) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		if ($_POST['add_remove'] == 'clear')
 		{
-			if ($permissionType == 'membergroup')
-				$smcFunc['db_query']('', '
+			if ($permissionType == 'membergroup') {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}permissions
 					WHERE id_group IN ({array_int:current_group_list})
 						AND permission = {string:current_permission}
@@ -624,8 +653,8 @@ 
 						'illegal_permissions' => !empty($context['illegal_permissions']) ? $context['illegal_permissions'] : array(),
 					)
 				);
-			else
-				$smcFunc['db_query']('', '
+			} else {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}board_permissions
 					WHERE id_group IN ({array_int:current_group_list})
 						AND id_profile = {int:current_profile}
@@ -636,6 +665,7 @@ 
 						'current_permission' => $permission,
 					)
 				);
+			}
 		}
 		// Add a permission (either 'set' or 'deny').
 		else
@@ -644,32 +674,36 @@ 
 			$permChange = array();
 			foreach ($_POST['group'] as $groupID)
 			{
-				if ($groupID == -1 && in_array($permission, $context['non_guest_permissions']))
-					continue;
+				if ($groupID == -1 && in_array($permission, $context['non_guest_permissions'])) {
+									continue;
+				}
 
-				if ($permissionType == 'membergroup' && $groupID != 1 && $groupID != 3 && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions'])))
-					$permChange[] = array($permission, $groupID, $add_deny);
-				elseif ($permissionType != 'membergroup')
-					$permChange[] = array($permission, $groupID, $bid, $add_deny);
+				if ($permissionType == 'membergroup' && $groupID != 1 && $groupID != 3 && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions']))) {
+									$permChange[] = array($permission, $groupID, $add_deny);
+				} elseif ($permissionType != 'membergroup') {
+									$permChange[] = array($permission, $groupID, $bid, $add_deny);
+				}
 			}
 
 			if (!empty($permChange))
 			{
-				if ($permissionType == 'membergroup')
-					$smcFunc['db_insert']('replace',
+				if ($permissionType == 'membergroup') {
+									$smcFunc['db_insert']('replace',
 						'{db_prefix}permissions',
 						array('permission' => 'string', 'id_group' => 'int', 'add_deny' => 'int'),
 						$permChange,
 						array('permission', 'id_group')
 					);
+				}
 				// Board permissions go into the other table.
-				else
-					$smcFunc['db_insert']('replace',
+				else {
+									$smcFunc['db_insert']('replace',
 						'{db_prefix}board_permissions',
 						array('permission' => 'string', 'id_group' => 'int', 'id_profile' => 'int', 'add_deny' => 'int'),
 						$permChange,
 						array('permission', 'id_group', 'id_profile')
 					);
+				}
 			}
 		}
 
@@ -687,14 +721,16 @@ 
 {
 	global $context, $txt, $smcFunc, $modSettings;
 
-	if (!isset($_GET['group']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['group'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$context['group']['id'] = (int) $_GET['group'];
 
 	// It's not likely you'd end up here with this setting disabled.
-	if ($_GET['group'] == 1)
-		redirectexit('action=admin;area=permissions');
+	if ($_GET['group'] == 1) {
+			redirectexit('action=admin;area=permissions');
+	}
 
 	loadAllPermissions();
 	loadPermissionProfiles();
@@ -715,13 +751,14 @@ 
 		$smcFunc['db_free_result']($result);
 
 		// Cannot edit an inherited group!
-		if ($parent != -2)
-			fatal_lang_error('cannot_edit_permissions_inherited');
+		if ($parent != -2) {
+					fatal_lang_error('cannot_edit_permissions_inherited');
+		}
+	} elseif ($context['group']['id'] == -1) {
+			$context['group']['name'] = $txt['membergroups_guests'];
+	} else {
+			$context['group']['name'] = $txt['membergroups_members'];
 	}
-	elseif ($context['group']['id'] == -1)
-		$context['group']['name'] = $txt['membergroups_guests'];
-	else
-		$context['group']['name'] = $txt['membergroups_members'];
 
 	$context['profile']['id'] = empty($_GET['pid']) ? 0 : (int) $_GET['pid'];
 
@@ -767,8 +804,9 @@ 
 				'current_group' => $_GET['group'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$permissions['membergroup'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$permissions['membergroup'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+		}
 		$smcFunc['db_free_result']($result);
 	}
 
@@ -783,8 +821,9 @@ 
 			'current_profile' => $context['permission_type'] == 'membergroup' ? 1 : $context['profile']['id'],
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$permissions['board'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$permissions['board'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	}
 	$smcFunc['db_free_result']($result);
 
 	// Loop through each permission and set whether it's checked.
@@ -803,9 +842,9 @@ 
 					{
 						$curPerm['any']['select'] = in_array($perm['id'] . '_any', $permissions[$permissionType]['allowed']) ? 'on' : (in_array($perm['id'] . '_any', $permissions[$permissionType]['denied']) ? 'deny' : 'off');
 						$curPerm['own']['select'] = in_array($perm['id'] . '_own', $permissions[$permissionType]['allowed']) ? 'on' : (in_array($perm['id'] . '_own', $permissions[$permissionType]['denied']) ? 'deny' : 'off');
+					} else {
+											$curPerm['select'] = in_array($perm['id'], $permissions[$permissionType]['denied']) ? 'deny' : (in_array($perm['id'], $permissions[$permissionType]['allowed']) ? 'on' : 'off');
 					}
-					else
-						$curPerm['select'] = in_array($perm['id'], $permissions[$permissionType]['denied']) ? 'deny' : (in_array($perm['id'], $permissions[$permissionType]['allowed']) ? 'on' : 'off');
 
 						// Keep the last value if it's hidden.
 						if ($perm['hidden'] || $permissionArray['hidden'])
@@ -822,13 +861,13 @@ 
 									$perm['any']['id'],
 									$curPerm['any']['select'] == 'deny' && !empty($modSettings['permission_enable_deny']) ? 'deny' : $curPerm['any']['select'],
 								);
-							}
-							else
-								$context['hidden_perms'][] = array(
+							} else {
+															$context['hidden_perms'][] = array(
 									$permissionType,
 									$perm['id'],
 									$curPerm['select'] == 'deny' && !empty($modSettings['permission_enable_deny']) ? 'deny' : $curPerm['select'],
 								);
+							}
 						}
 				}
 			}
@@ -856,13 +895,14 @@ 
 	$_GET['pid'] = (int) $_GET['pid'];
 
 	// Cannot modify predefined profiles.
-	if ($_GET['pid'] > 1 && $_GET['pid'] < 5)
-		fatal_lang_error('no_access', false);
+	if ($_GET['pid'] > 1 && $_GET['pid'] < 5) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Verify this isn't inherited.
-	if ($_GET['group'] == -1 || $_GET['group'] == 0)
-		$parent = -2;
-	else
+	if ($_GET['group'] == -1 || $_GET['group'] == 0) {
+			$parent = -2;
+	} else
 	{
 		$result = $smcFunc['db_query']('', '
 			SELECT id_parent
@@ -877,8 +917,9 @@ 
 		$smcFunc['db_free_result']($result);
 	}
 
-	if ($parent != -2)
-		fatal_lang_error('cannot_edit_permissions_inherited');
+	if ($parent != -2) {
+			fatal_lang_error('cannot_edit_permissions_inherited');
+	}
 
 	$givePerms = array('membergroup' => array(), 'board' => array());
 
@@ -896,12 +937,13 @@ 
 		{
 			if (is_array($perm_array))
 			{
-				foreach ($perm_array as $permission => $value)
-					if ($value == 'on' || $value == 'deny')
+				foreach ($perm_array as $permission => $value) {
+									if ($value == 'on' || $value == 'deny')
 					{
 						// Don't allow people to escalate themselves!
 						if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions']))
 							continue;
+				}
 
 						$givePerms[$perm_type][] = array($_GET['group'], $permission, $value == 'deny' ? 0 : 1);
 					}
@@ -946,8 +988,9 @@ 
 	);
 	if (!empty($givePerms['board']))
 	{
-		foreach ($givePerms['board'] as $k => $v)
-			$givePerms['board'][$k][] = $profileid;
+		foreach ($givePerms['board'] as $k => $v) {
+					$givePerms['board'][$k][] = $profileid;
+		}
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}board_permissions',
 			array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int', 'id_profile' => 'int'),
@@ -988,8 +1031,9 @@ 
 
 	call_integration_hook('integrate_modify_permission_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['page_title'] = $txt['permission_settings_title'];
 	$context['sub_template'] = 'show_settings';
@@ -1040,8 +1084,9 @@ 
 					'min_posts' => -1,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$post_groups[] = $row['id_group'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$post_groups[] = $row['id_group'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			// Remove'em.
@@ -1250,16 +1295,19 @@ 
 	// Make sure we're not granting someone too many permissions!
 	foreach ($groupLevels['global'][$level] as $k => $permission)
 	{
-		if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions']))
-			unset($groupLevels['global'][$level][$k]);
+		if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions'])) {
+					unset($groupLevels['global'][$level][$k]);
+		}
 
-		if ($group == -1 && in_array($permission, $context['non_guest_permissions']))
-			unset($groupLevels['global'][$level][$k]);
+		if ($group == -1 && in_array($permission, $context['non_guest_permissions'])) {
+					unset($groupLevels['global'][$level][$k]);
+		}
 	}
-	if ($group == -1)
-		foreach ($groupLevels['board'][$level] as $k => $permission)
+	if ($group == -1) {
+			foreach ($groupLevels['board'][$level] as $k => $permission)
 			if (in_array($permission, $context['non_guest_permissions']))
 				unset($groupLevels['board'][$level][$k]);
+	}
 
 	// Reset all cached permissions.
 	updateSettings(array('settings_updated' => time()));
@@ -1269,8 +1317,9 @@ 
 	{
 		$group = (int) $group;
 
-		if (empty($groupLevels['global'][$level]))
-			return;
+		if (empty($groupLevels['global'][$level])) {
+					return;
+		}
 
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}permissions
@@ -1292,8 +1341,9 @@ 
 		);
 
 		$groupInserts = array();
-		foreach ($groupLevels['global'][$level] as $permission)
-			$groupInserts[] = array($group, $permission);
+		foreach ($groupLevels['global'][$level] as $permission) {
+					$groupInserts[] = array($group, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}permissions',
@@ -1303,8 +1353,9 @@ 
 		);
 
 		$boardInserts = array();
-		foreach ($groupLevels['board'][$level] as $permission)
-			$boardInserts[] = array(1, $group, $permission);
+		foreach ($groupLevels['board'][$level] as $permission) {
+					$boardInserts[] = array(1, $group, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}board_permissions',
@@ -1335,8 +1386,9 @@ 
 		if (!empty($groupLevels['board'][$level]))
 		{
 			$boardInserts = array();
-			foreach ($groupLevels['board'][$level] as $permission)
-				$boardInserts[] = array($profile, $group, $permission);
+			foreach ($groupLevels['board'][$level] as $permission) {
+							$boardInserts[] = array($profile, $group, $permission);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1359,8 +1411,9 @@ 
 			)
 		);
 
-		if (empty($boardLevels[$level]))
-			return;
+		if (empty($boardLevels[$level])) {
+					return;
+		}
 
 		// Get all the groups...
 		$query = $smcFunc['db_query']('', '
@@ -1378,8 +1431,9 @@ 
 			$group = $row[0];
 
 			$boardInserts = array();
-			foreach ($boardLevels[$level] as $permission)
-				$boardInserts[] = array($profile, $group, $permission);
+			foreach ($boardLevels[$level] as $permission) {
+							$boardInserts[] = array($profile, $group, $permission);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1392,8 +1446,9 @@ 
 
 		// Add permissions for ungrouped members.
 		$boardInserts = array();
-		foreach ($boardLevels[$level] as $permission)
-			$boardInserts[] = array($profile, 0, $permission);
+		foreach ($boardLevels[$level] as $permission) {
+					$boardInserts[] = array($profile, 0, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1403,9 +1458,10 @@ 
 			);
 	}
 	// $profile and $group are both null!
-	else
-		fatal_lang_error('no_access', false);
-}
+	else {
+			fatal_lang_error('no_access', false);
+	}
+	}
 
 /**
  * Load permissions into $context['permissions'].
@@ -1606,15 +1662,17 @@ 
 		foreach ($permissionList as $permission => $permissionArray)
 		{
 			// If this is a guest permission we don't do it if it's the guest group.
-			if (isset($context['group']['id']) && $context['group']['id'] == -1 && in_array($permission, $context['non_guest_permissions']))
-				continue;
+			if (isset($context['group']['id']) && $context['group']['id'] == -1 && in_array($permission, $context['non_guest_permissions'])) {
+							continue;
+			}
 
 			// What groups will this permission be in?
 			$own_group = $permissionArray[1];
 
 			// First, Do these groups actually exist - if not add them.
-			if (!isset($permissionGroups[$permissionType][$own_group]))
-				$permissionGroups[$permissionType][$own_group] = true;
+			if (!isset($permissionGroups[$permissionType][$own_group])) {
+							$permissionGroups[$permissionType][$own_group] = true;
+			}
 
 			// What column should this be located into?
 			$position = !in_array($own_group, $leftPermissionGroups) ? 1 : 0;
@@ -1622,8 +1680,8 @@ 
 			// If the groups have not yet been created be sure to create them.
 			$bothGroups = array('own' => $own_group);
 
-			foreach ($bothGroups as $group)
-				if (!isset($context['permissions'][$permissionType]['columns'][$position][$group]))
+			foreach ($bothGroups as $group) {
+							if (!isset($context['permissions'][$permissionType]['columns'][$position][$group]))
 					$context['permissions'][$permissionType]['columns'][$position][$group] = array(
 						'type' => $permissionType,
 						'id' => $group,
@@ -1633,6 +1691,7 @@ 
 						'hidden' => false,
 						'permissions' => array()
 					);
+			}
 
 			$context['permissions'][$permissionType]['columns'][$position][$own_group]['permissions'][$permission] = array(
 				'id' => $permission,
@@ -1657,27 +1716,30 @@ 
 				{
 					$context['hidden_permissions'][] = $permission . '_own';
 					$context['hidden_permissions'][] = $permission . '_any';
+				} else {
+									$context['hidden_permissions'][] = $permission;
 				}
-				else
-					$context['hidden_permissions'][] = $permission;
 			}
 		}
 		ksort($context['permissions'][$permissionType]['columns']);
 
 		// Check we don't leave any empty groups - and mark hidden ones as such.
-		foreach ($context['permissions'][$permissionType]['columns'] as $column => $groups)
-			foreach ($groups as $id => $group)
+		foreach ($context['permissions'][$permissionType]['columns'] as $column => $groups) {
+					foreach ($groups as $id => $group)
 			{
 				if (empty($group['permissions']))
 					unset($context['permissions'][$permissionType]['columns'][$column][$id]);
+		}
 				else
 				{
 					$foundNonHidden = false;
-					foreach ($group['permissions'] as $permission)
-						if (empty($permission['hidden']))
+					foreach ($group['permissions'] as $permission) {
+											if (empty($permission['hidden']))
 							$foundNonHidden = true;
-					if (!$foundNonHidden)
-						$context['permissions'][$permissionType]['columns'][$column][$id]['hidden'] = true;
+					}
+					if (!$foundNonHidden) {
+											$context['permissions'][$permissionType]['columns'][$column][$id]['hidden'] = true;
+					}
 				}
 			}
 	}
@@ -1704,12 +1766,13 @@ 
 	$context['can_change_permissions'] = allowedTo('manage_permissions');
 
 	// Nothing to initialize here.
-	if (!$context['can_change_permissions'])
-		return;
+	if (!$context['can_change_permissions']) {
+			return;
+	}
 
 	// Load the permission settings for guests
-	foreach ($permissions as $permission)
-		$context[$permission] = array(
+	foreach ($permissions as $permission) {
+			$context[$permission] = array(
 			-1 => array(
 				'id' => -1,
 				'name' => $txt['membergroups_guests'],
@@ -1723,6 +1786,7 @@ 
 				'status' => 'off',
 			),
 		);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_group, CASE WHEN add_deny = {int:denied} THEN {string:deny} ELSE {string:on} END AS status, permission
@@ -1736,8 +1800,9 @@ 
 			'on' => 'on',
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context[$row['permission']][$row['id_group']]['status'] = $row['status'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context[$row['permission']][$row['id_group']]['status'] = $row['status'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -1758,14 +1823,15 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Initialize each permission as being 'off' until proven otherwise.
-		foreach ($permissions as $permission)
-			if (!isset($context[$permission][$row['id_group']]))
+		foreach ($permissions as $permission) {
+					if (!isset($context[$permission][$row['id_group']]))
 				$context[$permission][$row['id_group']] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name'],
 					'is_postgroup' => $row['min_posts'] != -1,
 					'status' => 'off',
 				);
+		}
 
 		$context[$row['permission']][$row['id_group']]['status'] = empty($row['status']) ? 'deny' : ($row['status'] == 1 ? 'on' : 'off');
 	}
@@ -1779,8 +1845,9 @@ 
 	{
 		foreach ($permissions as $permission)
 		{
-			if (isset($context[$permission][$group]))
-				unset($context[$permission][$group]);
+			if (isset($context[$permission][$group])) {
+							unset($context[$permission][$group]);
+			}
 		}
 	}
 
@@ -1788,8 +1855,9 @@ 
 	$non_guest_perms = array_intersect(str_replace(array('_any', '_own'), '', $permissions), $context['non_guest_permissions']);
 	foreach ($non_guest_perms as $permission)
 	{
-		if (isset($context[$permission][-1]))
-			unset($context[$permission][-1]);
+		if (isset($context[$permission][-1])) {
+					unset($context[$permission][-1]);
+		}
 	}
 
 	// Create the token for the separate inline permission verification.
@@ -1824,8 +1892,9 @@ 
 	global $context, $smcFunc;
 
 	// No permissions? Not a great deal to do here.
-	if (!allowedTo('manage_permissions'))
-		return;
+	if (!allowedTo('manage_permissions')) {
+			return;
+	}
 
 	// Almighty session check, verify our ways.
 	checkSession();
@@ -1837,13 +1906,15 @@ 
 	$insertRows = array();
 	foreach ($permissions as $permission)
 	{
-		if (!isset($_POST[$permission]))
-			continue;
+		if (!isset($_POST[$permission])) {
+					continue;
+		}
 
 		foreach ($_POST[$permission] as $id_group => $value)
 		{
-			if (in_array($value, array('on', 'deny')) && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions'])))
-				$insertRows[] = array((int) $id_group, $permission, $value == 'on' ? 1 : 0);
+			if (in_array($value, array('on', 'deny')) && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions']))) {
+							$insertRows[] = array((int) $id_group, $permission, $value == 'on' ? 1 : 0);
+			}
 		}
 	}
 
@@ -1859,13 +1930,14 @@ 
 	);
 
 	// ...and replace them with new ones.
-	if (!empty($insertRows))
-		$smcFunc['db_insert']('insert',
+	if (!empty($insertRows)) {
+			$smcFunc['db_insert']('insert',
 			'{db_prefix}permissions',
 			array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 			$insertRows,
 			array('id_group', 'permission')
 		);
+	}
 
 	// Do a full child update.
 	updateChildPermissions(array(), -1);
@@ -1892,10 +1964,11 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Format the label nicely.
-		if (isset($txt['permissions_profile_' . $row['profile_name']]))
-			$name = $txt['permissions_profile_' . $row['profile_name']];
-		else
-			$name = $row['profile_name'];
+		if (isset($txt['permissions_profile_' . $row['profile_name']])) {
+					$name = $txt['permissions_profile_' . $row['profile_name']];
+		} else {
+					$name = $row['profile_name'];
+		}
 
 		$context['profiles'][$row['id_profile']] = array(
 			'id' => $row['id_profile'],
@@ -1950,17 +2023,19 @@ 
 			)
 		);
 		$inserts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$inserts[] = array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$inserts[] = array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($inserts))
-			$smcFunc['db_insert']('insert',
+		if (!empty($inserts)) {
+					$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
 				array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 				$inserts,
 				array('id_profile', 'id_group', 'permission')
 			);
+		}
 	}
 	// Renaming?
 	elseif (isset($_POST['rename']))
@@ -1969,16 +2044,16 @@ 
 		validateToken('admin-mpp');
 
 		// Just showing the boxes?
-		if (!isset($_POST['rename_profile']))
-			$context['show_rename_boxes'] = true;
-		else
+		if (!isset($_POST['rename_profile'])) {
+					$context['show_rename_boxes'] = true;
+		} else
 		{
 			foreach ($_POST['rename_profile'] as $id => $value)
 			{
 				$value = $smcFunc['htmlspecialchars']($value);
 
-				if (trim($value) != '' && $id > 4)
-					$smcFunc['db_query']('', '
+				if (trim($value) != '' && $id > 4) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}permission_profiles
 						SET profile_name = {string:profile_name}
 						WHERE id_profile = {int:current_profile}',
@@ -1987,6 +2062,7 @@ 
 							'profile_name' => $value,
 						)
 					);
+				}
 			}
 		}
 	}
@@ -1997,9 +2073,10 @@ 
 		validateToken('admin-mpp');
 
 		$profiles = array();
-		foreach ($_POST['delete_profile'] as $profile)
-			if ($profile > 4)
+		foreach ($_POST['delete_profile'] as $profile) {
+					if ($profile > 4)
 				$profiles[] = (int) $profile;
+		}
 
 		// Verify it's not in use...
 		$request = $smcFunc['db_query']('', '
@@ -2011,8 +2088,9 @@ 
 				'profile_list' => $profiles,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					fatal_lang_error('no_access', false);
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Oh well, delete.
@@ -2036,10 +2114,11 @@ 
 		array(
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (isset($context['profiles'][$row['id_profile']]))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (isset($context['profiles'][$row['id_profile']]))
 		{
 			$context['profiles'][$row['id_profile']]['in_use'] = true;
+	}
 			$context['profiles'][$row['id_profile']]['boards'] = $row['board_count'];
 			$context['profiles'][$row['id_profile']]['boards_text'] = $row['board_count'] > 1 ? sprintf($txt['permissions_profile_used_by_many'], $row['board_count']) : $txt['permissions_profile_used_by_' . ($row['board_count'] ? 'one' : 'none')];
 		}
@@ -2051,8 +2130,9 @@ 
 	{
 		// Can't delete special ones.
 		$context['profiles'][$id]['can_edit'] = isset($txt['permissions_profile_' . $profile['unformatted_name']]) ? false : true;
-		if ($context['profiles'][$id]['can_edit'])
-			$context['can_edit_something'] = true;
+		if ($context['profiles'][$id]['can_edit']) {
+					$context['can_edit_something'] = true;
+		}
 
 		// You can only delete it if you can edit it AND it's not in use.
 		$context['profiles'][$id]['can_delete'] = $context['profiles'][$id]['can_edit'] && empty($profile['in_use']) ? true : false;
@@ -2073,8 +2153,9 @@ 
 	global $smcFunc;
 
 	// All the parent groups to sort out.
-	if (!is_array($parents))
-		$parents = array($parents);
+	if (!is_array($parents)) {
+			$parents = array($parents);
+	}
 
 	// Find all the children of this group.
 	$request = $smcFunc['db_query']('', '
@@ -2101,8 +2182,9 @@ 
 	$parents = array_unique($parents);
 
 	// Not a sausage, or a child?
-	if (empty($children))
-		return false;
+	if (empty($children)) {
+			return false;
+	}
 
 	// First off, are we doing general permissions?
 	if ($profile < 1 || $profile === null)
@@ -2117,9 +2199,10 @@ 
 			)
 		);
 		$permissions = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			foreach ($children[$row['id_group']] as $child)
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					foreach ($children[$row['id_group']] as $child)
 				$permissions[] = array($child, $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
 		$smcFunc['db_query']('', '
@@ -2159,9 +2242,10 @@ 
 			)
 		);
 		$permissions = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			foreach ($children[$row['id_group']] as $child)
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					foreach ($children[$row['id_group']] as $child)
 				$permissions[] = array($child, $row['id_profile'], $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
 		$smcFunc['db_query']('', '
@@ -2195,12 +2279,15 @@ 
 	global $context;
 
 	$context['illegal_permissions'] = array();
-	if (!allowedTo('admin_forum'))
-		$context['illegal_permissions'][] = 'admin_forum';
-	if (!allowedTo('manage_membergroups'))
-		$context['illegal_permissions'][] = 'manage_membergroups';
-	if (!allowedTo('manage_permissions'))
-		$context['illegal_permissions'][] = 'manage_permissions';
+	if (!allowedTo('admin_forum')) {
+			$context['illegal_permissions'][] = 'admin_forum';
+	}
+	if (!allowedTo('manage_membergroups')) {
+			$context['illegal_permissions'][] = 'manage_membergroups';
+	}
+	if (!allowedTo('manage_permissions')) {
+			$context['illegal_permissions'][] = 'manage_permissions';
+	}
 
 	call_integration_hook('integrate_load_illegal_permissions');
 }
@@ -2349,16 +2436,17 @@ 
 				'attachment' => 'disallow',
 				'children' => array(),
 			);
+		} elseif (isset($context['profile_groups'][$row['id_parent']])) {
+					$context['profile_groups'][$row['id_parent']]['children'][] = $row['group_name'];
 		}
-		elseif (isset($context['profile_groups'][$row['id_parent']]))
-			$context['profile_groups'][$row['id_parent']]['children'][] = $row['group_name'];
 	}
 	$smcFunc['db_free_result']($request);
 
 	// What are the permissions we are querying?
 	$all_permissions = array();
-	foreach ($mappings as $perm_set)
-		$all_permissions = array_merge($all_permissions, $perm_set);
+	foreach ($mappings as $perm_set) {
+			$all_permissions = array_merge($all_permissions, $perm_set);
+	}
 
 	// If we're saving the changes then do just that - save them.
 	if (!empty($_POST['save_changes']) && ($context['current_profile'] == 1 || $context['current_profile'] > 4))
@@ -2373,8 +2461,7 @@ 
 			{
 				// Turning it on. This seems easy enough.
 				updateSettings(array('postmod_active' => 1));
-			}
-			else
+			} else
 			{
 				// Turning it off. Not so straightforward. We have to turn off warnings to moderation level, and make everything approved.
 				updateSettings(array(
@@ -2385,8 +2472,7 @@ 
 				require_once($sourcedir . '/PostModeration.php');
 				approveAllData();
 			}
-		}
-		elseif ($modSettings['postmod_active'])
+		} elseif ($modSettings['postmod_active'])
 		{
 			// We're not saving a new setting - and if it's still enabled we have more work to do.
 
@@ -2416,21 +2502,22 @@ 
 							// Give them both sets for fun.
 							$new_permissions[] = array($context['current_profile'], $group['id'], $data[0], 1);
 							$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
+						} elseif ($_POST[$index][$group['id']] == 'moderate') {
+													$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
 						}
-						elseif ($_POST[$index][$group['id']] == 'moderate')
-							$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
 					}
 				}
 			}
 
 			// Insert new permissions.
-			if (!empty($new_permissions))
-				$smcFunc['db_insert']('',
+			if (!empty($new_permissions)) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}board_permissions',
 					array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$new_permissions,
 					array('id_profile', 'id_group', 'permission')
 				);
+			}
 		}
 	}
 
@@ -2459,11 +2546,13 @@ 
 					if ($row['add_deny'])
 					{
 						// Full allowance?
-						if ($index == 0)
-							$context['profile_groups'][$row['id_group']][$key] = 'allow';
+						if ($index == 0) {
+													$context['profile_groups'][$row['id_group']][$key] = 'allow';
+						}
 						// Otherwise only bother with moderate if not on allow.
-						elseif ($context['profile_groups'][$row['id_group']][$key] != 'allow')
-							$context['profile_groups'][$row['id_group']][$key] = 'moderate';
+						elseif ($context['profile_groups'][$row['id_group']][$key] != 'allow') {
+													$context['profile_groups'][$row['id_group']][$key] = 'moderate';
+						}
 					}
 				}
 			}

Sources/Subs-Recent.php

Braces +5 added lines, -3 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get the latest posts of a forum.
@@ -59,8 +60,9 @@ 
 		censorText($row['body']);
 
 		$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']), array('<br>' => '&#10;')));
-		if ($smcFunc['strlen']($row['body']) > 128)
-			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		if ($smcFunc['strlen']($row['body']) > 128) {
+					$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		}
 
 		// Build the array.
 		$posts[] = array(