SimpleMachines / SMF2.1

Themes/default/Reports.template.php

Braces +32 added lines, -24 removed lines

@@ -29,9 +29,10 @@ 
 	// Go through each type of report they can run.
 	foreach ($context['report_types'] as $type)
 	{
-		if (isset($type['description']))
-			echo '
+		if (isset($type['description'])) {
+					echo '
 					<dt>', $type['description'], '</dt>';
+		}
 
 		echo '
 					<dd>
@@ -62,8 +63,9 @@ 
 		</div>
 		<div id="report_buttons">';
 
-	if (!empty($context['report_buttons']))
-		template_button_strip($context['report_buttons'], 'right');
+	if (!empty($context['report_buttons'])) {
+			template_button_strip($context['report_buttons'], 'right');
+	}
 
 	echo '
 		</div>';
@@ -74,25 +76,27 @@ 
 		echo '
 		<table class="table_grid report_results">';
 
-		if (!empty($table['title']))
-			echo '
+		if (!empty($table['title'])) {
+					echo '
 			<thead>
 				<tr class="title_bar">
 					<th scope="col" colspan="', $table['column_count'], '">', $table['title'], '</th>
 				</tr>
 			</thead>
 			<tbody>';
+		}
 
 		// Now do each row!
 		$row_number = 0;
 		foreach ($table['data'] as $row)
 		{
-			if ($row_number == 0 && !empty($table['shading']['top']))
-				echo '
+			if ($row_number == 0 && !empty($table['shading']['top'])) {
+							echo '
 				<tr class="windowbg table_caption">';
-			else
-				echo '
+			} else {
+							echo '
 				<tr class="', !empty($row[0]['separator']) ? 'title_bar' : 'windowbg', '">';
+			}
 
 			// Now do each column.
 			$column_number = 0;
@@ -110,16 +114,17 @@ 
 				}
 
 				// Shaded?
-				if ($column_number == 0 && !empty($table['shading']['left']))
-					echo '
+				if ($column_number == 0 && !empty($table['shading']['left'])) {
+									echo '
 					<td class="table_caption ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '', '>
 						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
 					</td>';
-				else
-					echo '
+				} else {
+									echo '
 					<td class="smalltext centertext" ', $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '', !empty($data['style']) ? ' style="' . $data['style'] . '"' : '', '>
 						', $data['v'], '
 					</td>';
+				}
 
 				$column_number++;
 			}
@@ -168,24 +173,26 @@ 
 		<div style="overflow: visible;', $table['max_width'] != 'auto' ? ' width: ' . $table['max_width'] . 'px;' : '', '">
 			<table class="bordercolor">';
 
-		if (!empty($table['title']))
-			echo '
+		if (!empty($table['title'])) {
+					echo '
 				<tr class="title_bar">
 					<td colspan="', $table['column_count'], '">
 						', $table['title'], '
 					</td>
 				</tr>';
+		}
 
 		// Now do each row!
 		$row_number = 0;
 		foreach ($table['data'] as $row)
 		{
-			if ($row_number == 0 && !empty($table['shading']['top']))
-				echo '
+			if ($row_number == 0 && !empty($table['shading']['top'])) {
+							echo '
 				<tr class="titlebg">';
-			else
-				echo '
+			} else {
+							echo '
 				<tr class="windowbg">';
+			}
 
 			// Now do each column!!
 			$column_number = 0;
@@ -202,16 +209,17 @@ 
 				}
 
 				// Shaded?
-				if ($column_number == 0 && !empty($table['shading']['left']))
-					echo '
+				if ($column_number == 0 && !empty($table['shading']['left'])) {
+									echo '
 					<td class="titlebg ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '', '>
 						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
 					</td>';
-				else
-					echo '
+				} else {
+									echo '
 					<td class="centertext" ', $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '', !empty($data['style']) ? ' style="' . $data['style'] . '"' : '', '>
 						', $data['v'], '
 					</td>';
+				}
 
 				$column_number++;
 			}

Sources/ManageSearch.php

Braces +109 added lines, -90 removed lines

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

Sources/Subs-Admin.php

Braces +124 added lines, -89 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get a list of versions that are currently installed on the server.
@@ -45,8 +46,7 @@ 
 			$temp2 = $temp->getVersion();
 			$im_version = $temp2['versionString'];
 			$extension_version = 'Imagick ' . phpversion('Imagick');
-		}
-		else
+		} else
 		{
 			$im_version = MagickGetVersionString();
 			$extension_version = 'MagickWand ' . phpversion('MagickWand');
@@ -61,9 +61,9 @@ 
 	if (in_array('db_server', $checkFor))
 	{
 		db_extend();
-		if (!isset($db_connection) || $db_connection === false)
-			trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
-		else
+		if (!isset($db_connection) || $db_connection === false) {
+					trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
+		} else
 		{
 			$versions['db_engine'] = array('title' => sprintf($txt['support_versions_db_engine'], $smcFunc['db_title']), 'version' => '');
 			$versions['db_engine']['version'] = $smcFunc['db_get_vendor']();
@@ -75,24 +75,31 @@ 
 
 	// If we're using memcache we need the server info.
 	$memcache_version = '???';
-	if (!empty($cache_accelerator) && ($cache_accelerator == 'memcached' || $cache_accelerator == 'memcache') && !empty($cache_memcached) && !empty($cacheAPI))
-		$memcache_version = $cacheAPI->getVersion();
+	if (!empty($cache_accelerator) && ($cache_accelerator == 'memcached' || $cache_accelerator == 'memcache') && !empty($cache_memcached) && !empty($cacheAPI)) {
+			$memcache_version = $cacheAPI->getVersion();
+	}
 
 	// Check to see if we have any accelerators installed...
-	if (in_array('phpa', $checkFor) && isset($_PHPA))
-		$versions['phpa'] = array('title' => 'ionCube PHP-Accelerator', 'version' => $_PHPA['VERSION']);
-	if (in_array('apc', $checkFor) && extension_loaded('apc'))
-		$versions['apc'] = array('title' => 'Alternative PHP Cache', 'version' => phpversion('apc'));
-	if (in_array('memcache', $checkFor) && function_exists('memcache_set'))
-		$versions['memcache'] = array('title' => 'Memcached', 'version' => $memcache_version);
-	if (in_array('xcache', $checkFor) && function_exists('xcache_set'))
-		$versions['xcache'] = array('title' => 'XCache', 'version' => XCACHE_VERSION);
+	if (in_array('phpa', $checkFor) && isset($_PHPA)) {
+			$versions['phpa'] = array('title' => 'ionCube PHP-Accelerator', 'version' => $_PHPA['VERSION']);
+	}
+	if (in_array('apc', $checkFor) && extension_loaded('apc')) {
+			$versions['apc'] = array('title' => 'Alternative PHP Cache', 'version' => phpversion('apc'));
+	}
+	if (in_array('memcache', $checkFor) && function_exists('memcache_set')) {
+			$versions['memcache'] = array('title' => 'Memcached', 'version' => $memcache_version);
+	}
+	if (in_array('xcache', $checkFor) && function_exists('xcache_set')) {
+			$versions['xcache'] = array('title' => 'XCache', 'version' => XCACHE_VERSION);
+	}
 
-	if (in_array('php', $checkFor))
-		$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION, 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	if (in_array('php', $checkFor)) {
+			$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION, 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	}
 
-	if (in_array('server', $checkFor))
-		$versions['server'] = array('title' => $txt['support_versions_server'], 'version' => $_SERVER['SERVER_SOFTWARE']);
+	if (in_array('server', $checkFor)) {
+			$versions['server'] = array('title' => $txt['support_versions_server'], 'version' => $_SERVER['SERVER_SOFTWARE']);
+	}
 
 	return $versions;
 }
@@ -132,11 +139,13 @@ 
 		fclose($fp);
 
 		// The comment looks rougly like... that.
-		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-			$version_info['file_versions']['SSI.php'] = $match[1];
+		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+					$version_info['file_versions']['SSI.php'] = $match[1];
+		}
 		// Not found!  This is bad.
-		else
-			$version_info['file_versions']['SSI.php'] = '??';
+		else {
+					$version_info['file_versions']['SSI.php'] = '??';
+		}
 	}
 
 	// Do the paid subscriptions handler?
@@ -147,11 +156,13 @@ 
 		fclose($fp);
 
 		// Found it?
-		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-			$version_info['file_versions']['subscriptions.php'] = $match[1];
+		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+					$version_info['file_versions']['subscriptions.php'] = $match[1];
+		}
 		// If we haven't how do we all get paid?
-		else
-			$version_info['file_versions']['subscriptions.php'] = '??';
+		else {
+					$version_info['file_versions']['subscriptions.php'] = '??';
+		}
 	}
 
 	// Load all the files in the Sources directory, except this file and the redirect.
@@ -166,11 +177,13 @@ 
 			fclose($fp);
 
 			// Look for the version comment in the file header.
-			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-				$version_info['file_versions'][$entry] = $match[1];
+			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+							$version_info['file_versions'][$entry] = $match[1];
+			}
 			// It wasn't found, but the file was... show a '??'.
-			else
-				$version_info['file_versions'][$entry] = '??';
+			else {
+							$version_info['file_versions'][$entry] = '??';
+			}
 		}
 	}
 	$sources_dir->close();
@@ -189,11 +202,13 @@ 
 				fclose($fp);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					$version_info['tasks_versions'][$entry] = $match[1];
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+									$version_info['tasks_versions'][$entry] = $match[1];
+				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-					$version_info['tasks_versions'][$entry] = '??';
+				else {
+									$version_info['tasks_versions'][$entry] = '??';
+				}
 			}
 		}
 		$tasks_dir->close();
@@ -201,8 +216,9 @@ 
 
 	// Load all the files in the default template directory - and the current theme if applicable.
 	$directories = array('default_template_versions' => $settings['default_theme_dir']);
-	if ($settings['theme_id'] != 1)
-		$directories += array('template_versions' => $settings['theme_dir']);
+	if ($settings['theme_id'] != 1) {
+			$directories += array('template_versions' => $settings['theme_dir']);
+	}
 
 	foreach ($directories as $type => $dirname)
 	{
@@ -217,11 +233,13 @@ 
 				fclose($fp);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					$version_info[$type][$entry] = $match[1];
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+									$version_info[$type][$entry] = $match[1];
+				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-					$version_info[$type][$entry] = '??';
+				else {
+									$version_info[$type][$entry] = '??';
+				}
 			}
 		}
 		$this_dir->close();
@@ -242,11 +260,13 @@ 
 			list ($name, $language) = explode('.', $entry);
 
 			// Look for the version comment in the file header.
-			if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1)
-				$version_info['default_language_versions'][$language][$name] = $match[1];
+			if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1) {
+							$version_info['default_language_versions'][$language][$name] = $match[1];
+			}
 			// It wasn't found, but the file was... show a '??'.
-			else
-				$version_info['default_language_versions'][$language][$name] = '??';
+			else {
+							$version_info['default_language_versions'][$language][$name] = '??';
+			}
 		}
 	}
 	$this_dir->close();
@@ -261,8 +281,9 @@ 
 		ksort($version_info['tasks_versions']);
 
 		// For languages sort each language too.
-		foreach ($version_info['default_language_versions'] as $language => $dummy)
-			ksort($version_info['default_language_versions'][$language]);
+		foreach ($version_info['default_language_versions'] as $language => $dummy) {
+					ksort($version_info['default_language_versions'][$language]);
+		}
 	}
 	return $version_info;
 }
@@ -304,27 +325,31 @@ 
 	$settingsArray = trim(file_get_contents($boarddir . '/Settings.php'));
 
 	// Break it up based on \r or \n, and then clean out extra characters.
-	if (strpos($settingsArray, "\n") !== false)
-		$settingsArray = explode("\n", $settingsArray);
-	elseif (strpos($settingsArray, "\r") !== false)
-		$settingsArray = explode("\r", $settingsArray);
-	else
-		return;
+	if (strpos($settingsArray, "\n") !== false) {
+			$settingsArray = explode("\n", $settingsArray);
+	} elseif (strpos($settingsArray, "\r") !== false) {
+			$settingsArray = explode("\r", $settingsArray);
+	} else {
+			return;
+	}
 
 	// Presumably, the file has to have stuff in it for this function to be called :P.
-	if (count($settingsArray) < 10)
-		return;
+	if (count($settingsArray) < 10) {
+			return;
+	}
 
 	// remove any /r's that made there way in here
-	foreach ($settingsArray as $k => $dummy)
-		$settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n";
+	foreach ($settingsArray as $k => $dummy) {
+			$settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n";
+	}
 
 	// go line by line and see whats changing
 	for ($i = 0, $n = count($settingsArray); $i < $n; $i++)
 	{
 		// Don't trim or bother with it if it's not a variable.
-		if (substr($settingsArray[$i], 0, 1) != '$')
-			continue;
+		if (substr($settingsArray[$i], 0, 1) != '$') {
+					continue;
+		}
 
 		$settingsArray[$i] = trim($settingsArray[$i]) . "\n";
 
@@ -336,8 +361,7 @@ 
 			{
 				updateDbLastError($val);
 				unset($config_vars[$var]);
-			}
-			elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
+			} elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
 			{
 				$comment = strstr(substr($settingsArray[$i], strpos($settingsArray[$i], ';')), '#');
 				$settingsArray[$i] = '$' . $var . ' = ' . $val . ';' . ($comment == '' ? '' : "\t\t" . rtrim($comment)) . "\n";
@@ -348,34 +372,39 @@ 
 		}
 
 		// End of the file ... maybe
-		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>')
-			$end = $i;
+		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>') {
+					$end = $i;
+		}
 	}
 
 	// This should never happen, but apparently it is happening.
-	if (empty($end) || $end < 10)
-		$end = count($settingsArray) - 1;
+	if (empty($end) || $end < 10) {
+			$end = count($settingsArray) - 1;
+	}
 
 	// Still more variables to go?  Then lets add them at the end.
 	if (!empty($config_vars))
 	{
-		if (trim($settingsArray[$end]) == '?' . '>')
-			$settingsArray[$end++] = '';
-		else
-			$end++;
+		if (trim($settingsArray[$end]) == '?' . '>') {
+					$settingsArray[$end++] = '';
+		} else {
+					$end++;
+		}
 
 		// Add in any newly defined vars that were passed
-		foreach ($config_vars as $var => $val)
-			$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+		foreach ($config_vars as $var => $val) {
+					$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+		}
 
 		$settingsArray[$end] = '?' . '>';
+	} else {
+			$settingsArray[$end] = trim($settingsArray[$end]);
 	}
-	else
-		$settingsArray[$end] = trim($settingsArray[$end]);
 
 	// Sanity error checking: the file needs to be at least 12 lines.
-	if (count($settingsArray) < 12)
-		return;
+	if (count($settingsArray) < 12) {
+			return;
+	}
 
 	// Try to avoid a few pitfalls:
 	//  - like a possible race condition,
@@ -383,8 +412,9 @@ 
 	//
 	// Check before you act: if cache is enabled, we can do a simple write test
 	// to validate that we even write things on this filesystem.
-	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
-		$cachedir = $boarddir . '/cache';
+	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
+			$cachedir = $boarddir . '/cache';
+	}
 
 	$test_fp = @fopen($cachedir . '/settings_update.tmp', "w+");
 	if ($test_fp)
@@ -419,16 +449,18 @@ 
 			// Well this is not good at all, lets see if we can save this
 			$context['settings_message'] = 'settings_error';
 
-			if (file_exists($boarddir . '/Settings_bak.php'))
-				@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
+			if (file_exists($boarddir . '/Settings_bak.php')) {
+							@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
+			}
 		}
 	}
 
 	// Even though on normal installations the filemtime should prevent this being used by the installer incorrectly
 	// it seems that there are times it might not. So let's MAKE it dump the cache.
-	if (function_exists('opcache_invalidate'))
-		opcache_invalidate($boarddir . '/Settings.php', true);
-}
+	if (function_exists('opcache_invalidate')) {
+			opcache_invalidate($boarddir . '/Settings.php', true);
+	}
+	}
 
 /**
  * Saves the time of the last db error for the error log
@@ -454,8 +486,9 @@ 
 	global $options, $context, $smcFunc, $settings, $user_info;
 
 	// This must exist!
-	if (!isset($context['admin_preferences']))
-		return false;
+	if (!isset($context['admin_preferences'])) {
+			return false;
+	}
 
 	// This is what we'll be saving.
 	$options['admin_preferences'] = $smcFunc['json_encode']($context['admin_preferences']);
@@ -519,8 +552,9 @@ 
 	$emails_sent = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($prefs[$row['id_member']]['announcements']))
-			continue;
+		if (empty($prefs[$row['id_member']]['announcements'])) {
+					continue;
+		}
 
 		// Stick their particulars in the replacement data.
 		$replacements['IDMEMBER'] = $row['id_member'];
@@ -539,11 +573,12 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Any additional users we must email this to?
-	if (!empty($additional_recipients))
-		foreach ($additional_recipients as $recipient)
+	if (!empty($additional_recipients)) {
+			foreach ($additional_recipients as $recipient)
 		{
 			if (in_array($recipient['email'], $emails_sent))
 				continue;
+	}
 
 			$replacements['IDMEMBER'] = $recipient['id'];
 			$replacements['REALNAME'] = $recipient['name'];

Sources/ManageNews.php

Braces +140 added lines, -102 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The news dispatcher; doesn't do anything, just delegates.
@@ -67,8 +68,9 @@ 
 	);
 
 	// Force the right area...
-	if (substr($_REQUEST['sa'], 0, 7) == 'mailing')
-		$context[$context['admin_menu_name']]['current_subsection'] = 'mailingmembers';
+	if (substr($_REQUEST['sa'], 0, 7) == 'mailing') {
+			$context[$context['admin_menu_name']]['current_subsection'] = 'mailingmembers';
+	}
 
 	call_helper($subActions[$_REQUEST['sa']][0]);
 }
@@ -99,9 +101,10 @@ 
 		$temp_news = explode("\n", $modSettings['news']);
 
 		// Remove the items that were selected.
-		foreach ($temp_news as $i => $news)
-			if (in_array($i, $_POST['remove']))
+		foreach ($temp_news as $i => $news) {
+					if (in_array($i, $_POST['remove']))
 				unset($temp_news[$i]);
+		}
 
 		// Update the database.
 		updateSettings(array('news' => implode("\n", $temp_news)));
@@ -117,9 +120,9 @@ 
 
 		foreach ($_POST['news'] as $i => $news)
 		{
-			if (trim($news) == '')
-				unset($_POST['news'][$i]);
-			else
+			if (trim($news) == '') {
+							unset($_POST['news'][$i]);
+			} else
 			{
 				$_POST['news'][$i] = $smcFunc['htmlspecialchars']($_POST['news'][$i], ENT_QUOTES);
 				preparsecode($_POST['news'][$i]);
@@ -155,12 +158,13 @@ 
 				'data' => array(
 					'function' => function($news)
 					{
-						if (is_numeric($news['id']))
-							return '
+						if (is_numeric($news['id'])) {
+													return '
 								<textarea id="data_' . $news['id'] . '" rows="3" cols="50" name="news[]" class="padding block">' . $news['unparsed'] . '</textarea>
 								<div class="floatleft" id="preview_' . $news['id'] . '"></div>';
-						else
-							return $news['unparsed'];
+						} else {
+													return $news['unparsed'];
+						}
 					},
 					'class' => 'half_table',
 				),
@@ -186,10 +190,11 @@ 
 				'data' => array(
 					'function' => function($news)
 					{
-						if (is_numeric($news['id']))
-							return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '">';
-						else
-							return '';
+						if (is_numeric($news['id'])) {
+													return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '">';
+						} else {
+													return '';
+						}
 					},
 					'class' => 'centercol icon',
 				),
@@ -283,12 +288,13 @@ 
 
 	$admin_current_news = array();
 	// Ready the current news.
-	foreach (explode("\n", $modSettings['news']) as $id => $line)
-		$admin_current_news[$id] = array(
+	foreach (explode("\n", $modSettings['news']) as $id => $line) {
+			$admin_current_news[$id] = array(
 			'id' => $id,
 			'unparsed' => un_preparsecode($line),
 			'parsed' => preg_replace('~<([/]?)form[^>]*?[>]*>~i', '<em class="smalltext">&lt;$1form&gt;</em>', parse_bbc($line)),
 		);
+	}
 
 	$admin_current_news['last'] = array(
 		'id' => 'last',
@@ -355,10 +361,11 @@ 
 			'member_count' => 0,
 		);
 
-		if ($row['min_posts'] == -1)
-			$normalGroups[$row['id_group']] = $row['id_group'];
-		else
-			$postGroups[$row['id_group']] = $row['id_group'];
+		if ($row['min_posts'] == -1) {
+					$normalGroups[$row['id_group']] = $row['id_group'];
+		} else {
+					$postGroups[$row['id_group']] = $row['id_group'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -374,8 +381,9 @@ 
 				'post_group_list' => $postGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -391,8 +399,9 @@ 
 				'normal_group_list' => $normalGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		}
 		$smcFunc['db_free_result']($query);
 
 		// Also do those who have it as an additional membergroup - this ones more yucky...
@@ -409,8 +418,9 @@ 
 				'blank_string' => '',
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -461,10 +471,11 @@ 
 	{
 		$context[$key] = !empty($_REQUEST[$post]) ? $_REQUEST[$post] : '';
 
-		if (empty($context[$key]) && empty($_REQUEST['xml']))
-			$context['post_error']['messages'][] = $txt['error_no_' . $post];
-		elseif (!empty($_REQUEST['xml']))
-			continue;
+		if (empty($context[$key]) && empty($_REQUEST['xml'])) {
+					$context['post_error']['messages'][] = $txt['error_no_' . $post];
+		} elseif (!empty($_REQUEST['xml'])) {
+					continue;
+		}
 
 		preparsecode($context[$key]);
 		if ($html)
@@ -543,10 +554,12 @@ 
 
 	// Start by finding any members!
 	$toClean = array();
-	if (!empty($_POST['members']))
-		$toClean[] = 'members';
-	if (!empty($_POST['exclude_members']))
-		$toClean[] = 'exclude_members';
+	if (!empty($_POST['members'])) {
+			$toClean[] = 'members';
+	}
+	if (!empty($_POST['exclude_members'])) {
+			$toClean[] = 'exclude_members';
+	}
 	if (!empty($toClean))
 	{
 		require_once($sourcedir . '/Subs-Auth.php');
@@ -558,11 +571,13 @@ 
 			preg_match_all('~"([^"]+)"~', $_POST[$type], $matches);
 			$_POST[$type] = array_unique(array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $_POST[$type]))));
 
-			foreach ($_POST[$type] as $index => $member)
-				if (strlen(trim($member)) > 0)
+			foreach ($_POST[$type] as $index => $member) {
+							if (strlen(trim($member)) > 0)
 					$_POST[$type][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($member)));
-				else
-					unset($_POST[$type][$index]);
+			}
+				else {
+									unset($_POST[$type][$index]);
+				}
 
 			// Find the members
 			$_POST[$type] = implode(',', array_keys(findMembers($_POST[$type])));
@@ -572,16 +587,18 @@ 
 	if (isset($_POST['member_list']) && is_array($_POST['member_list']))
 	{
 		$members = array();
-		foreach ($_POST['member_list'] as $member_id)
-			$members[] = (int) $member_id;
+		foreach ($_POST['member_list'] as $member_id) {
+					$members[] = (int) $member_id;
+		}
 		$_POST['members'] = implode(',', $members);
 	}
 
 	if (isset($_POST['exclude_member_list']) && is_array($_POST['exclude_member_list']))
 	{
 		$members = array();
-		foreach ($_POST['exclude_member_list'] as $member_id)
-			$members[] = (int) $member_id;
+		foreach ($_POST['exclude_member_list'] as $member_id) {
+					$members[] = (int) $member_id;
+		}
 		$_POST['exclude_members'] = implode(',', $members);
 	}
 
@@ -605,8 +622,9 @@ 
 			'current_time' => time(),
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['recipients']['exclude_members'][] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['recipients']['exclude_members'][] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -641,8 +659,9 @@ 
 			WHERE email_address IN(' . implode(', ', $condition_array) . ')',
 			$condition_array_params
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['recipients']['exclude_members'][] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['recipients']['exclude_members'][] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -660,10 +679,11 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (in_array(3, $context['recipients']))
-				$context['recipients']['exclude_members'][] = $row['identifier'];
-			else
-				$context['recipients']['members'][] = $row['identifier'];
+			if (in_array(3, $context['recipients'])) {
+							$context['recipients']['exclude_members'][] = $row['identifier'];
+			} else {
+							$context['recipients']['members'][] = $row['identifier'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
@@ -710,8 +730,9 @@ 
 	$num_at_once = 1000;
 
 	// If by PM's I suggest we half the above number.
-	if (!empty($_POST['send_pm']))
-		$num_at_once /= 2;
+	if (!empty($_POST['send_pm'])) {
+			$num_at_once /= 2;
+	}
 
 	checkSession();
 
@@ -734,8 +755,7 @@ 
 		);
 		list ($context['total_members']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		$context['total_members'] = (int) $_REQUEST['total_members'];
 	}
@@ -753,32 +773,35 @@ 
 	if (!empty($_POST['exclude_members']))
 	{
 		$members = explode(',', $_POST['exclude_members']);
-		foreach ($members as $member)
-			if ($member >= $context['start'])
+		foreach ($members as $member) {
+					if ($member >= $context['start'])
 				$context['recipients']['exclude_members'][] = (int) $member;
+		}
 	}
 
 	// What about members we *must* do?
 	if (!empty($_POST['members']))
 	{
 		$members = explode(',', $_POST['members']);
-		foreach ($members as $member)
-			if ($member >= $context['start'])
+		foreach ($members as $member) {
+					if ($member >= $context['start'])
 				$context['recipients']['members'][] = (int) $member;
+		}
 	}
 	// Cleaning groups is simple - although deal with both checkbox and commas.
 	if (isset($_POST['groups']))
 	{
 		if (is_array($_POST['groups']))
 		{
-			foreach ($_POST['groups'] as $group => $dummy)
-				$context['recipients']['groups'][] = (int) $group;
-		}
-		else
+			foreach ($_POST['groups'] as $group => $dummy) {
+							$context['recipients']['groups'][] = (int) $group;
+			}
+		} else
 		{
 			$groups = explode(',', $_POST['groups']);
-			foreach ($groups as $group)
-				$context['recipients']['groups'][] = (int) $group;
+			foreach ($groups as $group) {
+							$context['recipients']['groups'][] = (int) $group;
+			}
 		}
 	}
 	// Same for excluded groups
@@ -786,15 +809,17 @@ 
 	{
 		if (is_array($_POST['exclude_groups']))
 		{
-			foreach ($_POST['exclude_groups'] as $group => $dummy)
-				$context['recipients']['exclude_groups'][] = (int) $group;
+			foreach ($_POST['exclude_groups'] as $group => $dummy) {
+							$context['recipients']['exclude_groups'][] = (int) $group;
+			}
 		}
 		// Ignore an empty string - we don't want to exclude "Regular Members" unless it's specifically selected
 		elseif ($_POST['exclude_groups'] != '')
 		{
 			$groups = explode(',', $_POST['exclude_groups']);
-			foreach ($groups as $group)
-				$context['recipients']['exclude_groups'][] = (int) $group;
+			foreach ($groups as $group) {
+							$context['recipients']['exclude_groups'][] = (int) $group;
+			}
 		}
 	}
 	// Finally - emails!
@@ -804,14 +829,16 @@ 
 		foreach ($addressed as $curmem)
 		{
 			$curmem = trim($curmem);
-			if ($curmem != '' && filter_var($curmem, FILTER_VALIDATE_EMAIL))
-				$context['recipients']['emails'][$curmem] = $curmem;
+			if ($curmem != '' && filter_var($curmem, FILTER_VALIDATE_EMAIL)) {
+							$context['recipients']['emails'][$curmem] = $curmem;
+			}
 		}
 	}
 
 	// If we're only cleaning drop out here.
-	if ($clean_only)
-		return;
+	if ($clean_only) {
+			return;
+	}
 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -827,16 +854,18 @@ 
 	if (!$context['send_pm'] && !empty($_POST['send_html']))
 	{
 		// Prepare the message for HTML.
-		if (!empty($_POST['parse_html']))
-			$_POST['message'] = str_replace(array("\n", '  '), array('<br>' . "\n", '&nbsp; '), $_POST['message']);
+		if (!empty($_POST['parse_html'])) {
+					$_POST['message'] = str_replace(array("\n", '  '), array('<br>' . "\n", '&nbsp; '), $_POST['message']);
+		}
 
 		// This is here to prevent spam filters from tagging this as spam.
 		if (preg_match('~\<html~i', $_POST['message']) == 0)
 		{
-			if (preg_match('~\<body~i', $_POST['message']) == 0)
-				$_POST['message'] = '<html><head><title>' . $_POST['subject'] . '</title></head>' . "\n" . '<body>' . $_POST['message'] . '</body></html>';
-			else
-				$_POST['message'] = '<html>' . $_POST['message'] . '</html>';
+			if (preg_match('~\<body~i', $_POST['message']) == 0) {
+							$_POST['message'] = '<html><head><title>' . $_POST['subject'] . '</title></head>' . "\n" . '<body>' . $_POST['message'] . '</body></html>';
+			} else {
+							$_POST['message'] = '<html>' . $_POST['message'] . '</html>';
+			}
 		}
 	}
 
@@ -890,15 +919,17 @@ 
 	foreach ($context['recipients']['emails'] as $k => $email)
 	{
 		// Done as many as we can?
-		if ($i >= $num_at_once)
-			break;
+		if ($i >= $num_at_once) {
+					break;
+		}
 
 		// Don't sent it twice!
 		unset($context['recipients']['emails'][$k]);
 
 		// Dammit - can't PM emails!
-		if ($context['send_pm'])
-			continue;
+		if ($context['send_pm']) {
+					continue;
+		}
 
 		$to_member = array(
 			$email,
@@ -932,8 +963,9 @@ 
 					$queryBuild[] = 'mem.id_post_group = {int:group_' . $group . '}';
 				}
 			}
-			if (!empty($queryBuild))
-			$sendQuery .= implode(' OR ', $queryBuild);
+			if (!empty($queryBuild)) {
+						$sendQuery .= implode(' OR ', $queryBuild);
+			}
 		}
 		if (!empty($context['recipients']['members']))
 		{
@@ -952,8 +984,9 @@ 
 		}
 
 		// Anything to exclude?
-		if (!empty($context['recipients']['exclude_groups']) && in_array(0, $context['recipients']['exclude_groups']))
-			$sendQuery .= ' AND mem.id_group != {int:regular_group}';
+		if (!empty($context['recipients']['exclude_groups']) && in_array(0, $context['recipients']['exclude_groups'])) {
+					$sendQuery .= ' AND mem.id_group != {int:regular_group}';
+		}
 		if (!empty($context['recipients']['exclude_members']))
 		{
 			$sendQuery .= ' AND mem.id_member NOT IN ({array_int:exclude_members})';
@@ -989,21 +1022,24 @@ 
 		foreach ($rows as $row)
 		{
 			// Force them to have it?
-			if (empty($context['email_force']) && empty($prefs[$row['id_member']]['announcements']))
-				continue;
+			if (empty($context['email_force']) && empty($prefs[$row['id_member']]['announcements'])) {
+							continue;
+			}
 
 			// What groups are we looking at here?
-			if (empty($row['additional_groups']))
-				$groups = array($row['id_group'], $row['id_post_group']);
-			else
-				$groups = array_merge(
+			if (empty($row['additional_groups'])) {
+							$groups = array($row['id_group'], $row['id_post_group']);
+			} else {
+							$groups = array_merge(
 					array($row['id_group'], $row['id_post_group']),
 					explode(',', $row['additional_groups'])
 				);
+			}
 
 			// Excluded groups?
-			if (array_intersect($groups, $context['recipients']['exclude_groups']))
-				continue;
+			if (array_intersect($groups, $context['recipients']['exclude_groups'])) {
+							continue;
+			}
 
 			// We might need this
 			$cleanMemberName = empty($_POST['send_html']) || $context['send_pm'] ? un_htmlspecialchars($row['real_name']) : $row['real_name'];
@@ -1026,10 +1062,11 @@ 
 				), $_POST['subject']);
 
 			// Send the actual email - or a PM!
-			if (!$context['send_pm'])
-				sendmail($row['email_address'], $subject, $message, null, 'news', !empty($_POST['send_html']), 5);
-			else
-				sendpm(array('to' => array($row['id_member']), 'bcc' => array()), $subject, $message);
+			if (!$context['send_pm']) {
+							sendmail($row['email_address'], $subject, $message, null, 'news', !empty($_POST['send_html']), 5);
+			} else {
+							sendpm(array('to' => array($row['id_member']), 'bcc' => array()), $subject, $message);
+			}
 		}
 	}
 
@@ -1079,8 +1116,9 @@ 
 
 	call_integration_hook('integrate_modify_news_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['page_title'] = $txt['admin_edit_news'] . ' - ' . $txt['settings'];
 	$context['sub_template'] = 'show_settings';

Sources/CacheAPI-postgres.php

Braces +28 added lines, -19 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * PostgreSQL Cache API class
@@ -49,8 +50,9 @@ 
 
 		$result = pg_execute($db_connection, '', array('public', $db_prefix . 'cache'));
 
-		if (pg_affected_rows($result) === 0)
-			pg_query($db_connection, 'CREATE UNLOGGED TABLE ' . $db_prefix . 'cache (key text, value text, ttl bigint, PRIMARY KEY (key))');			
+		if (pg_affected_rows($result) === 0) {
+					pg_query($db_connection, 'CREATE UNLOGGED TABLE ' . $db_prefix . 'cache (key text, value text, ttl bigint, PRIMARY KEY (key))');
+		}
 	}
 
 	/**
@@ -60,14 +62,16 @@ 
 	{
 		global $smcFunc, $db_connection;
 
-		if ($smcFunc['db_title'] !== 'PostgreSQL')
-			return false;
+		if ($smcFunc['db_title'] !== 'PostgreSQL') {
+					return false;
+		}
 
 		$result = pg_query($db_connection, 'SHOW server_version_num');
 		$res = pg_fetch_assoc($result);
 		
-		if ($res['server_version_num'] < 90500)
-			return false;
+		if ($res['server_version_num'] < 90500) {
+					return false;
+		}
 		
 		return $test ? true : parent::isSupported();
 	}
@@ -81,13 +85,15 @@ 
 
 		$ttl = time() - $ttl;
 		
-		if (empty($this->pg_get_data_prep))
-			$this->pg_get_data_prep = pg_prepare($db_connection, 'smf_cache_get_data', 'SELECT value FROM ' . $db_prefix . 'cache WHERE key = $1 AND ttl >= $2 LIMIT 1');
+		if (empty($this->pg_get_data_prep)) {
+					$this->pg_get_data_prep = pg_prepare($db_connection, 'smf_cache_get_data', 'SELECT value FROM ' . $db_prefix . 'cache WHERE key = $1 AND ttl >= $2 LIMIT 1');
+		}
 			
 		$result = pg_execute($db_connection, 'smf_cache_get_data', array($key, $ttl));
 		
-		if (pg_affected_rows($result) === 0)
-			return null;
+		if (pg_affected_rows($result) === 0) {
+					return null;
+		}
 
 		$res = pg_fetch_assoc($result);
 
@@ -101,23 +107,26 @@ 
 	{
 		global  $db_prefix, $db_connection;
 
-		if (!isset($value))
-			$value = '';
+		if (!isset($value)) {
+					$value = '';
+		}
 
 		$ttl = time() + $ttl;
 
-		if (empty($this->pg_put_data_prep))
-			$this->pg_put_data_prep = pg_prepare($db_connection, 'smf_cache_put_data',
+		if (empty($this->pg_put_data_prep)) {
+					$this->pg_put_data_prep = pg_prepare($db_connection, 'smf_cache_put_data',
 				'INSERT INTO ' . $db_prefix . 'cache(key,value,ttl) VALUES($1,$2,$3)
 				ON CONFLICT(key) DO UPDATE SET value = excluded.value, ttl = excluded.ttl'
 			);
+		}
 
 		$result = pg_execute($db_connection, 'smf_cache_put_data', array($key, $value, $ttl));
 
-		if (pg_affected_rows($result) > 0)
-			return true;
-		else
-			return false;
+		if (pg_affected_rows($result) > 0) {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**

Sources/CacheAPI-sqlite.php

Braces +24 added lines, -17 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * SQLite Cache API class
@@ -68,8 +69,9 @@ 
 	{
 		$supported = class_exists("SQLite3") && is_writable($this->cachedir);
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 
 		return parent::isSupported() && $supported;
 	}
@@ -84,8 +86,9 @@ 
 		$result = $this->cacheDB->query($query);
 
 		$value = null;
-		while ($res = $result->fetchArray(SQLITE3_ASSOC))
-			$value = $res['value'];
+		while ($res = $result->fetchArray(SQLITE3_ASSOC)) {
+					$value = $res['value'];
+		}
 
 		return !empty($value) ? $value : null;
 	}
@@ -108,10 +111,11 @@ 
 	 */
 	public function cleanCache($type = '')
 	{
-		if($type == 'expired')
-			$query = 'DELETE FROM cache WHERE ttl >= ' . time().';';
-		else
-			$query = 'DELETE FROM cache;';
+		if($type == 'expired') {
+					$query = 'DELETE FROM cache WHERE ttl >= ' . time().';';
+		} else {
+					$query = 'DELETE FROM cache;';
+		}
 
 		$result = $this->cacheDB->exec($query);
 		
@@ -131,8 +135,9 @@ 
 		$config_vars[] = $txt['cache_sqlite_settings'];
 		$config_vars[] = array('cachedir_sqlite', $txt['cachedir_sqlite'], 'file', 'text', 36, 'cache_sqlite_cachedir');
 
-		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) {
@@ -155,13 +160,15 @@ 
 		global $cachedir, $cachedir_sqlite;
 
 		// If its invalid, use SMF's.
-		if (is_null($dir) || !is_writable($dir))
-			if(is_null($cachedir_sqlite) || !is_writable($cachedir_sqlite))
+		if (is_null($dir) || !is_writable($dir)) {
+					if(is_null($cachedir_sqlite) || !is_writable($cachedir_sqlite))
 				$this->cachedir = $cachedir;
-			else
-				$this->cachedir = $cachedir_sqlite;
-		else
-			$this->cachedir = $dir;
+		} else {
+							$this->cachedir = $cachedir_sqlite;
+			}
+		else {
+					$this->cachedir = $dir;
+		}
 	}
 
 	/**

Sources/Profile-Actions.php

Braces +117 added lines, -86 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Activate an account.
@@ -48,8 +49,9 @@ 
 		logAction('approve_member', array('member' => $memID), 'admin');
 
 		// If we are doing approval, update the stats for the member just in case.
-		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15)))
-			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15))) {
+					updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		}
 
 		// Make sure we update the stats too.
 		updateStats('member', false);
@@ -76,8 +78,9 @@ 
 	$issueErrors = array();
 
 	// Doesn't hurt to be overly cautious.
-	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning'))
-		fatal_lang_error('no_access', false);
+	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Get the base (errors related) stuff done.
 	loadLanguage('Errors');
@@ -135,16 +138,18 @@ 
 
 		// This cannot be empty!
 		$_POST['warn_reason'] = isset($_POST['warn_reason']) ? trim($_POST['warn_reason']) : '';
-		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner'])
-			$issueErrors[] = 'warning_no_reason';
+		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner']) {
+					$issueErrors[] = 'warning_no_reason';
+		}
 		$_POST['warn_reason'] = $smcFunc['htmlspecialchars']($_POST['warn_reason']);
 
 		$_POST['warning_level'] = (int) $_POST['warning_level'];
 		$_POST['warning_level'] = max(0, min(100, $_POST['warning_level']));
-		if ($_POST['warning_level'] < $context['min_allowed'])
-			$_POST['warning_level'] = $context['min_allowed'];
-		elseif ($_POST['warning_level'] > $context['max_allowed'])
-			$_POST['warning_level'] = $context['max_allowed'];
+		if ($_POST['warning_level'] < $context['min_allowed']) {
+					$_POST['warning_level'] = $context['min_allowed'];
+		} elseif ($_POST['warning_level'] > $context['max_allowed']) {
+					$_POST['warning_level'] = $context['max_allowed'];
+		}
 
 		// Do we actually have to issue them with a PM?
 		$id_notice = 0;
@@ -152,8 +157,9 @@ 
 		{
 			$_POST['warn_sub'] = trim($_POST['warn_sub']);
 			$_POST['warn_body'] = trim($_POST['warn_body']);
-			if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-				$issueErrors[] = 'warning_notify_blank';
+			if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+							$issueErrors[] = 'warning_notify_blank';
+			}
 			// Send the PM?
 			else
 			{
@@ -190,8 +196,8 @@ 
 		if (empty($issueErrors))
 		{
 			// Log what we've done!
-			if (!$context['user']['is_owner'])
-				$smcFunc['db_insert']('',
+			if (!$context['user']['is_owner']) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}log_comments',
 					array(
 						'id_member' => 'int', 'member_name' => 'string', 'comment_type' => 'string', 'id_recipient' => 'int', 'recipient_name' => 'string-255',
@@ -203,14 +209,14 @@ 
 					),
 					array('id_comment')
 				);
+			}
 
 			// Make the change.
 			updateMemberData($memID, array('warning' => $_POST['warning_level']));
 
 			// Leave a lovely message.
 			$context['profile_updated'] = $context['user']['is_owner'] ? $txt['profile_updated_own'] : $txt['profile_warning_success'];
-		}
-		else
+		} else
 		{
 			// Try to remember some bits.
 			$context['warning_data'] = array(
@@ -229,8 +235,9 @@ 
 	{
 		$warning_body = !empty($_POST['warn_body']) ? trim(censorText($_POST['warn_body'])) : '';
 		$context['preview_subject'] = !empty($_POST['warn_sub']) ? trim($smcFunc['htmlspecialchars']($_POST['warn_sub'])) : '';
-		if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-			$issueErrors[] = 'warning_notify_blank';
+		if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+					$issueErrors[] = 'warning_notify_blank';
+		}
 
 		if (!empty($_POST['warn_body']))
 		{
@@ -254,8 +261,9 @@ 
 	{
 		// Fill in the suite of errors.
 		$context['post_errors'] = array();
-		foreach ($issueErrors as $error)
-			$context['post_errors'][] = $txt[$error];
+		foreach ($issueErrors as $error) {
+					$context['post_errors'][] = $txt[$error];
+		}
 	}
 
 
@@ -272,9 +280,10 @@ 
 		$modSettings['warning_mute'] => $txt['profile_warning_effect_mute'],
 	);
 	$context['current_level'] = 0;
-	foreach ($context['level_effects'] as $limit => $dummy)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['level_effects'] as $limit => $dummy) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_level'] = $limit;
+	}
 
 	$listOptions = array(
 		'id' => 'view_warnings',
@@ -337,11 +346,12 @@ 
 							' . $warning['reason'] . '
 						</div>';
 
-						if (!empty($warning['id_notice']))
-							$ret .= '
+						if (!empty($warning['id_notice'])) {
+													$ret .= '
 						<div class="floatright">
 							<a href="' . $scripturl . '?action=moderate;area=notice;nid=' . $warning['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" rel="noopener" title="' . $txt['profile_warning_previous_notice'] . '"><span class="generic_icons filter centericon"></span></a>
 						</div>';
+						}
 
 						return $ret;
 					},
@@ -413,8 +423,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// If we're not warning for a message skip any that are.
-		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false)
-			continue;
+		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false) {
+					continue;
+		}
 
 		$context['notification_templates'][] = array(
 			'title' => $row['template_title'],
@@ -424,16 +435,18 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Setup the "default" templates.
-	foreach (array('spamming', 'offence', 'insulting') as $type)
-		$context['notification_templates'][] = array(
+	foreach (array('spamming', 'offence', 'insulting') as $type) {
+			$context['notification_templates'][] = array(
 			'title' => $txt['profile_warning_notify_title_' . $type],
 			'body' => sprintf($txt['profile_warning_notify_template_outline' . (!empty($context['warning_for_message']) ? '_post' : '')], $txt['profile_warning_notify_for_' . $type]),
 		);
+	}
 
 	// Replace all the common variables in the templates.
-	foreach ($context['notification_templates'] as $k => $name)
-		$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
-}
+	foreach ($context['notification_templates'] as $k => $name) {
+			$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
+	}
+	}
 
 /**
  * Get the number of warnings a user has. Callback for $listOptions['get_count'] in issueWarning()
@@ -517,10 +530,11 @@ 
 {
 	global $txt, $context, $modSettings, $cur_profile;
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	// Permissions for removing stuff...
 	$context['can_delete_posts'] = !$context['user']['is_owner'] && allowedTo('moderate_forum');
@@ -547,10 +561,11 @@ 
 
 	// @todo Add a way to delete pms as well?
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	checkSession();
 
@@ -576,8 +591,9 @@ 
 		list ($another) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (empty($another))
-			fatal_lang_error('at_least_one_admin', 'critical');
+		if (empty($another)) {
+					fatal_lang_error('at_least_one_admin', 'critical');
+		}
 	}
 
 	// This file is needed for the deleteMembers function.
@@ -656,8 +672,9 @@ 
 					)
 				);
 				$topicIDs = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$topicIDs[] = $row['id_topic'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$topicIDs[] = $row['id_topic'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Actually remove the topics. Ignore recycling if we want to perma-delete things...
@@ -680,8 +697,9 @@ 
 			// This could take a while... but ya know it's gonna be worth it in the end.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (function_exists('apache_reset_timeout'))
-					@apache_reset_timeout();
+				if (function_exists('apache_reset_timeout')) {
+									@apache_reset_timeout();
+				}
 
 				removeMessage($row['id_msg']);
 			}
@@ -689,8 +707,9 @@ 
 		}
 
 		// Only delete this poor members account if they are actually being booted out of camp.
-		if (isset($_POST['deleteAccount']))
-			deleteMembers($memID);
+		if (isset($_POST['deleteAccount'])) {
+					deleteMembers($memID);
+		}
 	}
 	// Do they need approval to delete?
 	elseif (!empty($modSettings['approveAccountDeletion']) && !allowedTo('moderate_forum'))
@@ -741,18 +760,18 @@ 
 		{
 			foreach ($costs as $duration => $cost)
 			{
-				if ($cost != 0)
-					$cost_array[$duration] = $cost;
+				if ($cost != 0) {
+									$cost_array[$duration] = $cost;
+				}
 			}
-		}
-		else
+		} else
 		{
 			$cost_array['fixed'] = $costs['fixed'];
 		}
 
-		if (empty($cost_array))
-			unset($context['subscriptions'][$id]);
-		else
+		if (empty($cost_array)) {
+					unset($context['subscriptions'][$id]);
+		} else
 		{
 			$context['subscriptions'][$id]['member'] = 0;
 			$context['subscriptions'][$id]['subscribed'] = false;
@@ -765,13 +784,15 @@ 
 	foreach ($gateways as $id => $gateway)
 	{
 		$gateways[$id] = new $gateway['display_class']();
-		if (!$gateways[$id]->gatewayEnabled())
-			unset($gateways[$id]);
+		if (!$gateways[$id]->gatewayEnabled()) {
+					unset($gateways[$id]);
+		}
 	}
 
 	// No gateways yet?
-	if (empty($gateways))
-		fatal_error($txt['paid_admin_not_setup_gateway']);
+	if (empty($gateways)) {
+			fatal_error($txt['paid_admin_not_setup_gateway']);
+	}
 
 	// Get the current subscriptions.
 	$request = $smcFunc['db_query']('', '
@@ -786,8 +807,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// The subscription must exist!
-		if (!isset($context['subscriptions'][$row['id_subscribe']]))
-			continue;
+		if (!isset($context['subscriptions'][$row['id_subscribe']])) {
+					continue;
+		}
 
 		$context['current'][$row['id_subscribe']] = array(
 			'id' => $row['id_sublog'],
@@ -801,8 +823,9 @@ 
 			'status_text' => $row['status'] == 0 ? ($row['payments_pending'] ? $txt['paid_pending'] : $txt['paid_finished']) : $txt['paid_active'],
 		);
 
-		if ($row['status'] == 1)
-			$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		if ($row['status'] == 1) {
+					$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -853,21 +876,25 @@ 
 	if (isset($_GET['confirm']) && isset($_POST['sub_id']) && is_array($_POST['sub_id']))
 	{
 		// Hopefully just one.
-		foreach ($_POST['sub_id'] as $k => $v)
-			$ID_SUB = (int) $k;
+		foreach ($_POST['sub_id'] as $k => $v) {
+					$ID_SUB = (int) $k;
+		}
 
-		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0)
-			fatal_lang_error('paid_sub_not_active');
+		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0) {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Simplify...
 		$context['sub'] = $context['subscriptions'][$ID_SUB];
 		$period = 'xx';
-		if ($context['sub']['flexible'])
-			$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		if ($context['sub']['flexible']) {
+					$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		}
 
 		// Check we have a valid cost.
-		if ($context['sub']['flexible'] && $period == 'xx')
-			fatal_lang_error('paid_sub_not_active');
+		if ($context['sub']['flexible'] && $period == 'xx') {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Sort out the cost/currency.
 		$context['currency'] = $modSettings['paid_currency_code'];
@@ -880,8 +907,7 @@ 
 			$context['cost'] = sprintf($modSettings['paid_currency_symbol'], $context['value']) . '/' . $txt[$_POST['cur'][$ID_SUB]];
 			// The period value for paypal.
 			$context['paypal_period'] = strtoupper(substr($_POST['cur'][$ID_SUB], 0, 1));
-		}
-		else
+		} else
 		{
 			// Real cost...
 			$context['value'] = $context['sub']['costs']['fixed'];
@@ -898,13 +924,15 @@ 
 		foreach ($gateways as $id => $gateway)
 		{
 			$fields = $gateways[$id]->fetchGatewayFields($context['sub']['id'] . '+' . $memID, $context['sub'], $context['value'], $period, $scripturl . '?action=profile;u=' . $memID . ';area=subscriptions;sub_id=' . $context['sub']['id'] . ';done');
-			if (!empty($fields['form']))
-				$context['gateways'][] = $fields;
+			if (!empty($fields['form'])) {
+							$context['gateways'][] = $fields;
+			}
 		}
 
 		// Bugger?!
-		if (empty($context['gateways']))
-			fatal_error($txt['paid_admin_not_setup_gateway']);
+		if (empty($context['gateways'])) {
+					fatal_error($txt['paid_admin_not_setup_gateway']);
+		}
 
 		// Now we are going to assume they want to take this out ;)
 		$new_data = array($context['sub']['id'], $context['value'], $period, 'prepay');
@@ -912,16 +940,19 @@ 
 		{
 			// What are the details like?
 			$current_pending = array();
-			if ($context['current'][$context['sub']['id']]['pending_details'] != '')
-				$current_pending = $smcFunc['json_decode']($context['current'][$context['sub']['id']]['pending_details'], true);
+			if ($context['current'][$context['sub']['id']]['pending_details'] != '') {
+							$current_pending = $smcFunc['json_decode']($context['current'][$context['sub']['id']]['pending_details'], true);
+			}
 			// Don't get silly.
-			if (count($current_pending) > 9)
-				$current_pending = array();
+			if (count($current_pending) > 9) {
+							$current_pending = array();
+			}
 			$pending_count = 0;
 			// Only record real pending payments as will otherwise confuse the admin!
-			foreach ($current_pending as $pending)
-				if ($pending[3] == 'payback')
+			foreach ($current_pending as $pending) {
+							if ($pending[3] == 'payback')
 					$pending_count++;
+			}
 
 			if (!in_array($new_data, $current_pending))
 			{
@@ -966,9 +997,9 @@ 
 
 		// Quit.
 		return;
+	} else {
+			$context['sub_template'] = 'user_subscription';
+	}
 	}
-	else
-		$context['sub_template'] = 'user_subscription';
-}
 
 ?>
\ No newline at end of file

Sources/ModerationCenter.php

Braces +136 added lines, -100 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point for the moderation center.
@@ -26,8 +27,9 @@ 
 	global $smcFunc, $txt, $context, $scripturl, $modSettings, $user_info, $sourcedir, $options;
 
 	// Don't run this twice... and don't conflict with the admin bar.
-	if (isset($context['admin_area']))
-		return;
+	if (isset($context['admin_area'])) {
+			return;
+	}
 
 	$context['can_moderate_boards'] = $user_info['mod_cache']['bq'] != '0=1';
 	$context['can_moderate_groups'] = $user_info['mod_cache']['gq'] != '0=1';
@@ -35,8 +37,9 @@ 
 	$context['can_moderate_users'] = allowedTo('moderate_forum');
 
 	// Everyone using this area must be allowed here!
-	if (!$context['can_moderate_boards'] && !$context['can_moderate_groups'] && !$context['can_moderate_approvals'] && !$context['can_moderate_users'])
-		isAllowedTo('access_mod_center');
+	if (!$context['can_moderate_boards'] && !$context['can_moderate_groups'] && !$context['can_moderate_approvals'] && !$context['can_moderate_users']) {
+			isAllowedTo('access_mod_center');
+	}
 
 	// We're gonna want a menu of some kind.
 	require_once($sourcedir . '/Subs-Menu.php');
@@ -195,8 +198,9 @@ 
 	unset($moderation_areas);
 
 	// We got something - didn't we? DIDN'T WE!
-	if ($mod_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($mod_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Retain the ID information in case required by a subaction.
 	$context['moderation_menu_id'] = $context['max_menu_id'];
@@ -219,22 +223,25 @@ 
 		'url' => $scripturl . '?action=moderate',
 		'name' => $txt['moderation_center'],
 	);
-	if (isset($mod_include_data['current_area']) && $mod_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($mod_include_data['current_area']) && $mod_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=moderate;area=' . $mod_include_data['current_area'],
 			'name' => $mod_include_data['label'],
 		);
-	if (!empty($mod_include_data['current_subsection']) && $mod_include_data['subsections'][$mod_include_data['current_subsection']][0] != $mod_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($mod_include_data['current_subsection']) && $mod_include_data['subsections'][$mod_include_data['current_subsection']][0] != $mod_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=moderate;area=' . $mod_include_data['current_area'] . ';sa=' . $mod_include_data['current_subsection'],
 			'name' => $mod_include_data['subsections'][$mod_include_data['current_subsection']][0],
 		);
+	}
 
 	// Now - finally - the bit before the encore - the main performance of course!
 	if (!$dont_call)
 	{
-		if (isset($mod_include_data['file']))
-			require_once($sourcedir . '/' . $mod_include_data['file']);
+		if (isset($mod_include_data['file'])) {
+					require_once($sourcedir . '/' . $mod_include_data['file']);
+		}
 
 		call_helper($mod_include_data['function']);
 	}
@@ -259,8 +266,9 @@ 
 	// Load what blocks the user actually can see...
 	$valid_blocks = array();
 
-	if ($context['can_moderate_groups'])
-		$valid_blocks['g'] = 'GroupRequests';
+	if ($context['can_moderate_groups']) {
+			$valid_blocks['g'] = 'GroupRequests';
+	}
 	if ($context['can_moderate_boards'])
 	{
 		$valid_blocks['r'] = 'ReportedPosts';
@@ -269,8 +277,9 @@ 
 	if ($context['can_moderate_users'])
 	{
 		// This falls under the category of moderating users as well...
-		if (!$context['can_moderate_boards'])
-			$valid_blocks['w'] = 'WatchedUsers';
+		if (!$context['can_moderate_boards']) {
+					$valid_blocks['w'] = 'WatchedUsers';
+		}
 
 		$valid_blocks['rm'] = 'ReportedMembers';
 	}
@@ -281,8 +290,9 @@ 
 	foreach ($valid_blocks as $k => $block)
 	{
 		$block = 'ModBlock' . $block;
-		if (function_exists($block))
-			$context['mod_blocks'][] = $block();
+		if (function_exists($block)) {
+					$context['mod_blocks'][] = $block();
+		}
 	}
 
 	$context['admin_prefs'] = !empty($options['admin_preferences']) ? $smcFunc['json_decode']($options['admin_preferences'], true) : array();
@@ -309,8 +319,9 @@ 
 			)
 		);
 		$watched_users = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$watched_users[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$watched_users[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		cache_put_data('recent_user_watches', $watched_users, 240);
@@ -402,8 +413,9 @@ 
 			$note_owner = $smcFunc['db_num_rows']($get_owner);
 			$smcFunc['db_free_result']($get_owner);
 
-			if (empty($note_owner))
-				fatal_lang_error('mc_notes_delete_own', false);
+			if (empty($note_owner)) {
+							fatal_lang_error('mc_notes_delete_own', false);
+			}
 		}
 
 		// Lets delete it.
@@ -460,12 +472,14 @@ 
 			)
 		);
 		$moderator_notes = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$moderator_notes[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$moderator_notes[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
-		if ($offset == 0)
-			cache_put_data('moderator_notes', $moderator_notes, 240);
+		if ($offset == 0) {
+					cache_put_data('moderator_notes', $moderator_notes, 240);
+		}
 	}
 
 	// Lets construct a page index.
@@ -504,8 +518,9 @@ 
 	// Got the info already?
 	$cachekey = md5($smcFunc['json_encode']($user_info['mod_cache']['bq']));
 	$context['reported_posts'] = array();
-	if ($user_info['mod_cache']['bq'] == '0=1')
-		return 'reported_posts_block';
+	if ($user_info['mod_cache']['bq'] == '0=1') {
+			return 'reported_posts_block';
+	}
 
 	if (($reported_posts = cache_get_data('reported_posts_' . $cachekey, 90)) === null)
 	{
@@ -529,8 +544,9 @@ 
 			)
 		);
 		$reported_posts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$reported_posts[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$reported_posts[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Cache it.
@@ -568,8 +584,9 @@ 
 
 	$context['group_requests'] = array();
 	// Make sure they can even moderate someone!
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		return 'group_requests_block';
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			return 'group_requests_block';
+	}
 
 	// What requests are outstanding?
 	$request = $smcFunc['db_query']('', '
@@ -618,8 +635,9 @@ 
 	// Got the info already?
 	$cachekey = md5($smcFunc['json_encode']((int) allowedTo('moderate_forum')));
 	$context['reported_users'] = array();
-	if (!allowedTo('moderate_forum'))
-		return 'reported_users_block';
+	if (!allowedTo('moderate_forum')) {
+			return 'reported_users_block';
+	}
 
 	if (($reported_users = cache_get_data('reported_users_' . $cachekey, 90)) === null)
 	{
@@ -642,8 +660,9 @@ 
 			)
 		);
 		$reported_users = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$reported_users[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$reported_users[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Cache it.
@@ -742,15 +761,15 @@ 
 		// Time to update.
 		updateSettings(array('last_mod_report_action' => time()));
 		recountOpenReports('members');
-	}
-	elseif (isset($_POST['close']) && isset($_POST['close_selected']))
+	} elseif (isset($_POST['close']) && isset($_POST['close_selected']))
 	{
 		checkSession();
 
 		// All the ones to update...
 		$toClose = array();
-		foreach ($_POST['close'] as $rid)
-			$toClose[] = (int) $rid;
+		foreach ($_POST['close'] as $rid) {
+					$toClose[] = (int) $rid;
+		}
 
 		if (!empty($toClose))
 		{
@@ -903,8 +922,9 @@ 
 	global $context, $user_info;
 
 	// You need to be allowed to moderate groups...
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		isAllowedTo('manage_membergroups');
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Load the group templates.
 	loadTemplate('ModerationCenter');
@@ -915,8 +935,9 @@ 
 		'view' => 'ViewGroups',
 	);
 
-	if (!isset($_GET['sa']) || !isset($subActions[$_GET['sa']]))
-		$_GET['sa'] = 'view';
+	if (!isset($_GET['sa']) || !isset($subActions[$_GET['sa']])) {
+			$_GET['sa'] = 'view';
+	}
 	$context['sub_action'] = $_GET['sa'];
 
 	// Call the relevant function.
@@ -946,8 +967,9 @@ 
 			'id_notice' => $id_notice,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_access', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_access', false);
+	}
 	list ($context['notice_body'], $context['notice_subject']) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -984,18 +1006,20 @@ 
 		checkSession(!is_array($_REQUEST['delete']) ? 'get' : 'post');
 
 		$toDelete = array();
-		if (!is_array($_REQUEST['delete']))
-			$toDelete[] = (int) $_REQUEST['delete'];
-		else
-			foreach ($_REQUEST['delete'] as $did)
+		if (!is_array($_REQUEST['delete'])) {
+					$toDelete[] = (int) $_REQUEST['delete'];
+		} else {
+					foreach ($_REQUEST['delete'] as $did)
 				$toDelete[] = (int) $did;
+		}
 
 		if (!empty($toDelete))
 		{
 			require_once($sourcedir . '/RemoveTopic.php');
 			// If they don't have permission we'll let it error - either way no chance of a security slip here!
-			foreach ($toDelete as $did)
-				removeMessage($did);
+			foreach ($toDelete as $did) {
+							removeMessage($did);
+			}
 		}
 	}
 
@@ -1004,20 +1028,21 @@ 
 	{
 		$approve_query = '';
 		$delete_boards = array();
-	}
-	else
+	} else
 	{
 		// Still obey permissions!
 		$approve_boards = boardsAllowedTo('approve_posts');
 		$delete_boards = boardsAllowedTo('delete_any');
 
-		if ($approve_boards == array(0))
-			$approve_query = '';
-		elseif (!empty($approve_boards))
-			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+		if ($approve_boards == array(0)) {
+					$approve_query = '';
+		} elseif (!empty($approve_boards)) {
+					$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+		}
 		// Nada, zip, etc...
-		else
-			$approve_query = ' AND 1=0';
+		else {
+					$approve_query = ' AND 1=0';
+		}
 	}
 
 	require_once($sourcedir . '/Subs-List.php');
@@ -1116,10 +1141,11 @@ 
 				'data' => array(
 					'function' => function($member) use ($scripturl)
 					{
-						if ($member['last_post_id'])
-							return '<a href="' . $scripturl . '?msg=' . $member['last_post_id'] . '">' . $member['last_post'] . '</a>';
-						else
-							return $member['last_post'];
+						if ($member['last_post_id']) {
+													return '<a href="' . $scripturl . '?msg=' . $member['last_post_id'] . '">' . $member['last_post'] . '</a>';
+						} else {
+													return $member['last_post'];
+						}
 					},
 				),
 			),
@@ -1247,8 +1273,9 @@ 
 			)
 		);
 		$latest_posts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$latest_posts[$row['id_member']] = $row['last_post_id'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$latest_posts[$row['id_member']] = $row['last_post_id'];
+		}
 
 		if (!empty($latest_posts))
 		{
@@ -1439,15 +1466,17 @@ 
 	// Setup the direction stuff...
 	$context['order'] = isset($_REQUEST['sort']) && isset($sort_types[$_REQUEST['sort']]) ? $_REQUEST['sort'] : 'member';
 
-	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search']))
-		$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
-	else
-		$search_params_string = $search_params['string'];
+	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search'])) {
+			$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
+	} else {
+			$search_params_string = $search_params['string'];
+	}
 
-	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
-		$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
-	else
-		$search_params_type = $search_params['type'];
+	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']])) {
+			$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
+	} else {
+			$search_params_type = $search_params['type'];
+	}
 
 	$search_params = array(
 		'string' => $search_params_string,
@@ -1530,9 +1559,10 @@ 
 								' . $rowData['reason'] . '
 							</div>';
 
-						if (!empty($rowData['id_notice']))
-							$output .= '
+						if (!empty($rowData['id_notice'])) {
+													$output .= '
 								&nbsp;<a href="' . $scripturl . '?action=moderate;area=notice;nid=' . $rowData['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" rel="noopener" title="' . $txt['profile_warning_previous_notice'] . '"><span class="generic_icons filter centericon"></span></a>';
+						}
 						return $output;
 					},
 				),
@@ -1650,9 +1680,9 @@ 
 	global $smcFunc, $modSettings, $context, $txt, $scripturl, $sourcedir, $user_info;
 
 	// Submitting a new one?
-	if (isset($_POST['add']))
-		return ModifyWarningTemplate();
-	elseif (isset($_POST['delete']) && !empty($_POST['deltpl']))
+	if (isset($_POST['add'])) {
+			return ModifyWarningTemplate();
+	} elseif (isset($_POST['delete']) && !empty($_POST['deltpl']))
 	{
 		checkSession();
 		validateToken('mod-wt');
@@ -1671,8 +1701,9 @@ 
 				'current_member' => $user_info['id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			logAction('delete_warn_template', array('template' => $row['recipient_name']));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					logAction('delete_warn_template', array('template' => $row['recipient_name']));
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Do the deletes.
@@ -1963,16 +1994,18 @@ 
 				);
 
 				// If it wasn't visible and now is they've effectively added it.
-				if ($context['template_data']['personal'] && !$recipient_id)
-					logAction('add_warn_template', array('template' => $_POST['template_title']));
+				if ($context['template_data']['personal'] && !$recipient_id) {
+									logAction('add_warn_template', array('template' => $_POST['template_title']));
+				}
 				// Conversely if they made it personal it's a delete.
-				elseif (!$context['template_data']['personal'] && $recipient_id)
-					logAction('delete_warn_template', array('template' => $_POST['template_title']));
+				elseif (!$context['template_data']['personal'] && $recipient_id) {
+									logAction('delete_warn_template', array('template' => $_POST['template_title']));
+				}
 				// Otherwise just an edit.
-				else
-					logAction('modify_warn_template', array('template' => $_POST['template_title']));
-			}
-			else
+				else {
+									logAction('modify_warn_template', array('template' => $_POST['template_title']));
+				}
+			} else
 			{
 				$smcFunc['db_insert']('',
 					'{db_prefix}log_comments',
@@ -1992,17 +2025,18 @@ 
 
 			// Get out of town...
 			redirectexit('action=moderate;area=warnings;sa=templates');
-		}
-		else
+		} else
 		{
 			$context['warning_errors'] = array();
 			$context['template_data']['title'] = !empty($_POST['template_title']) ? $_POST['template_title'] : '';
 			$context['template_data']['body'] = !empty($_POST['template_body']) ? $_POST['template_body'] : $txt['mc_warning_template_body_default'];
 			$context['template_data']['personal'] = !empty($_POST['make_personal']);
-			if (empty($_POST['template_title']))
-				$context['warning_errors'][] = $txt['mc_warning_template_error_no_title'];
-			if (empty($_POST['template_body']))
-				$context['warning_errors'][] = $txt['mc_warning_template_error_no_body'];
+			if (empty($_POST['template_title'])) {
+							$context['warning_errors'][] = $txt['mc_warning_template_error_no_title'];
+			}
+			if (empty($_POST['template_body'])) {
+							$context['warning_errors'][] = $txt['mc_warning_template_error_no_body'];
+			}
 		}
 	}
 
@@ -2047,8 +2081,9 @@ 
 		// Now check other options!
 		$pref_binary = 0;
 
-		if ($context['can_moderate_approvals'] && !empty($_POST['mod_notify_approval']))
-			$pref_binary |= 4;
+		if ($context['can_moderate_approvals'] && !empty($_POST['mod_notify_approval'])) {
+					$pref_binary |= 4;
+		}
 
 		// Put it all together.
 		$mod_prefs = '0||' . $pref_binary;
@@ -2072,9 +2107,10 @@ 
 	unset($_SESSION['moderate_time']);
 
 	// Clean any moderator tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-mod') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-mod') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Themes/default/Help.template.php

Braces +21 added lines, -16 removed lines

@@ -86,11 +86,12 @@ 
 					<span class="smalltext"><em>', $txt['find_wildcards'], '</em></span><br>';
 
 	// Only offer to search for buddies if we have some!
-	if (!empty($context['show_buddies']))
-		echo '
+	if (!empty($context['show_buddies'])) {
+			echo '
 					<span class="smalltext">
 						<label for="buddies"><input type="checkbox" name="buddies" id="buddies"', !empty($context['buddy_search']) ? ' checked' : '', '> ', $txt['find_buddies'], '</label>
 					</span><br>';
+	}
 
 	echo '
 					<div class="padding righttext">
@@ -105,20 +106,21 @@ 
 					<h3 class="catbg">', $txt['find_results'], '</h3>
 				</div>';
 
-	if (empty($context['results']))
-		echo '
+	if (empty($context['results'])) {
+			echo '
 				<p class="error">', $txt['find_no_results'], '</p>';
-	else
+	} else
 	{
 		echo '
 				<ul class="padding">';
 
-		foreach ($context['results'] as $result)
-			echo '
+		foreach ($context['results'] as $result) {
+					echo '
 					<li class="windowbg">
 						<a href="', $result['href'], '" target="_blank" rel="noopener"> <span class="generic_icons profile_sm"></span>
 						<a href="javascript:void(0);" onclick="addMember(this.innerHTML); return false;">', $result['name'], '</a>
 					</li>';
+		}
 
 		echo '
 				</ul>
@@ -134,11 +136,12 @@ 
 			<input type="hidden" name="quote" value="', $context['quote_results'] ? '1' : '0', '">
 		</form>';
 
-	if (empty($context['results']))
-		echo '
+	if (empty($context['results'])) {
+			echo '
 		<script>
 			document.getElementById("search").focus();
 		</script>';
+	}
 
 	echo '
 	</body>
@@ -162,9 +165,10 @@ 
 					<p>', $txt['manual_introduction'], '</p>
 					<ul>';
 
-	foreach ($context['manual_sections'] as $section_id => $wiki_id)
-		echo '
+	foreach ($context['manual_sections'] as $section_id => $wiki_id) {
+			echo '
 						<li><a href="', $context['wiki_url'], '/', $context['wiki_prefix'], $wiki_id, ($txt['lang_dictionary'] != 'en' ? '/' . $txt['lang_dictionary'] : ''), '" target="_blank" rel="noopener">', $txt['manual_section_' . $section_id . '_title'], '</a> - ', $txt['manual_section_' . $section_id . '_desc'], '</li>';
+	}
 
 	echo '
 					</ul>
@@ -180,8 +184,8 @@ 
 {
 	global $txt, $context, $modSettings;
 
-	if (!empty($modSettings['requireAgreement']))
-		echo '
+	if (!empty($modSettings['requireAgreement'])) {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg">
 					', $txt['terms_and_rules'], ' - ', $context['forum_name_html_safe'], '
@@ -190,11 +194,12 @@ 
 			<div class="roundframe">
 				', $context['agreement'], '
 			</div>';
-	else
-		echo '
+	} else {
+			echo '
 			<div class="noticebox">
 				', $txt['agreement_disabled'], '
 			</div>';
-}
+	}
+	}
 
 ?>
\ No newline at end of file