SimpleMachines / SMF2.1

Sources/Groups.php

Braces +80 added lines, -59 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point function, permission checks, admin bars, etc.
@@ -99,27 +100,27 @@ 
 					'function' => function($rowData) use ($scripturl)
 					{
 						// Since the moderator group has no explicit members, no link is needed.
-						if ($rowData['id_group'] == 3)
-							$group_name = $rowData['group_name'];
-						else
+						if ($rowData['id_group'] == 3) {
+													$group_name = $rowData['group_name'];
+						} else
 						{
 							$color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 
 							if (allowedTo('manage_membergroups'))
 							{
 								$group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
-							}
-							else
+							} else
 							{
 								$group_name = sprintf('<a href="%1$s?action=groups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
 							}
 						}
 
 						// Add a help option for moderator and administrator.
-						if ($rowData['id_group'] == 1)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
-						elseif ($rowData['id_group'] == 3)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						if ($rowData['id_group'] == 1) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						} elseif ($rowData['id_group'] == 3) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						}
 
 						return $group_name;
 					},
@@ -198,8 +199,9 @@ 
 	$_REQUEST['group'] = isset($_REQUEST['group']) ? (int) $_REQUEST['group'] : 0;
 
 	// No browsing of guests, membergroup 0 or moderators.
-	if (in_array($_REQUEST['group'], array(-1, 0, 3)))
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if (in_array($_REQUEST['group'], array(-1, 0, 3))) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// Load up the group details.
 	$request = $smcFunc['db_query']('', '
@@ -214,8 +216,9 @@ 
 		)
 	);
 	// Doesn't exist?
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 	$context['group'] = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -248,21 +251,25 @@ 
 			'name' => $row['real_name']
 		);
 
-		if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1)
-			$context['group']['can_moderate'] = true;
+		if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1) {
+					$context['group']['can_moderate'] = true;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// If this group is hidden then it can only "exists" if the user can moderate it!
-	if ($context['group']['hidden'] && !$context['group']['can_moderate'])
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($context['group']['hidden'] && !$context['group']['can_moderate']) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// You can only assign membership if you are the moderator and/or can manage groups!
-	if (!$context['group']['can_moderate'])
-		$context['group']['assignable'] = 0;
+	if (!$context['group']['can_moderate']) {
+			$context['group']['assignable'] = 0;
+	}
 	// Non-admins cannot assign admins.
-	elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum'))
-		$context['group']['assignable'] = 0;
+	elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum')) {
+			$context['group']['assignable'] = 0;
+	}
 
 	// Removing member from group?
 	if (isset($_POST['remove']) && !empty($_REQUEST['rem']) && is_array($_REQUEST['rem']) && $context['group']['assignable'])
@@ -271,8 +278,9 @@ 
 		validateToken('mod-mgm');
 
 		// Make sure we're dealing with integers only.
-		foreach ($_REQUEST['rem'] as $key => $group)
-			$_REQUEST['rem'][$key] = (int) $group;
+		foreach ($_REQUEST['rem'] as $key => $group) {
+					$_REQUEST['rem'][$key] = (int) $group;
+		}
 
 		require_once($sourcedir . '/Subs-Membergroups.php');
 		removeMembersFromGroups($_REQUEST['rem'], $_REQUEST['group'], true);
@@ -295,16 +303,18 @@ 
 		{
 			$member_names[$index] = trim($smcFunc['strtolower']($member_names[$index]));
 
-			if (strlen($member_names[$index]) == 0)
-				unset($member_names[$index]);
+			if (strlen($member_names[$index]) == 0) {
+							unset($member_names[$index]);
+			}
 		}
 
 		// Any passed by ID?
 		$member_ids = array();
-		if (!empty($_REQUEST['member_add']))
-			foreach ($_REQUEST['member_add'] as $id)
+		if (!empty($_REQUEST['member_add'])) {
+					foreach ($_REQUEST['member_add'] as $id)
 				if ($id > 0)
 					$member_ids[] = (int) $id;
+		}
 
 		// Construct the query pelements.
 		if (!empty($member_ids))
@@ -332,8 +342,9 @@ 
 					'id_group' => $_REQUEST['group'],
 				))
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$members[] = $row['id_member'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$members[] = $row['id_member'];
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -372,10 +383,11 @@ 
 	$context['sort_direction'] = isset($_REQUEST['desc']) ? 'down' : 'up';
 
 	// The where on the query is interesting. Non-moderators should only see people who are in this group as primary.
-	if ($context['group']['can_moderate'])
-		$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0';
-	else
-		$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}';
+	if ($context['group']['can_moderate']) {
+			$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0';
+	} else {
+			$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}';
+	}
 
 	// Count members of the group.
 	$request = $smcFunc['db_query']('', '
@@ -416,8 +428,9 @@ 
 		$last_online = empty($row['last_login']) ? $txt['never'] : timeformat($row['last_login']);
 
 		// Italicize the online note if they aren't activated.
-		if ($row['is_activated'] % 10 != 1)
-			$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+		if ($row['is_activated'] % 10 != 1) {
+					$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+		}
 
 		$context['members'][] = array(
 			'id' => $row['id_member'],
@@ -437,9 +450,10 @@ 
 	$context['page_title'] = $txt['membergroups_members_title'] . ': ' . $context['group']['name'];
 	createToken('mod-mgm');
 
-	if ($context['group']['assignable'])
-		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
-}
+	if ($context['group']['assignable']) {
+			loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+	}
+	}
 
 /**
  * Show and manage all group requests.
@@ -453,16 +467,18 @@ 
 	$context['sub_template'] = 'show_list';
 
 	// Verify we can be here.
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		isAllowedTo('manage_membergroups');
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Normally, we act normally...
 	$where = ($user_info['mod_cache']['gq'] == '1=1' || $user_info['mod_cache']['gq'] == '0=1' ? $user_info['mod_cache']['gq'] : 'lgr.' . $user_info['mod_cache']['gq']);
 
-	if (isset($_GET['closed']))
-		$where .= ' AND lgr.status != {int:status_open}';
-	else
-		$where .= ' AND lgr.status = {int:status_open}';
+	if (isset($_GET['closed'])) {
+			$where .= ' AND lgr.status != {int:status_open}';
+	} else {
+			$where .= ' AND lgr.status = {int:status_open}';
+	}
 
 	$where_parameters = array(
 		'status_open' => 0,
@@ -475,8 +491,9 @@ 
 		validateToken('mod-gr');
 
 		// Clean the values.
-		foreach ($_POST['groupr'] as $k => $request)
-			$_POST['groupr'][$k] = (int) $request;
+		foreach ($_POST['groupr'] as $k => $request) {
+					$_POST['groupr'][$k] = (int) $request;
+		}
 
 		$log_changes = array();
 
@@ -513,8 +530,8 @@ 
 			$request_list = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (!isset($log_changes[$row['id_request']]))
-					$log_changes[$row['id_request']] = array(
+				if (!isset($log_changes[$row['id_request']])) {
+									$log_changes[$row['id_request']] = array(
 						'id_request' => $row['id_request'],
 						'status' => $_POST['req_action'] == 'approve' ? 1 : 2, // 1 = approved, 2 = rejected
 						'id_member_acted' => $user_info['id'],
@@ -522,6 +539,7 @@ 
 						'time_acted' => time(),
 						'act_reason' => $_POST['req_action'] != 'approve' && !empty($_POST['groupreason']) && !empty($_POST['groupreason'][$row['id_request']]) ? $smcFunc['htmlspecialchars']($_POST['groupreason'][$row['id_request']], ENT_QUOTES) : '',
 					);
+				}
 				$request_list[] = $row['id_request'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -744,21 +762,24 @@ 
 	$group_requests = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($row['reason']))
-			$reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>';
-		else
-			$reason = censorText($row['reason']);
+		if (empty($row['reason'])) {
+					$reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>';
+		} else {
+					$reason = censorText($row['reason']);
+		}
 
 		if (isset($_GET['closed']))
 		{
-			if ($row['status'] == 1)
-				$reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>';
-			elseif ($row['status'] == 2)
-				$reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>';
+			if ($row['status'] == 1) {
+							$reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>';
+			} elseif ($row['status'] == 2) {
+							$reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>';
+			}
 
 				$reason .= ' (' . timeformat($row['time_acted']) . ')';
-			if (!empty($row['act_reason']))
-				$reason .= '<br><br>' . censorText($row['act_reason']);
+			if (!empty($row['act_reason'])) {
+							$reason .= '<br><br>' . censorText($row['act_reason']);
+			}
 		}
 
 		$group_requests[] = array(

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/ManageLanguages.php

Braces +190 added lines, -142 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the main function for the languages area.
@@ -153,11 +154,11 @@ 
 	$language_list = new xmlArray(fetch_web_data($url), true);
 
 	// Check that the site responded and that the language exists.
-	if (!$language_list->exists('languages'))
-		$context['smf_error'] = 'no_response';
-	elseif (!$language_list->exists('languages/language'))
-		$context['smf_error'] = 'no_files';
-	else
+	if (!$language_list->exists('languages')) {
+			$context['smf_error'] = 'no_response';
+	} elseif (!$language_list->exists('languages/language')) {
+			$context['smf_error'] = 'no_files';
+	} else
 	{
 		$language_list = $language_list->path('languages[0]');
 		$lang_files = $language_list->set('language');
@@ -165,8 +166,9 @@ 
 		foreach ($lang_files as $file)
 		{
 			// Were we searching?
-			if (!empty($context['smf_search_term']) && strpos($file->fetch('name'), $smcFunc['strtolower']($context['smf_search_term'])) === false)
-				continue;
+			if (!empty($context['smf_search_term']) && strpos($file->fetch('name'), $smcFunc['strtolower']($context['smf_search_term'])) === false) {
+							continue;
+			}
 
 			$smf_languages[] = array(
 				'id' => $file->fetch('id'),
@@ -177,10 +179,11 @@ 
 				'install_link' => '<a href="' . $scripturl . '?action=admin;area=languages;sa=downloadlang;did=' . $file->fetch('id') . ';' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['add_language_smf_install'] . '</a>',
 			);
 		}
-		if (empty($smf_languages))
-			$context['smf_error'] = 'no_files';
-		else
-			return $smf_languages;
+		if (empty($smf_languages)) {
+					$context['smf_error'] = 'no_files';
+		} else {
+					return $smf_languages;
+		}
 	}
 }
 
@@ -202,8 +205,9 @@ 
 	require_once($sourcedir . '/Subs-Package.php');
 
 	// Clearly we need to know what to request.
-	if (!isset($_GET['did']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['did'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Some lovely context.
 	$context['download_id'] = $_GET['did'];
@@ -223,8 +227,9 @@ 
 		foreach ($_POST['copy_file'] as $file)
 		{
 			// Check it's not very bad.
-			if (strpos($file, '..') !== false || (strpos($file, 'Themes') !== 0 && !preg_match('~agreement\.[A-Za-z-_0-9]+\.txt$~', $file)))
-				fatal_error($txt['languages_download_illegal_paths']);
+			if (strpos($file, '..') !== false || (strpos($file, 'Themes') !== 0 && !preg_match('~agreement\.[A-Za-z-_0-9]+\.txt$~', $file))) {
+							fatal_error($txt['languages_download_illegal_paths']);
+			}
 
 			$chmod_files[] = $boarddir . '/' . $file;
 			$install_files[] = $file;
@@ -235,8 +240,9 @@ 
 		$files_left = $file_status['files']['notwritable'];
 
 		// Something not writable?
-		if (!empty($files_left))
-			$context['error_message'] = $txt['languages_download_not_chmod'];
+		if (!empty($files_left)) {
+					$context['error_message'] = $txt['languages_download_not_chmod'];
+		}
 		// Otherwise, go go go!
 		elseif (!empty($install_files))
 		{
@@ -251,11 +257,13 @@ 
 	}
 
 	// Open up the old china.
-	if (!isset($archive_content))
-		$archive_content = read_tgz_file('https://download.simplemachines.org/fetch_language.php?version=' . urlencode(strtr($forum_version, array('SMF ' => ''))) . ';fetch=' . urlencode($_GET['did']), null);
+	if (!isset($archive_content)) {
+			$archive_content = read_tgz_file('https://download.simplemachines.org/fetch_language.php?version=' . urlencode(strtr($forum_version, array('SMF ' => ''))) . ';fetch=' . urlencode($_GET['did']), null);
+	}
 
-	if (empty($archive_content))
-		fatal_error($txt['add_language_error_no_response']);
+	if (empty($archive_content)) {
+			fatal_error($txt['add_language_error_no_response']);
+	}
 
 	// Now for each of the files, let's do some *stuff*
 	$context['files'] = array(
@@ -270,8 +278,9 @@ 
 		$extension = substr($filename, strrpos($filename, '.') + 1);
 
 		// Don't do anything with files we don't understand.
-		if (!in_array($extension, array('php', 'jpg', 'gif', 'jpeg', 'png', 'txt')))
-			continue;
+		if (!in_array($extension, array('php', 'jpg', 'gif', 'jpeg', 'png', 'txt'))) {
+					continue;
+		}
 
 		// Basic data.
 		$context_data = array(
@@ -290,8 +299,9 @@ 
 		// Does the file exist, is it different and can we overwrite?
 		if (file_exists($boarddir . '/' . $file['filename']))
 		{
-			if (is_writable($boarddir . '/' . $file['filename']))
-				$context_data['writable'] = true;
+			if (is_writable($boarddir . '/' . $file['filename'])) {
+							$context_data['writable'] = true;
+			}
 
 			// Finally, do we actually think the content has changed?
 			if ($file['size'] == filesize($boarddir . '/' . $file['filename']) && $file['md5'] == md5_file($boarddir . '/' . $file['filename']))
@@ -304,16 +314,17 @@ 
 			{
 				$context_data['exists'] = 'same';
 				$context_data['default_copy'] = false;
+			} else {
+							$context_data['exists'] = 'different';
 			}
-			else
-				$context_data['exists'] = 'different';
 		}
 		// No overwrite?
 		else
 		{
 			// Can we at least stick it in the directory...
-			if (is_writable($boarddir . '/' . $dirname))
-				$context_data['writable'] = true;
+			if (is_writable($boarddir . '/' . $dirname)) {
+							$context_data['writable'] = true;
+			}
 		}
 
 		// I love PHP files, that's why I'm a developer and not an artistic type spending my time drinking absinth and living a life of sin...
@@ -328,8 +339,9 @@ 
 			list ($name, $language) = explode('.', $filename);
 
 			// Let's get the new version, I like versions, they tell me that I'm up to date.
-			if (preg_match('~\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '~i', $file['preview'], $match) == 1)
-				$context_data['version'] = $match[1];
+			if (preg_match('~\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '~i', $file['preview'], $match) == 1) {
+							$context_data['version'] = $match[1];
+			}
 
 			// Now does the old file exist - if so what is it's version?
 			if (file_exists($boarddir . '/' . $file['filename']))
@@ -345,34 +357,35 @@ 
 					$context_data['cur_version'] = $match[1];
 
 					// How does this compare?
-					if ($context_data['cur_version'] == $context_data['version'])
-						$context_data['version_compare'] = 'same';
-					elseif ($context_data['cur_version'] > $context_data['version'])
-						$context_data['version_compare'] = 'older';
+					if ($context_data['cur_version'] == $context_data['version']) {
+											$context_data['version_compare'] = 'same';
+					} elseif ($context_data['cur_version'] > $context_data['version']) {
+											$context_data['version_compare'] = 'older';
+					}
 
 					// Don't recommend copying if the version is the same.
-					if ($context_data['version_compare'] != 'newer')
-						$context_data['default_copy'] = false;
+					if ($context_data['version_compare'] != 'newer') {
+											$context_data['default_copy'] = false;
+					}
 				}
 			}
 
 			// Add the context data to the main set.
 			$context['files']['lang'][] = $context_data;
-		}
-		elseif ($extension == '.txt' && stripos($filename, 'agreement') !== false)
+		} elseif ($extension == '.txt' && stripos($filename, 'agreement') !== false)
 		{
 			// Registration agreement is a primary file
 			$context['files']['lang'][] = $context_data;
-		}
-		else
+		} else
 		{
 			// There shouldn't be anything else, but load this into "other" in case we decide to handle it in the future
 			$context['files']['other'][] = $context_data;
 		}
 
 		// Collect together all non-writable areas.
-		if (!$context_data['writable'])
-			$context['make_writable'][] = $context_data['destination'];
+		if (!$context_data['writable']) {
+					$context['make_writable'][] = $context_data['destination'];
+		}
 	}
 
 	// Before we go to far can we make anything writable, eh, eh?
@@ -387,22 +400,24 @@ 
 		{
 			if ($type == 'lang')
 			{
-				foreach ($data as $k => $file)
-					if (!$file['writable'] && !in_array($file['destination'], $context['still_not_writable']))
+				foreach ($data as $k => $file) {
+									if (!$file['writable'] && !in_array($file['destination'], $context['still_not_writable']))
 						$context['files'][$type][$k]['writable'] = true;
-			}
-			else
+				}
+			} else
 			{
-				foreach ($data as $theme => $files)
-					foreach ($files as $k => $file)
+				foreach ($data as $theme => $files) {
+									foreach ($files as $k => $file)
 						if (!$file['writable'] && !in_array($file['destination'], $context['still_not_writable']))
 							$context['files'][$type][$theme][$k]['writable'] = true;
+				}
 			}
 		}
 
 		// Are we going to need more language stuff?
-		if (!empty($context['still_not_writable']))
-			loadLanguage('Packages');
+		if (!empty($context['still_not_writable'])) {
+					loadLanguage('Packages');
+		}
 	}
 
 	// This is the list for the main files.
@@ -615,12 +630,13 @@ 
 	highlightSelected("list_language_list_' . ($language == '' ? 'english' : $language) . '");', true);
 
 	// Display a warning if we cannot edit the default setting.
-	if (!is_writable($boarddir . '/Settings.php'))
-		$listOptions['additional_rows'][] = array(
+	if (!is_writable($boarddir . '/Settings.php')) {
+			$listOptions['additional_rows'][] = array(
 				'position' => 'after_title',
 				'value' => $txt['language_settings_writable'],
 				'class' => 'smalltext alert',
 			);
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 	createList($listOptions);
@@ -662,10 +678,11 @@ 
 
 	// Put them back.
 	$settings['actual_theme_dir'] = $backup_actual_theme_dir;
-	if (!empty($backup_base_theme_dir))
-		$settings['base_theme_dir'] = $backup_base_theme_dir;
-	else
-		unset($settings['base_theme_dir']);
+	if (!empty($backup_base_theme_dir)) {
+			$settings['base_theme_dir'] = $backup_base_theme_dir;
+	} else {
+			unset($settings['base_theme_dir']);
+	}
 
 	// Get the language files and data...
 	foreach ($context['languages'] as $lang)
@@ -694,13 +711,15 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Default?
-		if (empty($row['lngfile']) || !isset($languages[$row['lngfile']]))
-			$row['lngfile'] = $language;
+		if (empty($row['lngfile']) || !isset($languages[$row['lngfile']])) {
+					$row['lngfile'] = $language;
+		}
 
-		if (!isset($languages[$row['lngfile']]) && isset($languages['english']))
-			$languages['english']['count'] += $row['num_users'];
-		elseif (isset($languages[$row['lngfile']]))
-			$languages[$row['lngfile']]['count'] += $row['num_users'];
+		if (!isset($languages[$row['lngfile']]) && isset($languages['english'])) {
+					$languages['english']['count'] += $row['num_users'];
+		} elseif (isset($languages[$row['lngfile']])) {
+					$languages[$row['lngfile']]['count'] += $row['num_users'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -740,13 +759,15 @@ 
 
 	call_integration_hook('integrate_language_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get our languages. No cache
 	getLanguages(false);
-	foreach ($context['languages'] as $lang)
-		$config_vars['language'][4][$lang['filename']] = array($lang['filename'], $lang['name']);
+	foreach ($context['languages'] as $lang) {
+			$config_vars['language'][4][$lang['filename']] = array($lang['filename'], $lang['name']);
+	}
 
 	// Saving settings?
 	if (isset($_REQUEST['save']))
@@ -756,8 +777,9 @@ 
 		call_integration_hook('integrate_save_language_settings', array(&$config_vars));
 
 		saveSettings($config_vars);
-		if (!$settings_not_writable && !$settings_backup_fail)
-			$_SESSION['adm-save'] = true;
+		if (!$settings_not_writable && !$settings_backup_fail) {
+					$_SESSION['adm-save'] = true;
+		}
 		redirectexit('action=admin;area=languages;sa=settings');
 	}
 
@@ -766,10 +788,11 @@ 
 	$context['settings_title'] = $txt['language_settings'];
 	$context['save_disabled'] = $settings_not_writable;
 
-	if ($settings_not_writable)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
-	elseif ($settings_backup_fail)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	if ($settings_not_writable) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
+	} elseif ($settings_backup_fail) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	}
 
 	// Fill the config array.
 	prepareServerSettingsContext($config_vars);
@@ -816,8 +839,9 @@ 
 			'theme_dir' => $settings['default_theme_dir'],
 		),
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$themes[$row['id_theme']][$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$themes[$row['id_theme']][$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// This will be where we look
@@ -829,14 +853,16 @@ 
 	// Check we have themes with a path and a name - just in case - and add the path.
 	foreach ($themes as $id => $data)
 	{
-		if (count($data) != 2)
-			unset($themes[$id]);
-		elseif (is_dir($data['theme_dir'] . '/languages'))
-			$lang_dirs[$id] = $data['theme_dir'] . '/languages';
+		if (count($data) != 2) {
+					unset($themes[$id]);
+		} elseif (is_dir($data['theme_dir'] . '/languages')) {
+					$lang_dirs[$id] = $data['theme_dir'] . '/languages';
+		}
 
 		// How about image directories?
-		if (is_dir($data['theme_dir'] . '/images/' . $context['lang_id']))
-			$images_dirs[$id] = $data['theme_dir'] . '/images/' . $context['lang_id'];
+		if (is_dir($data['theme_dir'] . '/images/' . $context['lang_id'])) {
+					$images_dirs[$id] = $data['theme_dir'] . '/images/' . $context['lang_id'];
+		}
 	}
 
 	$current_file = $file_id ? $lang_dirs[$theme_id] . '/' . $file_id . '.' . $context['lang_id'] . '.php' : '';
@@ -850,15 +876,17 @@ 
 		while ($entry = $dir->read())
 		{
 			// We're only after the files for this language.
-			if (preg_match('~^([A-Za-z]+)\.' . $context['lang_id'] . '\.php$~', $entry, $matches) == 0)
-				continue;
+			if (preg_match('~^([A-Za-z]+)\.' . $context['lang_id'] . '\.php$~', $entry, $matches) == 0) {
+							continue;
+			}
 
-			if (!isset($context['possible_files'][$theme]))
-				$context['possible_files'][$theme] = array(
+			if (!isset($context['possible_files'][$theme])) {
+							$context['possible_files'][$theme] = array(
 					'id' => $theme,
 					'name' => $themes[$theme]['name'],
 					'files' => array(),
 				);
+			}
 
 			$context['possible_files'][$theme]['files'][] = array(
 				'id' => $matches[1],
@@ -887,31 +915,36 @@ 
 		{
 			$_SESSION['last_backup_for'] = $context['lang_id'] . '$$$';
 			$result = package_create_backup('backup_lang_' . $context['lang_id']);
-			if (!$result)
-				fatal_lang_error('could_not_language_backup', false);
+			if (!$result) {
+							fatal_lang_error('could_not_language_backup', false);
+			}
 		}
 
 		// Second, loop through the array to remove the files.
 		foreach ($lang_dirs as $curPath)
 		{
-			foreach ($context['possible_files'][1]['files'] as $lang)
-				if (file_exists($curPath . '/' . $lang['id'] . '.' . $context['lang_id'] . '.php'))
+			foreach ($context['possible_files'][1]['files'] as $lang) {
+							if (file_exists($curPath . '/' . $lang['id'] . '.' . $context['lang_id'] . '.php'))
 					unlink($curPath . '/' . $lang['id'] . '.' . $context['lang_id'] . '.php');
+			}
 
 			// Check for the email template.
-			if (file_exists($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php'))
-				unlink($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php');
+			if (file_exists($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php')) {
+							unlink($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php');
+			}
 		}
 
 		// Third, the agreement file.
-		if (file_exists($boarddir . '/agreement.' . $context['lang_id'] . '.txt'))
-			unlink($boarddir . '/agreement.' . $context['lang_id'] . '.txt');
+		if (file_exists($boarddir . '/agreement.' . $context['lang_id'] . '.txt')) {
+					unlink($boarddir . '/agreement.' . $context['lang_id'] . '.txt');
+		}
 
 		// Fourth, a related images folder, if it exists...
-		if (!empty($images_dirs))
-			foreach ($images_dirs as $curPath)
+		if (!empty($images_dirs)) {
+					foreach ($images_dirs as $curPath)
 				if (is_dir($curPath))
 					deltree($curPath);
+		}
 
 		// Members can no longer use this language.
 		$smcFunc['db_query']('', '
@@ -995,8 +1028,9 @@ 
 		foreach ($_POST['entry'] as $k => $v)
 		{
 			// Only try to save if it's changed!
-			if ($_POST['entry'][$k] != $_POST['comp'][$k])
-				$save_strings[$k] = cleanLangString($v, false);
+			if ($_POST['entry'][$k] != $_POST['comp'][$k]) {
+							$save_strings[$k] = cleanLangString($v, false);
+			}
 		}
 	}
 
@@ -1030,12 +1064,13 @@ 
 		if ($multiline_cache)
 		{
 			preg_match('~\$(helptxt|txt|editortxt)\[\'(.+)\'\]\s?=\s?(.+);~ms', strtr($multiline_cache, array("\r" => '')), $matches);
-			if (!empty($matches[3]))
-				$entries[$matches[2]] = array(
+			if (!empty($matches[3])) {
+							$entries[$matches[2]] = array(
 					'type' => $matches[1],
 					'full' => $matches[0],
 					'entry' => $matches[3],
 				);
+			}
 		}
 
 		// These are the entries we can definitely save.
@@ -1046,8 +1081,9 @@ 
 		{
 			// Ignore some things we set separately.
 			$ignore_files = array('lang_character_set', 'lang_locale', 'lang_dictionary', 'lang_spelling', 'lang_rtl');
-			if (in_array($entryKey, $ignore_files))
-				continue;
+			if (in_array($entryKey, $ignore_files)) {
+							continue;
+			}
 
 			// These are arrays that need breaking out.
 			$arrays = array('days', 'days_short', 'months', 'months_titles', 'months_short', 'happy_birthday_author', 'karlbenson1_author', 'nite0859_author', 'zwaldowski_author', 'geezmo_author', 'karlbenson2_author');
@@ -1080,9 +1116,9 @@ 
 					{
 						$save_cache['entries'][$cur_index] = strtr($save_strings[$entryKey . '-+- ' . $cur_index], array('\'' => ''));
 						$save_cache['enabled'] = true;
+					} else {
+											$save_cache['entries'][$cur_index] = $subValue;
 					}
-					else
-						$save_cache['entries'][$cur_index] = $subValue;
 
 					$context['file_entries'][] = array(
 						'key' => $entryKey . '-+- ' . $cur_index,
@@ -1105,9 +1141,9 @@ 
 						{
 							$items[] = $k2 . ' => \'' . $v2 . '\'';
 							$cur_index = $k2;
+						} else {
+													$items[] = '\'' . $v2 . '\'';
 						}
-						else
-							$items[] = '\'' . $v2 . '\'';
 
 						$cur_index++;
 					}
@@ -1117,15 +1153,15 @@ 
 						'replace' => '$' . $entryValue['type'] . '[\'' . $entryKey . '\'] = array(' . implode(', ', $items) . ');',
 					);
 				}
-			}
-			else
+			} else
 			{
 				// Saving?
 				if (isset($save_strings[$entryKey]) && $save_strings[$entryKey] != $entryValue['entry'])
 				{
 					// @todo Fix this properly.
-					if ($save_strings[$entryKey] == '')
-						$save_strings[$entryKey] = '\'\'';
+					if ($save_strings[$entryKey] == '') {
+											$save_strings[$entryKey] = '\'\'';
+					}
 
 					// Set the new value.
 					$entryValue['entry'] = $save_strings[$entryKey];
@@ -1151,8 +1187,9 @@ 
 			checkSession();
 
 			$file_contents = implode('', file($current_file));
-			foreach ($final_saves as $save)
-				$file_contents = strtr($file_contents, array($save['find'] => $save['replace']));
+			foreach ($final_saves as $save) {
+							$file_contents = strtr($file_contents, array($save['find'] => $save['replace']));
+			}
 
 			// Save the actual changes.
 			$fp = fopen($current_file, 'w+');
@@ -1167,8 +1204,9 @@ 
 	}
 
 	// If we saved, redirect.
-	if ($madeSave)
-		redirectexit('action=admin;area=languages;sa=editlang;lid=' . $context['lang_id']);
+	if ($madeSave) {
+			redirectexit('action=admin;area=languages;sa=editlang;lid=' . $context['lang_id']);
+	}
 
 	createToken('admin-mlang');
 }
@@ -1200,8 +1238,9 @@ 
 				// Toggle the escape.
 				$is_escape = !$is_escape;
 				// If we're now escaped don't add this string.
-				if ($is_escape)
-					continue;
+				if ($is_escape) {
+									continue;
+				}
 			}
 			// Special case - parsed string with line break etc?
 			elseif (($string{$i} == 'n' || $string{$i} == 't') && $in_string == 2 && $is_escape)
@@ -1218,11 +1257,13 @@ 
 				if ($in_string != 2 && ($in_string != 1 || !$is_escape))
 				{
 					// Is it the end of a single quote string?
-					if ($in_string == 1)
-						$in_string = 0;
+					if ($in_string == 1) {
+											$in_string = 0;
+					}
 					// Otherwise it's the start!
-					else
-						$in_string = 1;
+					else {
+											$in_string = 1;
+					}
 
 					// Don't actually include this character!
 					continue;
@@ -1235,19 +1276,22 @@ 
 				if ($in_string != 1 && ($in_string != 2 || !$is_escape))
 				{
 					// Is it the end of a double quote string?
-					if ($in_string == 2)
-						$in_string = 0;
+					if ($in_string == 2) {
+											$in_string = 0;
+					}
 					// Otherwise it's the start!
-					else
-						$in_string = 2;
+					else {
+											$in_string = 2;
+					}
 
 					// Don't actually include this character!
 					continue;
 				}
 			}
 			// A join/space outside of a string is simply removed.
-			elseif ($in_string == 0 && (empty($string{$i}) || $string{$i} == '.'))
-				continue;
+			elseif ($in_string == 0 && (empty($string{$i}) || $string{$i} == '.')) {
+							continue;
+			}
 			// Start of a variable?
 			elseif ($in_string == 0 && $string{$i} == '$')
 			{
@@ -1281,8 +1325,7 @@ 
 
 		// Unhtml then rehtml the whole thing!
 		$new_string = $smcFunc['htmlspecialchars'](un_htmlspecialchars($new_string));
-	}
-	else
+	} else
 	{
 		// Keep track of what we're doing...
 		$in_string = 0;
@@ -1311,10 +1354,11 @@ 
 				preg_match('~\{%([\$A-Za-z0-9\'\[\]_-]+)%\}~', substr($string, $i), $matches);
 				if (!empty($matches[1]))
 				{
-					if ($in_string == 1)
-						$new_string .= '\' . ';
-					elseif ($new_string)
-						$new_string .= ' . ';
+					if ($in_string == 1) {
+											$new_string .= '\' . ';
+					} elseif ($new_string) {
+											$new_string .= ' . ';
+					}
 
 					$new_string .= $matches[1];
 					$i += strlen($matches[1]) + 3;
@@ -1327,8 +1371,9 @@ 
 			elseif ($string{$i} == '<')
 			{
 				// Probably HTML?
-				if ($string{$i + 1} != ' ')
-					$in_html = true;
+				if ($string{$i + 1} != ' ') {
+									$in_html = true;
+				}
 				// Assume we need an entity...
 				else
 				{
@@ -1340,8 +1385,9 @@ 
 			elseif ($string{$i} == '>')
 			{
 				// Will it be HTML?
-				if ($in_html)
-					$in_html = false;
+				if ($in_html) {
+									$in_html = false;
+				}
 				// Otherwise we need an entity...
 				else
 				{
@@ -1350,8 +1396,9 @@ 
 				}
 			}
 			// Is it a slash? If so escape it...
-			if ($string{$i} == '\\')
-				$new_string .= '\\';
+			if ($string{$i} == '\\') {
+							$new_string .= '\\';
+			}
 			// The infamous double quote?
 			elseif ($string{$i} == '"')
 			{
@@ -1374,10 +1421,11 @@ 
 		}
 
 		// If we ended as a string then close it off.
-		if ($in_string == 1)
-			$new_string .= '\'';
-		elseif ($in_string == 2)
-			$new_string .= '"';
+		if ($in_string == 1) {
+					$new_string .= '\'';
+		} elseif ($in_string == 2) {
+					$new_string .= '"';
+		}
 	}
 
 	return $new_string;

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>';