albertlast / SMF2.1

Sources/ManageMaintenance.php

Braces +266 added lines, -197 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Main dispatcher, the maintenance access point.
@@ -96,14 +97,16 @@ 
 	call_integration_hook('integrate_manage_maintenance', array(&$subActions));
 
 	// Yep, sub-action time!
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$subAction = $_REQUEST['sa'];
-	else
-		$subAction = 'routine';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$subAction = $_REQUEST['sa'];
+	} else {
+			$subAction = 'routine';
+	}
 
 	// Doing something special?
-	if (isset($_REQUEST['activity']) && isset($subActions[$subAction]['activities'][$_REQUEST['activity']]))
-		$activity = $_REQUEST['activity'];
+	if (isset($_REQUEST['activity']) && isset($subActions[$subAction]['activities'][$_REQUEST['activity']])) {
+			$activity = $_REQUEST['activity'];
+	}
 
 	// Set a few things.
 	$context['page_title'] = $txt['maintain_title'];
@@ -114,12 +117,14 @@ 
 	call_helper($subActions[$subAction]['function']);
 
 	// Any special activity?
-	if (isset($activity))
-		call_helper($subActions[$subAction]['activities'][$activity]);
+	if (isset($activity)) {
+			call_helper($subActions[$subAction]['activities'][$activity]);
+	}
 
 	//converted to UTF-8? show a small maintenance info
-	if (isset($_GET['done']) && $_GET['done'] == 'convertutf8')
-		$context['maintenance_finished'] = $txt['utf8_title'];
+	if (isset($_GET['done']) && $_GET['done'] == 'convertutf8') {
+			$context['maintenance_finished'] = $txt['utf8_title'];
+	}
 
 	// Create a maintenance token.  Kinda hard to do it any other way.
 	createToken('admin-maint');
@@ -141,19 +146,22 @@ 
 		db_extend('packages');
 
 		$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-		foreach ($colData as $column)
-			if ($column['name'] == 'body')
+		foreach ($colData as $column) {
+					if ($column['name'] == 'body')
 				$body_type = $column['type'];
+		}
 
 		$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
 		$context['convert_to_suggest'] = ($body_type != 'text' && !empty($modSettings['max_messageLength']) && $modSettings['max_messageLength'] < 65536);
 	}
 
-	if (isset($_GET['done']) && $_GET['done'] == 'convertutf8')
-		$context['maintenance_finished'] = $txt['utf8_title'];
-	if (isset($_GET['done']) && $_GET['done'] == 'convertentities')
-		$context['maintenance_finished'] = $txt['entity_convert_title'];
-}
+	if (isset($_GET['done']) && $_GET['done'] == 'convertutf8') {
+			$context['maintenance_finished'] = $txt['utf8_title'];
+	}
+	if (isset($_GET['done']) && $_GET['done'] == 'convertentities') {
+			$context['maintenance_finished'] = $txt['entity_convert_title'];
+	}
+	}
 
 /**
  * Supporting function for the routine maintenance area.
@@ -162,9 +170,10 @@ 
 {
 	global $context, $txt;
 
-	if (isset($_GET['done']) && $_GET['done'] == 'recount')
-		$context['maintenance_finished'] = $txt['maintain_recount'];
-}
+	if (isset($_GET['done']) && $_GET['done'] == 'recount') {
+			$context['maintenance_finished'] = $txt['maintain_recount'];
+	}
+	}
 
 /**
  * Supporting function for the members maintenance area.
@@ -195,8 +204,9 @@ 
 	}
 	$smcFunc['db_free_result']($result);
 
-	if (isset($_GET['done']) && $_GET['done'] == 'recountposts')
-		$context['maintenance_finished'] = $txt['maintain_recountposts'];
+	if (isset($_GET['done']) && $_GET['done'] == 'recountposts') {
+			$context['maintenance_finished'] = $txt['maintain_recountposts'];
+	}
 
 	loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 }
@@ -222,11 +232,12 @@ 
 	$context['categories'] = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
 			'id' => $row['id_board'],
@@ -239,11 +250,12 @@ 
 	require_once($sourcedir . '/Subs-Boards.php');
 	sortCategories($context['categories']);
 
-	if (isset($_GET['done']) && $_GET['done'] == 'purgeold')
-		$context['maintenance_finished'] = $txt['maintain_old'];
-	elseif (isset($_GET['done']) && $_GET['done'] == 'massmove')
-		$context['maintenance_finished'] = $txt['move_topics_maintenance'];
-}
+	if (isset($_GET['done']) && $_GET['done'] == 'purgeold') {
+			$context['maintenance_finished'] = $txt['maintain_old'];
+	} elseif (isset($_GET['done']) && $_GET['done'] == 'massmove') {
+			$context['maintenance_finished'] = $txt['move_topics_maintenance'];
+	}
+	}
 
 /**
  * Find and fix all errors on the forum.
@@ -351,15 +363,17 @@ 
 	// Show me your badge!
 	isAllowedTo('admin_forum');
 
-	if ($db_type != 'mysql' && $db_type != 'mysqli')
-		return;
+	if ($db_type != 'mysql' && $db_type != 'mysqli') {
+			return;
+	}
 
 	db_extend('packages');
 
 	$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-	foreach ($colData as $column)
-		if ($column['name'] == 'body')
+	foreach ($colData as $column) {
+			if ($column['name'] == 'body')
 			$body_type = $column['type'];
+	}
 
 	$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
 
@@ -369,19 +383,22 @@ 
 		validateToken('admin-maint');
 
 		// Make it longer so we can do their limit.
-		if ($body_type == 'text')
-			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'mediumtext'));
+		if ($body_type == 'text') {
+					$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'mediumtext'));
+		}
 		// Shorten the column so we can have a bit (literally per record) less space occupied
-		else
-			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'text'));
+		else {
+					$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'text'));
+		}
 
 		// 3rd party integrations may be interested in knowning about this.
 		call_integration_hook('integrate_convert_msgbody', array($body_type));
 
 		$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-		foreach ($colData as $column)
-			if ($column['name'] == 'body')
+		foreach ($colData as $column) {
+					if ($column['name'] == 'body')
 				$body_type = $column['type'];
+		}
 
 		$context['maintenance_finished'] = $txt[$context['convert_to'] . '_title'];
 		$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
@@ -389,14 +406,14 @@ 
 
 		return;
 		redirectexit('action=admin;area=maintain;sa=database');
-	}
-	elseif ($body_type != 'text' && (!isset($_POST['do_conversion']) || isset($_POST['cont'])))
+	} elseif ($body_type != 'text' && (!isset($_POST['do_conversion']) || isset($_POST['cont'])))
 	{
 		checkSession();
-		if (empty($_REQUEST['start']))
-			validateToken('admin-maint');
-		else
-			validateToken('admin-convertMsg');
+		if (empty($_REQUEST['start'])) {
+					validateToken('admin-maint');
+		} else {
+					validateToken('admin-convertMsg');
+		}
 
 		$context['page_title'] = $txt['not_done_title'];
 		$context['continue_post_data'] = '';
@@ -428,8 +445,9 @@ 
 					'increment' => $increment - 1,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$id_msg_exceeding[] = $row['id_msg'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$id_msg_exceeding[] = $row['id_msg'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -458,9 +476,9 @@ 
 			{
 				$query_msg = array_slice($id_msg_exceeding, 0, 100);
 				$context['exceeding_messages_morethan'] = sprintf($txt['exceeding_messages_morethan'], count($id_msg_exceeding));
+			} else {
+							$query_msg = $id_msg_exceeding;
 			}
-			else
-				$query_msg = $id_msg_exceeding;
 
 			$context['exceeding_messages'] = array();
 			$request = $smcFunc['db_query']('', '
@@ -471,8 +489,9 @@ 
 					'messages' => $query_msg,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['exceeding_messages'][] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['exceeding_messages'][] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+			}
 			$smcFunc['db_free_result']($request);
 		}
 	}
@@ -496,8 +515,9 @@ 
 	isAllowedTo('admin_forum');
 
 	// Check to see if UTF-8 is currently the default character set.
-	if ($modSettings['global_character_set'] !== 'UTF-8' || !isset($db_character_set) || $db_character_set !== 'utf8')
-		fatal_lang_error('entity_convert_only_utf8');
+	if ($modSettings['global_character_set'] !== 'UTF-8' || !isset($db_character_set) || $db_character_set !== 'utf8') {
+			fatal_lang_error('entity_convert_only_utf8');
+	}
 
 	// Some starting values.
 	$context['table'] = empty($_REQUEST['table']) ? 0 : (int) $_REQUEST['table'];
@@ -559,8 +579,9 @@ 
 		// Make sure we keep stuff unique!
 		$primary_keys = array();
 
-		if (function_exists('apache_reset_timeout'))
-			@apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					@apache_reset_timeout();
+		}
 
 		// Get a list of text columns.
 		$columns = array();
@@ -571,9 +592,10 @@ 
 				'cur_table' => $cur_table,
 			)
 		);
-		while ($column_info = $smcFunc['db_fetch_assoc']($request))
-			if (strpos($column_info['Type'], 'text') !== false || strpos($column_info['Type'], 'char') !== false)
+		while ($column_info = $smcFunc['db_fetch_assoc']($request)) {
+					if (strpos($column_info['Type'], 'text') !== false || strpos($column_info['Type'], 'char') !== false)
 				$columns[] = strtolower($column_info['Field']);
+		}
 
 		// Get the column with the (first) primary key.
 		$request = $smcFunc['db_query']('', '
@@ -587,8 +609,9 @@ 
 		{
 			if ($row['Key_name'] === 'PRIMARY')
 			{
-				if (empty($primary_key) || ($row['Seq_in_index'] == 1 && !in_array(strtolower($row['Column_name']), $columns)))
-					$primary_key = $row['Column_name'];
+				if (empty($primary_key) || ($row['Seq_in_index'] == 1 && !in_array(strtolower($row['Column_name']), $columns))) {
+									$primary_key = $row['Column_name'];
+				}
 
 				$primary_keys[] = $row['Column_name'];
 			}
@@ -597,8 +620,9 @@ 
 
 		// No primary key, no glory.
 		// Same for columns. Just to be sure we've work to do!
-		if (empty($primary_key) || empty($columns))
-			continue;
+		if (empty($primary_key) || empty($columns)) {
+					continue;
+		}
 
 		// Get the maximum value for the primary key.
 		$request = $smcFunc['db_query']('', '
@@ -612,8 +636,9 @@ 
 		list($max_value) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (empty($max_value))
-			continue;
+		if (empty($max_value)) {
+					continue;
+		}
 
 		while ($context['start'] <= $max_value)
 		{
@@ -637,10 +662,11 @@ 
 			{
 				$insertion_variables = array();
 				$changes = array();
-				foreach ($row as $column_name => $column_value)
-					if ($column_name !== $primary_key && strpos($column_value, '&#') !== false)
+				foreach ($row as $column_name => $column_value) {
+									if ($column_name !== $primary_key && strpos($column_value, '&#') !== false)
 					{
 						$changes[] = $column_name . ' = {string:changes_' . $column_name . '}';
+				}
 						$insertion_variables['changes_' . $column_name] = preg_replace_callback('~&#(\d{1,7}|x[0-9a-fA-F]{1,6});~', 'fixchar__callback', $column_value);
 					}
 
@@ -652,8 +678,8 @@ 
 				}
 
 				// Update the row.
-				if (!empty($changes))
-					$smcFunc['db_query']('', '
+				if (!empty($changes)) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}' . $cur_table . '
 						SET
 							' . implode(',
@@ -661,6 +687,7 @@ 
 						WHERE ' . implode(' AND ', $where),
 						$insertion_variables
 					);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 			$context['start'] += 500;
@@ -705,10 +732,11 @@ 
 
 	checkSession('request');
 
-	if (!isset($_SESSION['optimized_tables']))
-		validateToken('admin-maint');
-	else
-		validateToken('admin-optimize', 'post', false);
+	if (!isset($_SESSION['optimized_tables'])) {
+			validateToken('admin-maint');
+	} else {
+			validateToken('admin-optimize', 'post', false);
+	}
 
 	ignore_user_abort(true);
 	db_extend();
@@ -727,13 +755,15 @@ 
 	// Get a list of tables, as well as how many there are.
 	$temp_tables = $smcFunc['db_list_tables'](false, $real_prefix . '%');
 	$tables = array();
-	foreach ($temp_tables as $table)
-		$tables[] = array('table_name' => $table);
+	foreach ($temp_tables as $table) {
+			$tables[] = array('table_name' => $table);
+	}
 
 	// If there aren't any tables then I believe that would mean the world has exploded...
 	$context['num_tables'] = count($tables);
-	if ($context['num_tables'] == 0)
-		fatal_error('You appear to be running SMF in a flat file mode... fantastic!', false);
+	if ($context['num_tables'] == 0) {
+			fatal_error('You appear to be running SMF in a flat file mode... fantastic!', false);
+	}
 
 	$_REQUEST['start'] = empty($_REQUEST['start']) ? 0 : (int) $_REQUEST['start'];
 
@@ -744,8 +774,9 @@ 
 	$_SESSION['optimized_tables'] = !empty($_SESSION['optimized_tables']) ? $_SESSION['optimized_tables'] : array();
 	for ($key=$_REQUEST['start']; $context['num_tables']-1; $key++)
 	{
-		if (empty($tables[$key]))
-			break;
+		if (empty($tables[$key])) {
+					break;
+		}
 
 		// Continue?
 		if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $time_start)) > 10)
@@ -759,8 +790,9 @@ 
 			createToken('admin-optimize');
 			$context['continue_post_data'] = '<input type="hidden" name="' . $context['admin-optimize_token_var'] . '" value="' . $context['admin-optimize_token'] . '">';
 
-			if (function_exists('apache_reset_timeout'))
-				apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							apache_reset_timeout();
+			}
 
 			return;
 		}
@@ -768,11 +800,12 @@ 
 		// Optimize the table!  We use backticks here because it might be a custom table.
 		$data_freed = $smcFunc['db_optimize_table']($tables[$key]['table_name']);
 
-		if ($data_freed > 0)
-			$_SESSION['optimized_tables'][] = array(
+		if ($data_freed > 0) {
+					$_SESSION['optimized_tables'][] = array(
 				'name' => $tables[$key]['table_name'],
 				'data_freed' => $data_freed,
 			);
+		}
 	}
 
 	// Number of tables, etc...
@@ -807,10 +840,11 @@ 
 	checkSession('request');
 
 	// validate the request or the loop
-	if (!isset($_REQUEST['step']))
-		validateToken('admin-maint');
-	else
-		validateToken('admin-boardrecount');
+	if (!isset($_REQUEST['step'])) {
+			validateToken('admin-maint');
+	} else {
+			validateToken('admin-boardrecount');
+	}
 
 	$context['page_title'] = $txt['not_done_title'];
 	$context['continue_post_data'] = '';
@@ -831,8 +865,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	$increment = min(max(50, ceil($max_topics / 4)), 2000);
-	if (empty($_REQUEST['start']))
-		$_REQUEST['start'] = 0;
+	if (empty($_REQUEST['start'])) {
+			$_REQUEST['start'] = 0;
+	}
 
 	$total_steps = 8;
 
@@ -859,8 +894,8 @@ 
 					'max_id' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET num_replies = {int:num_replies}
 					WHERE id_topic = {int:id_topic}',
@@ -869,6 +904,7 @@ 
 						'id_topic' => $row['id_topic'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			// Recount unapproved messages
@@ -887,8 +923,8 @@ 
 					'max_id' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET unapproved_posts = {int:unapproved_posts}
 					WHERE id_topic = {int:id_topic}',
@@ -897,6 +933,7 @@ 
 						'id_topic' => $row['id_topic'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -919,8 +956,8 @@ 
 	// Update the post count of each board.
 	if ($_REQUEST['step'] <= 1)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET num_posts = {int:num_posts}
 				WHERE redirect = {string:redirect}',
@@ -929,6 +966,7 @@ 
 					'redirect' => '',
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -945,8 +983,8 @@ 
 					'is_approved' => 1,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET num_posts = num_posts + {int:real_num_posts}
 					WHERE id_board = {int:id_board}',
@@ -955,6 +993,7 @@ 
 						'real_num_posts' => $row['real_num_posts'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -977,14 +1016,15 @@ 
 	// Update the topic count of each board.
 	if ($_REQUEST['step'] <= 2)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET num_topics = {int:num_topics}',
 				array(
 					'num_topics' => 0,
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -1001,8 +1041,8 @@ 
 					'id_topic_max' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET num_topics = num_topics + {int:real_num_topics}
 					WHERE id_board = {int:id_board}',
@@ -1011,6 +1051,7 @@ 
 						'real_num_topics' => $row['real_num_topics'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -1033,14 +1074,15 @@ 
 	// Update the unapproved post count of each board.
 	if ($_REQUEST['step'] <= 3)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET unapproved_posts = {int:unapproved_posts}',
 				array(
 					'unapproved_posts' => 0,
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -1057,8 +1099,8 @@ 
 					'is_approved' => 0,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET unapproved_posts = unapproved_posts + {int:unapproved_posts}
 					WHERE id_board = {int:id_board}',
@@ -1067,6 +1109,7 @@ 
 						'unapproved_posts' => $row['real_unapproved_posts'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -1089,14 +1132,15 @@ 
 	// Update the unapproved topic count of each board.
 	if ($_REQUEST['step'] <= 4)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET unapproved_topics = {int:unapproved_topics}',
 				array(
 					'unapproved_topics' => 0,
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -1113,8 +1157,8 @@ 
 					'id_topic_max' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET unapproved_topics = unapproved_topics + {int:real_unapproved_topics}
 					WHERE id_board = {int:id_board}',
@@ -1123,6 +1167,7 @@ 
 						'real_unapproved_topics' => $row['real_unapproved_topics'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -1156,8 +1201,9 @@ 
 				'is_not_deleted' => 0,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateMemberData($row['id_member'], array('instant_messages' => $row['real_num']));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateMemberData($row['id_member'], array('instant_messages' => $row['real_num']));
+		}
 		$smcFunc['db_free_result']($request);
 
 		$request = $smcFunc['db_query']('', '
@@ -1172,8 +1218,9 @@ 
 				'is_not_read' => 0,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateMemberData($row['id_member'], array('unread_messages' => $row['real_num']));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateMemberData($row['id_member'], array('unread_messages' => $row['real_num']));
+		}
 		$smcFunc['db_free_result']($request);
 
 		if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $time_start)) > 3)
@@ -1205,12 +1252,13 @@ 
 				)
 			);
 			$boards = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$boards[$row['id_board']][] = $row['id_msg'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$boards[$row['id_board']][] = $row['id_msg'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			foreach ($boards as $board_id => $messages)
-				$smcFunc['db_query']('', '
+			foreach ($boards as $board_id => $messages) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}messages
 					SET id_board = {int:id_board}
 					WHERE id_msg IN ({array_int:id_msg_array})',
@@ -1219,6 +1267,7 @@ 
 						'id_board' => $board_id,
 					)
 				);
+			}
 
 			$_REQUEST['start'] += $increment;
 
@@ -1248,8 +1297,9 @@ 
 		)
 	);
 	$realBoardCounts = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$realBoardCounts[$row['id_board']] = $row['local_last_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$realBoardCounts[$row['id_board']] = $row['local_last_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -1269,18 +1319,20 @@ 
 	krsort($resort_me);
 
 	$lastModifiedMsg = array();
-	foreach ($resort_me as $rows)
-		foreach ($rows as $row)
+	foreach ($resort_me as $rows) {
+			foreach ($rows as $row)
 		{
 			// The latest message is the latest of the current board and its children.
 			if (isset($lastModifiedMsg[$row['id_board']]))
 				$curLastModifiedMsg = max($row['local_last_msg'], $lastModifiedMsg[$row['id_board']]);
-			else
-				$curLastModifiedMsg = $row['local_last_msg'];
+	}
+			else {
+							$curLastModifiedMsg = $row['local_last_msg'];
+			}
 
 			// If what is and what should be the latest message differ, an update is necessary.
-			if ($row['local_last_msg'] != $row['id_last_msg'] || $curLastModifiedMsg != $row['id_msg_updated'])
-				$smcFunc['db_query']('', '
+			if ($row['local_last_msg'] != $row['id_last_msg'] || $curLastModifiedMsg != $row['id_msg_updated']) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET id_last_msg = {int:id_last_msg}, id_msg_updated = {int:id_msg_updated}
 					WHERE id_board = {int:id_board}',
@@ -1290,12 +1342,14 @@ 
 						'id_board' => $row['id_board'],
 					)
 				);
+			}
 
 			// Parent boards inherit the latest modified message of their children.
-			if (isset($lastModifiedMsg[$row['id_parent']]))
-				$lastModifiedMsg[$row['id_parent']] = max($row['local_last_msg'], $lastModifiedMsg[$row['id_parent']]);
-			else
-				$lastModifiedMsg[$row['id_parent']] = $row['local_last_msg'];
+			if (isset($lastModifiedMsg[$row['id_parent']])) {
+							$lastModifiedMsg[$row['id_parent']] = max($row['local_last_msg'], $lastModifiedMsg[$row['id_parent']]);
+			} else {
+							$lastModifiedMsg[$row['id_parent']] = $row['local_last_msg'];
+			}
 		}
 
 	// Update all the basic statistics.
@@ -1367,8 +1421,9 @@ 
 	require_once($sourcedir . '/Subs-Auth.php');
 	$members = findMembers($_POST['to']);
 
-	if (empty($members))
-		fatal_lang_error('reattribute_cannot_find_member');
+	if (empty($members)) {
+			fatal_lang_error('reattribute_cannot_find_member');
+	}
 
 	$memID = array_shift($members);
 	$memID = $memID['id'];
@@ -1398,8 +1453,9 @@ 
 		validateToken('admin-maint');
 
 		$groups = array();
-		foreach ($_POST['groups'] as $id => $dummy)
-			$groups[] = (int) $id;
+		foreach ($_POST['groups'] as $id => $dummy) {
+					$groups[] = (int) $id;
+		}
 		$time_limit = (time() - ($_POST['maxdays'] * 24 * 3600));
 		$where_vars = array(
 			'time_limit' => $time_limit,
@@ -1408,9 +1464,9 @@ 
 		{
 			$where = 'mem.date_registered < {int:time_limit} AND mem.is_activated = {int:is_activated}';
 			$where_vars['is_activated'] = 0;
+		} else {
+					$where = 'mem.last_login < {int:time_limit} AND (mem.last_login != 0 OR mem.date_registered < {int:time_limit})';
 		}
-		else
-			$where = 'mem.last_login < {int:time_limit} AND (mem.last_login != 0 OR mem.date_registered < {int:time_limit})';
 
 		// Need to get *all* groups then work out which (if any) we avoid.
 		$request = $smcFunc['db_query']('', '
@@ -1429,8 +1485,7 @@ 
 				{
 					$where .= ' AND mem.id_post_group != {int:id_post_group_' . $row['id_group'] . '}';
 					$where_vars['id_post_group_' . $row['id_group']] = $row['id_group'];
-				}
-				else
+				} else
 				{
 					$where .= ' AND mem.id_group != {int:id_group_' . $row['id_group'] . '} AND FIND_IN_SET({int:id_group_' . $row['id_group'] . '}, mem.additional_groups) = 0';
 					$where_vars['id_group_' . $row['id_group']] = $row['id_group'];
@@ -1457,8 +1512,9 @@ 
 		$members = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!$row['is_mod'] || !in_array(3, $groups))
-				$members[] = $row['id_member'];
+			if (!$row['is_mod'] || !in_array(3, $groups)) {
+							$members[] = $row['id_member'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -1505,8 +1561,9 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$drafts[] = (int) $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$drafts[] = (int) $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If we have old drafts, remove them
@@ -1549,8 +1606,9 @@ 
 	$sticky = isset($_POST['move_type_sticky']) || isset($_GET['sticky']);
 
 	// No boards then this is your stop.
-	if (empty($id_board_from) || empty($id_board_to))
-		return;
+	if (empty($id_board_from) || empty($id_board_to)) {
+			return;
+	}
 
 	// The big WHERE clause
 	$conditions = 'WHERE t.id_board = {int:id_board_from}
@@ -1598,18 +1656,20 @@ 
 		);
 		list ($total_topics) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
+	} else {
+			$total_topics = (int) $_REQUEST['totaltopics'];
 	}
-	else
-		$total_topics = (int) $_REQUEST['totaltopics'];
 
 	// Seems like we need this here.
 	$context['continue_get_data'] = '?action=admin;area=maintain;sa=topics;activity=massmove;id_board_from=' . $id_board_from . ';id_board_to=' . $id_board_to . ';totaltopics=' . $total_topics . ';max_days=' . $max_days;
 
-	if ($locked)
-		$context['continue_get_data'] .= ';locked';
+	if ($locked) {
+			$context['continue_get_data'] .= ';locked';
+	}
 
-	if ($sticky)
-		$context['continue_get_data'] .= ';sticky';
+	if ($sticky) {
+			$context['continue_get_data'] .= ';sticky';
+	}
 
 	$context['continue_get_data'] .= ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 
@@ -1630,8 +1690,9 @@ 
 
 			// Get the ids.
 			$topics = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$topics[] = $row['id_topic'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$topics[] = $row['id_topic'];
+			}
 
 			// Just return if we don't have any topics left to move.
 			if (empty($topics))
@@ -1722,9 +1783,9 @@ 
 		// save it so we don't do this again for this task
 		list ($_SESSION['total_members']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
+	} else {
+			validateToken('admin-recountposts');
 	}
-	else
-		validateToken('admin-recountposts');
 
 	// Lets get a group of members and determine their post count (from the boards that have post count enabled of course).
 	$request = $smcFunc['db_query']('', '
@@ -1770,8 +1831,9 @@ 
 		createToken('admin-recountposts');
 		$context['continue_post_data'] = '<input type="hidden" name="' . $context['admin-recountposts_token_var'] . '" value="' . $context['admin-recountposts_token'] . '">';
 
-		if (function_exists('apache_reset_timeout'))
-			apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					apache_reset_timeout();
+		}
 		return;
 	}
 
@@ -1857,10 +1919,9 @@ 
 		checkSession('request');
 		validateToken('admin-hook', 'request');
 
-		if ($_REQUEST['do'] == 'remove')
-			remove_integration_function($_REQUEST['hook'], urldecode($_REQUEST['function']));
-
-		else
+		if ($_REQUEST['do'] == 'remove') {
+					remove_integration_function($_REQUEST['hook'], urldecode($_REQUEST['function']));
+		} else
 		{
 			$function_remove = urldecode($_REQUEST['function']) . (($_REQUEST['do'] == 'disable') ? '' : '!');
 			$function_add = urldecode($_REQUEST['function']) . (($_REQUEST['do'] == 'disable') ? '!' : '');
@@ -1910,11 +1971,11 @@ 
 						// Show a nice icon to indicate this is an instance.
 						$instance = (!empty($data['instance']) ? '<span class="generic_icons news" title="'. $txt['hooks_field_function_method'] .'"></span> ' : '');
 
-						if (!empty($data['included_file']))
-							return $instance . $txt['hooks_field_function'] . ': ' . $data['real_function'] . '<br>' . $txt['hooks_field_included_file'] . ': ' . $data['included_file'];
-
-						else
-							return $instance . $data['real_function'];
+						if (!empty($data['included_file'])) {
+													return $instance . $txt['hooks_field_function'] . ': ' . $data['real_function'] . '<br>' . $txt['hooks_field_included_file'] . ': ' . $data['included_file'];
+						} else {
+													return $instance . $data['real_function'];
+						}
 					},
 				),
 				'sort' =>  array(
@@ -1979,11 +2040,12 @@ 
 		'data' => array(
 			'function' => function ($data) use ($txt, $scripturl, $context)
 			{
-				if (!$data['hook_exists'])
-					return '
+				if (!$data['hook_exists']) {
+									return '
 					<a href="' . $scripturl . '?action=admin;area=maintain;sa=hooks;do=remove;hook=' . $data['hook_name'] . ';function=' . urlencode($data['function_name']) . $context['filter_url'] . ';' . $context['admin-hook_token_var'] . '=' . $context['admin-hook_token'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" data-confirm="' . $txt['quickmod_confirm'] . '" class="you_sure">
 						<span class="generic_icons delete" title="' . $txt['hooks_button_remove'] . '"></span>
 					</a>';
+				}
 			},
 			'class' => 'centertext',
 		),
@@ -2018,10 +2080,11 @@ 
 		{
 			if ($file != '.' && $file != '..')
 			{
-				if (is_dir($dir_path . '/' . $file))
-					$files = array_merge($files, get_files_recursive($dir_path . '/' . $file));
-				else
-					$files[] = array('dir' => $dir_path, 'name' => $file);
+				if (is_dir($dir_path . '/' . $file)) {
+									$files = array_merge($files, get_files_recursive($dir_path . '/' . $file));
+				} else {
+									$files[] = array('dir' => $dir_path, 'name' => $file);
+				}
 			}
 		}
 	}
@@ -2070,16 +2133,16 @@ 
 							// I need to know if there is at least one function called in this file.
 							$temp_data['include'][$hookParsedData['pureFunc']] = array('hook' => $hook, 'function' => $hookParsedData['pureFunc']);
 							unset($temp_hooks[$hook][$rawFunc]);
-						}
-						elseif (strpos(str_replace(' (', '(', $fc), 'function ' . trim($hookParsedData['pureFunc']) . '(') !== false)
+						} elseif (strpos(str_replace(' (', '(', $fc), 'function ' . trim($hookParsedData['pureFunc']) . '(') !== false)
 						{
 							$hook_status[$hook][$hookParsedData['pureFunc']] = $hookParsedData;
 							$hook_status[$hook][$hookParsedData['pureFunc']]['exists'] = true;
 							$hook_status[$hook][$hookParsedData['pureFunc']]['in_file'] = (!empty($file['name']) ? $file['name'] : (!empty($hookParsedData['hookFile']) ? $hookParsedData['hookFile'] : ''));
 
 							// Does the hook has its own file?
-							if (!empty($hookParsedData['hookFile']))
-								$temp_data['include'][$hookParsedData['pureFunc']] = array('hook' => $hook, 'function' => $hookParsedData['pureFunc']);
+							if (!empty($hookParsedData['hookFile'])) {
+															$temp_data['include'][$hookParsedData['pureFunc']] = array('hook' => $hook, 'function' => $hookParsedData['pureFunc']);
+							}
 
 							// I want to remember all the functions called within this file (to check later if they are enabled or disabled and decide if the integrare_*_include of that file can be disabled too)
 							$temp_data['function'][$file['name']][$hookParsedData['pureFunc']] = $hookParsedData['enabled'];
@@ -2106,15 +2169,17 @@ 
 	$sort = array();
 	$hooks_filters = array();
 
-	foreach ($hooks as $hook => $functions)
-		$hooks_filters[] = '<option' . ($context['current_filter'] == $hook ? ' selected ' : '') . ' value="' . $hook . '">' . $hook . '</option>';
+	foreach ($hooks as $hook => $functions) {
+			$hooks_filters[] = '<option' . ($context['current_filter'] == $hook ? ' selected ' : '') . ' value="' . $hook . '">' . $hook . '</option>';
+	}
 
-	if (!empty($hooks_filters))
-		$context['insert_after_template'] .= '
+	if (!empty($hooks_filters)) {
+			$context['insert_after_template'] .= '
 		<script>
 			var hook_name_header = document.getElementById(\'header_list_integration_hooks_hook_name\');
 			hook_name_header.innerHTML += ' . JavaScriptEscape('<select style="margin-left:15px;" onchange="window.location=(\'' . $scripturl . '?action=admin;area=maintain;sa=hooks\' + (this.value ? \';filter=\' + this.value : \'\'));"><option value="">' . $txt['hooks_reset_filter'] . '</option>' . implode('', $hooks_filters) . '</select>'). ';
 		</script>';
+	}
 
 	$temp_data = array();
 	$id = 0;
@@ -2157,10 +2222,11 @@ 
 
 	foreach ($temp_data as $data)
 	{
-		if (++$counter < $start)
-			continue;
-		elseif ($counter == $start + $per_page)
-			break;
+		if (++$counter < $start) {
+					continue;
+		} elseif ($counter == $start + $per_page) {
+					break;
+		}
 
 		$hooks_data[] = $data;
 	}
@@ -2182,13 +2248,15 @@ 
 	$hooks_count = 0;
 
 	$context['filter'] = false;
-	if (isset($_GET['filter']))
-		$context['filter'] = $_GET['filter'];
+	if (isset($_GET['filter'])) {
+			$context['filter'] = $_GET['filter'];
+	}
 
 	foreach ($hooks as $hook => $functions)
 	{
-		if (empty($context['filter']) || (!empty($context['filter']) && $context['filter'] == $hook))
-			$hooks_count += count($functions);
+		if (empty($context['filter']) || (!empty($context['filter']) && $context['filter'] == $hook)) {
+					$hooks_count += count($functions);
+		}
 	}
 
 	return $hooks_count;
@@ -2209,8 +2277,9 @@ 
 		$integration_hooks = array();
 		foreach ($modSettings as $key => $value)
 		{
-			if (!empty($value) && substr($key, 0, 10) === 'integrate_')
-				$integration_hooks[$key] = explode(',', $value);
+			if (!empty($value) && substr($key, 0, 10) === 'integrate_') {
+							$integration_hooks[$key] = explode(',', $value);
+			}
 		}
 	}
 
@@ -2241,8 +2310,9 @@ 
 	);
 
 	// Meh...
-	if (empty($rawData))
-		return $hookData;
+	if (empty($rawData)) {
+			return $hookData;
+	}
 
 	// For convenience purposes only!
 	$modFunc = $rawData;
@@ -2253,11 +2323,11 @@ 
 		list ($hookData['hookFile'], $modFunc) = explode('|', $modFunc);
 
 		// Does the file exists? who knows!
-		if (empty($settings['theme_dir']))
-			$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-
-		else
-			$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		if (empty($settings['theme_dir'])) {
+					$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
+		} else {
+					$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		}
 
 		$hookData['fileExists'] = file_exists($hookData['absPath']);
 		$hookData['hookFile'] = basename($hookData['hookFile']);
@@ -2282,11 +2352,10 @@ 
 	{
 		list ($hookData['class'], $hookData['method']) = explode('::', $modFunc);
 		$hookData['pureFunc'] = $hookData['method'];
+	} else {
+			$hookData['pureFunc'] = $modFunc;
 	}
 
-	else
-		$hookData['pureFunc'] = $modFunc;
-
 	return $hookData;
 }
 

Sources/Subscriptions-PayPal.php

Braces +83 added lines, -61 removed lines

@@ -14,8 +14,9 @@ 
 // This won't be dedicated without this - this must exist in each gateway!
 // SMF Payment Gateway: paypal
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class for returning available form data for this gateway
@@ -118,8 +119,7 @@ 
 		{
 			$return_data['hidden']['p3'] = 1;
 			$return_data['hidden']['t3'] = strtoupper(substr($period, 0, 1));
-		}
-		else
+		} else
 		{
 			preg_match('~(\d*)(\w)~', $sub_data['real_length'], $match);
 			$unit = $match[1];
@@ -130,14 +130,15 @@ 
 		}
 
 		// If it's repeatable do some javascript to respect this idea.
-		if (!empty($sub_data['repeatable']))
-			$return_data['javascript'] = '
+		if (!empty($sub_data['repeatable'])) {
+					$return_data['javascript'] = '
 				document.write(\'<label for="do_paypal_recur"><input type="checkbox" name="do_paypal_recur" id="do_paypal_recur" checked onclick="switchPaypalRecur();" class="input_check">' . $txt['paid_make_recurring'] . '</label><br>\');
 
 				function switchPaypalRecur()
 				{
 					document.getElementById("paypal_cmd").value = document.getElementById("do_paypal_recur").checked ? "_xclick-subscriptions" : "_xclick";
 				}';
+		}
 
 		return $return_data;
 	}
@@ -160,20 +161,24 @@ 
 		global $modSettings;
 
 		// Has the user set up an email address?
-		if ((empty($modSettings['paidsubs_test']) && empty($modSettings['paypal_email'])) || (!empty($modSettings['paidsubs_test']) && empty($modSettings['paypal_sandbox_email'])))
-			return false;
+		if ((empty($modSettings['paidsubs_test']) && empty($modSettings['paypal_email'])) || (!empty($modSettings['paidsubs_test']) && empty($modSettings['paypal_sandbox_email']))) {
+					return false;
+		}
 		// Check the correct transaction types are even here.
-		if ((!isset($_POST['txn_type']) && !isset($_POST['payment_status'])) || (!isset($_POST['business']) && !isset($_POST['receiver_email'])))
-			return false;
+		if ((!isset($_POST['txn_type']) && !isset($_POST['payment_status'])) || (!isset($_POST['business']) && !isset($_POST['receiver_email']))) {
+					return false;
+		}
 		// Correct email address?
-		if (!isset($_POST['business']))
-			$_POST['business'] = $_POST['receiver_email'];
+		if (!isset($_POST['business'])) {
+					$_POST['business'] = $_POST['receiver_email'];
+		}
 
 		// Are we testing?
-		if (empty($modSettings['paidsubs_test']) && strtolower($modSettings['paypal_sandbox_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower($modSettings['paypal_additional_emails'])))))
-			return false;
-		elseif (strtolower($modSettings['paypal_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', $modSettings['paypal_additional_emails']))))
-			return false;
+		if (empty($modSettings['paidsubs_test']) && strtolower($modSettings['paypal_sandbox_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower($modSettings['paypal_additional_emails']))))) {
+					return false;
+		} elseif (strtolower($modSettings['paypal_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', $modSettings['paypal_additional_emails'])))) {
+					return false;
+		}
 		return true;
 	}
 
@@ -192,15 +197,17 @@ 
 		global $modSettings, $txt;
 
 		// Put this to some default value.
-		if (!isset($_POST['txn_type']))
-			$_POST['txn_type'] = '';
+		if (!isset($_POST['txn_type'])) {
+					$_POST['txn_type'] = '';
+		}
 
 		// Build the request string - starting with the minimum requirement.
 		$requestString = 'cmd=_notify-validate';
 
 		// Now my dear, add all the posted bits in the order we got them
-		foreach ($_POST as $k => $v)
-			$requestString .= '&' . $k . '=' . urlencode($v);
+		foreach ($_POST as $k => $v) {
+					$requestString .= '&' . $k . '=' . urlencode($v);
+		}
 
 		// Can we use curl?
 		if (function_exists('curl_init') && $curl = curl_init((!empty($modSettings['paidsubs_test']) ? 'https://www.sandbox.' : 'http://www.') . 'paypal.com/cgi-bin/webscr'))
@@ -240,14 +247,16 @@ 
 			$header .= 'Connection: close' . "\r\n\r\n";
 
 			// Open the connection.
-			if (!empty($modSettings['paidsubs_test']))
-				$fp = fsockopen('ssl://www.sandbox.paypal.com', 443, $errno, $errstr, 30);
-			else
-				$fp = fsockopen('www.paypal.com', 80, $errno, $errstr, 30);
+			if (!empty($modSettings['paidsubs_test'])) {
+							$fp = fsockopen('ssl://www.sandbox.paypal.com', 443, $errno, $errstr, 30);
+			} else {
+							$fp = fsockopen('www.paypal.com', 80, $errno, $errstr, 30);
+			}
 
 			// Did it work?
-			if (!$fp)
-				generateSubscriptionError($txt['paypal_could_not_connect']);
+			if (!$fp) {
+							generateSubscriptionError($txt['paypal_could_not_connect']);
+			}
 
 			// Put the data to the port.
 			fputs($fp, $header . $requestString);
@@ -256,8 +265,9 @@ 
 			while (!feof($fp))
 			{
 				$this->return_data = fgets($fp, 1024);
-				if (strcmp(trim($this->return_data), 'VERIFIED') === 0)
-					break;
+				if (strcmp(trim($this->return_data), 'VERIFIED') === 0) {
+									break;
+				}
 			}
 
 			// Clean up.
@@ -265,28 +275,34 @@ 
 		}
 
 		// If this isn't verified then give up...
-		if (strcmp(trim($this->return_data), 'VERIFIED') !== 0)
-			exit;
+		if (strcmp(trim($this->return_data), 'VERIFIED') !== 0) {
+					exit;
+		}
 
 		// Check that this is intended for us.
-		if (strtolower($modSettings['paypal_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower($modSettings['paypal_additional_emails'])))))
-			exit;
+		if (strtolower($modSettings['paypal_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower($modSettings['paypal_additional_emails']))))) {
+					exit;
+		}
 
 		// Is this a subscription - and if so is it a secondary payment that we need to process?
 		// If so, make sure we get it in the expected format. Seems PayPal sometimes sends it without urlencoding.
-		if (!empty($_POST['item_number']) && strpos($_POST['item_number'], ' ') !== false)
-			$_POST['item_number'] = str_replace(' ', '+', $_POST['item_number']);
-		if ($this->isSubscription() && (empty($_POST['item_number']) || strpos($_POST['item_number'], '+') === false))
-			// Calculate the subscription it relates to!
+		if (!empty($_POST['item_number']) && strpos($_POST['item_number'], ' ') !== false) {
+					$_POST['item_number'] = str_replace(' ', '+', $_POST['item_number']);
+		}
+		if ($this->isSubscription() && (empty($_POST['item_number']) || strpos($_POST['item_number'], '+') === false)) {
+					// Calculate the subscription it relates to!
 			$this->_findSubscription();
+		}
 
 		// Verify the currency!
-		if (strtolower($_POST['mc_currency']) !== strtolower($modSettings['paid_currency_code']))
-			exit;
+		if (strtolower($_POST['mc_currency']) !== strtolower($modSettings['paid_currency_code'])) {
+					exit;
+		}
 
 		// Can't exist if it doesn't contain anything.
-		if (empty($_POST['item_number']))
-			exit;
+		if (empty($_POST['item_number'])) {
+					exit;
+		}
 
 		// Return the id_sub and id_member
 		return explode('+', $_POST['item_number']);
@@ -299,10 +315,11 @@ 
 	 */
 	public function isRefund()
 	{
-		if ($_POST['payment_status'] === 'Refunded' || $_POST['payment_status'] === 'Reversed' || $_POST['txn_type'] === 'Refunded' || ($_POST['txn_type'] === 'reversal' && $_POST['payment_status'] === 'Completed'))
-			return true;
-		else
-			return false;
+		if ($_POST['payment_status'] === 'Refunded' || $_POST['payment_status'] === 'Reversed' || $_POST['txn_type'] === 'Refunded' || ($_POST['txn_type'] === 'reversal' && $_POST['payment_status'] === 'Completed')) {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -312,10 +329,11 @@ 
 	 */
 	public function isSubscription()
 	{
-		if (substr($_POST['txn_type'], 0, 14) === 'subscr_payment' && $_POST['payment_status'] === 'Completed')
-			return true;
-		else
-			return false;
+		if (substr($_POST['txn_type'], 0, 14) === 'subscr_payment' && $_POST['payment_status'] === 'Completed') {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -325,10 +343,11 @@ 
 	 */
 	public function isPayment()
 	{
-		if ($_POST['payment_status'] === 'Completed' && $_POST['txn_type'] === 'web_accept')
-			return true;
-		else
-			return false;
+		if ($_POST['payment_status'] === 'Completed' && $_POST['txn_type'] === 'web_accept') {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -341,10 +360,11 @@ 
 		// subscr_cancel is sent when the user cancels, subscr_eot is sent when the subscription reaches final payment
 		// Neither require us to *do* anything as per performCancel().
 		// subscr_eot, if sent, indicates an end of payments term.
-		if (substr($_POST['txn_type'], 0, 13) === 'subscr_cancel' || substr($_POST['txn_type'], 0, 10) === 'subscr_eot')
-			return true;
-		else
-			return false;
+		if (substr($_POST['txn_type'], 0, 13) === 'subscr_cancel' || substr($_POST['txn_type'], 0, 10) === 'subscr_eot') {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -409,8 +429,9 @@ 
 		global $smcFunc;
 
 		// Assume we have this?
-		if (empty($_POST['subscr_id']))
-			return false;
+		if (empty($_POST['subscr_id'])) {
+					return false;
+		}
 
 		// Do we have this in the database?
 		$request = $smcFunc['db_query']('', '
@@ -439,11 +460,12 @@ 
 						'payer_email' => $_POST['payer_email'],
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) === 0)
-					return false;
+				if ($smcFunc['db_num_rows']($request) === 0) {
+									return false;
+				}
+			} else {
+							return false;
 			}
-			else
-				return false;
 		}
 		list ($member_id, $subscription_id) = $smcFunc['db_fetch_row']($request);
 		$_POST['item_number'] = $member_id . '+' . $subscription_id;

Sources/Class-CurlFetchWeb.php

Braces +30 added lines, -24 removed lines

@@ -10,8 +10,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class curl_fetch_web_data
@@ -87,10 +88,11 @@ 
 	public function get_url_data($url, $post_data = array())
 	{
 		// POSTing some data perhaps?
-		if (!empty($post_data) && is_array($post_data))
-			$this->post_data = $this->build_post_data($post_data);
-		elseif (!empty($post_data))
-			$this->post_data = trim($post_data);
+		if (!empty($post_data) && is_array($post_data)) {
+					$this->post_data = $this->build_post_data($post_data);
+		} elseif (!empty($post_data)) {
+					$this->post_data = trim($post_data);
+		}
 
 		// set the options and get it
 		$this->set_options();
@@ -111,10 +113,11 @@ 
 	private function curl_request($url, $redirect = false)
 	{
 		// we do have a url I hope
-		if ($url == '')
-			return false;
-		else
-			$this->options[CURLOPT_URL] = $url;
+		if ($url == '') {
+					return false;
+		} else {
+					$this->options[CURLOPT_URL] = $url;
+		}
 
 		// if we have not already been redirected, set it up so we can if needed
 		if (!$redirect)
@@ -194,10 +197,11 @@ 
 		$max_result = count($this->response) - 1;
 
 		// just return a specifed area or the entire result?
-		if ($area == '')
-			return $this->response[$max_result];
-		else
-			return isset($this->response[$max_result][$area]) ? $this->response[$max_result][$area] : $this->response[$max_result];
+		if ($area == '') {
+					return $this->response[$max_result];
+		} else {
+					return isset($this->response[$max_result][$area]) ? $this->response[$max_result][$area] : $this->response[$max_result];
+		}
 	}
 
 	/**
@@ -210,9 +214,9 @@ 
 	*/
 	public function result_raw($response_number = '')
 	{
-		if (!is_numeric($response_number))
-			return $this->response;
-		else
+		if (!is_numeric($response_number)) {
+					return $this->response;
+		} else
 		{
 			$response_number = min($response_number, count($this->response) - 1);
 			return $this->response[$response_number];
@@ -234,13 +238,14 @@ 
 			$postvars = array();
 
 			// build the post data, drop ones with leading @'s since those can be used to send files, we don't support that.
-			foreach ($post_data as $name => $value)
-				$postvars[] = $name . '=' . urlencode($value[0] == '@' ? '' : $value);
+			foreach ($post_data as $name => $value) {
+							$postvars[] = $name . '=' . urlencode($value[0] == '@' ? '' : $value);
+			}
 
 			return implode('&', $postvars);
+		} else {
+					return $post_data;
 		}
-		else
-			return $post_data;
 
 	}
 
@@ -261,9 +266,9 @@ 
 			$keys = array_merge(array_keys($this->default_options), array_keys($this->user_options));
 			$vals = array_merge($this->default_options, $this->user_options);
 			$this->options = array_combine($keys, $vals);
+		} else {
+					$this->options = $this->default_options;
 		}
-		else
-			$this->options = $this->default_options;
 
 		// POST data options, here we don't allow any overide
 		if (isset($this->post_data))
@@ -302,8 +307,9 @@ 
 		$temp = explode(': ', $_header, 2);
 
 		// set proper headers only
-		if (isset($temp[0]) && isset($temp[1]))
-			$this->headers[strtolower($temp[0])] = strtolower(trim($temp[1]));
+		if (isset($temp[0]) && isset($temp[1])) {
+					$this->headers[strtolower($temp[0])] = strtolower(trim($temp[1]));
+		}
 
 		// return the length of what was passed unless you want a Failed writing header error ;)
 		return strlen($header);

Sources/Notify.php

Braces +23 added lines, -20 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Turn off/on notification for a particular board.
@@ -34,8 +35,9 @@ 
 	is_not_guest();
 
 	// You have to specify a board to turn notifications on!
-	if (empty($board))
-		fatal_lang_error('no_board', false);
+	if (empty($board)) {
+			fatal_lang_error('no_board', false);
+	}
 
 	// No subaction: find out what to do.
 	if (isset($_GET['mode']))
@@ -48,16 +50,16 @@ 
 		require_once($sourcedir . '/Subs-Notify.php');
 		setNotifyPrefs($user_info['id'], array('board_notify_' . $board => $alertPref));
 
-		if ($mode > 1)
-			// Turn notification on.  (note this just blows smoke if it's already on.)
+		if ($mode > 1) {
+					// Turn notification on.  (note this just blows smoke if it's already on.)
 			$smcFunc['db_insert']('ignore',
 				'{db_prefix}log_notify',
 				array('id_member' => 'int', 'id_board' => 'int'),
 				array($user_info['id'], $board),
 				array('id_member', 'id_board')
 			);
-		else
-			$smcFunc['db_query']('', '
+		} else {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}log_notify
 				WHERE id_member = {int:current_member}
 				AND id_board = {int:current_board}',
@@ -66,6 +68,7 @@ 
 					'current_member' => $user_info['id'],
 				)
 			);
+		}
 
 	}
 
@@ -81,10 +84,10 @@ 
 			),
 		);
 		$context['sub_template'] = 'generic_xml';
+	} else {
+			redirectexit('board=' . $board . '.' . $_REQUEST['start']);
+	}
 	}
-	else
-		redirectexit('board=' . $board . '.' . $_REQUEST['start']);
-}
 
 /**
  * Turn off/on unread replies subscription for a topic as well as sets individual topic's alert preferences
@@ -108,8 +111,9 @@ 
 			$mode = (int) $_GET['mode'];
 			$alertPref = $mode <= 1 ? 0 : ($mode == 2 ? 1 : 3);
 
-			if (empty($mode))
-				$mode = 1;
+			if (empty($mode)) {
+							$mode = 1;
+			}
 
 			$request = $smcFunc['db_query']('', '
 				SELECT id_member, id_topic, id_msg, unwatched
@@ -132,8 +136,7 @@ 
 					'id_msg' => 0,
 					'unwatched' => empty($mode) ? 1 : 0,
 				);
-			}
-			else
+			} else
 			{
 				$insert = false;
 				$log['unwatched'] = empty($mode) ? 1 : 0;
@@ -160,9 +163,8 @@ 
 					array($user_info['id'], $log['id_topic']),
 					array('id_member', 'id_board')
 				);
-			}
-			else
-				$smcFunc['db_query']('', '
+			} else {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}log_notify
 					WHERE id_topic = {int:topic}
 						AND id_member = {int:member}',
@@ -170,6 +172,7 @@ 
 						'topic' => $log['id_topic'],
 						'member' => $user_info['id'],
 					));
+			}
 
 		}
 	}
@@ -186,9 +189,9 @@ 
 			),
 		);
 		$context['sub_template'] = 'generic_xml';
+	} else {
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	}
 	}
-	else
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
-}
 
 ?>
\ No newline at end of file

Sources/RepairBoards.php

Braces +119 added lines, -85 removed lines

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

Sources/Xml.php

Braces +55 added lines, -42 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main handler and designator for AJAX stuff - jumpto, message icons and previews
@@ -32,8 +33,9 @@ 
 	// Easy adding of sub actions.
 	call_integration_hook('integrate_XMLhttpMain_subActions', array(&$subActions));
 
-	if (!isset($_REQUEST['sa'], $subActions[$_REQUEST['sa']]))
-		fatal_lang_error('no_access', false);
+	if (!isset($_REQUEST['sa'], $subActions[$_REQUEST['sa']])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	call_helper($subActions[$_REQUEST['sa']]);
 }
@@ -57,8 +59,9 @@ 
 	foreach ($context['jump_to'] as $id_cat => $cat)
 	{
 		$context['jump_to'][$id_cat]['name'] = un_htmlspecialchars(strip_tags($cat['name']));
-		foreach ($cat['boards'] as $id_board => $board)
-			$context['jump_to'][$id_cat]['boards'][$id_board]['name'] = un_htmlspecialchars(strip_tags($board['name']));
+		foreach ($cat['boards'] as $id_board => $board) {
+					$context['jump_to'][$id_cat]['boards'][$id_board]['name'] = un_htmlspecialchars(strip_tags($board['name']));
+		}
 	}
 
 	$context['sub_template'] = 'jump_to';
@@ -95,8 +98,9 @@ 
 
 	$context['sub_template'] = 'generic_xml';
 
-	if (!isset($_POST['item']) || !in_array($_POST['item'], $items))
-		return false;
+	if (!isset($_POST['item']) || !in_array($_POST['item'], $items)) {
+			return false;
+	}
 
 	$_POST['item']();
 }
@@ -112,10 +116,11 @@ 
 
 	$errors = array();
 	$news = !isset($_POST['news'])? '' : $smcFunc['htmlspecialchars']($_POST['news'], ENT_QUOTES);
-	if (empty($news))
-		$errors[] = array('value' => 'no_news');
-	else
-		preparsecode($news);
+	if (empty($news)) {
+			$errors[] = array('value' => 'no_news');
+	} else {
+			preparsecode($news);
+	}
 
 	$context['xml_data'] = array(
 		'news' => array(
@@ -148,10 +153,12 @@ 
 	$context['send_pm'] = !empty($_POST['send_pm']) ? 1 : 0;
 	$context['send_html'] = !empty($_POST['send_html']) ? 1 : 0;
 
-	if (empty($_POST['subject']))
-		$context['post_error']['messages'][] = $txt['error_no_subject'];
-	if (empty($_POST['message']))
-		$context['post_error']['messages'][] = $txt['error_no_message'];
+	if (empty($_POST['subject'])) {
+			$context['post_error']['messages'][] = $txt['error_no_subject'];
+	}
+	if (empty($_POST['message'])) {
+			$context['post_error']['messages'][] = $txt['error_no_message'];
+	}
 
 	prepareMailingForPreview();
 
@@ -196,38 +203,41 @@ 
 		$preview_signature = !empty($_POST['signature']) ? $_POST['signature'] : $txt['no_signature_preview'];
 		$validation = profileValidateSignature($preview_signature);
 
-		if ($validation !== true && $validation !== false)
-			$errors[] = array('value' => $txt['profile_error_' . $validation], 'attributes' => array('type' => 'error'));
+		if ($validation !== true && $validation !== false) {
+					$errors[] = array('value' => $txt['profile_error_' . $validation], 'attributes' => array('type' => 'error'));
+		}
 
 		censorText($preview_signature);
 		$preview_signature = parse_bbc($preview_signature, true, 'sig' . $user);
-	}
-	elseif (!$can_change)
+	} elseif (!$can_change)
 	{
-		if ($is_owner)
-			$errors[] = array('value' => $txt['cannot_profile_extra_own'], 'attributes' => array('type' => 'error'));
-		else
-			$errors[] = array('value' => $txt['cannot_profile_extra_any'], 'attributes' => array('type' => 'error'));
+		if ($is_owner) {
+					$errors[] = array('value' => $txt['cannot_profile_extra_own'], 'attributes' => array('type' => 'error'));
+		} else {
+					$errors[] = array('value' => $txt['cannot_profile_extra_any'], 'attributes' => array('type' => 'error'));
+		}
+	} else {
+			$errors[] = array('value' => $txt['no_user_selected'], 'attributes' => array('type' => 'error'));
 	}
-	else
-		$errors[] = array('value' => $txt['no_user_selected'], 'attributes' => array('type' => 'error'));
 
 	$context['xml_data']['signatures'] = array(
 			'identifier' => 'signature',
 			'children' => array()
 		);
-	if (isset($current_signature))
-		$context['xml_data']['signatures']['children'][] = array(
+	if (isset($current_signature)) {
+			$context['xml_data']['signatures']['children'][] = array(
 					'value' => $current_signature,
 					'attributes' => array('type' => 'current'),
 				);
-	if (isset($preview_signature))
-		$context['xml_data']['signatures']['children'][] = array(
+	}
+	if (isset($preview_signature)) {
+			$context['xml_data']['signatures']['children'][] = array(
 					'value' => $preview_signature,
 					'attributes' => array('type' => 'preview'),
 				);
-	if (!empty($errors))
-		$context['xml_data']['errors'] = array(
+	}
+	if (!empty($errors)) {
+			$context['xml_data']['errors'] = array(
 			'identifier' => 'error',
 			'children' => array_merge(
 				array(
@@ -239,7 +249,8 @@ 
 				$errors
 			),
 		);
-}
+	}
+	}
 
 /**
  * Handles previewing user warnings
@@ -261,15 +272,17 @@ 
 		$context['preview_subject'] = !empty($_POST['title']) ? trim($smcFunc['htmlspecialchars']($_POST['title'])) : '';
 		if (isset($_POST['issuing']))
 		{
-			if (empty($_POST['title']) || empty($_POST['body']))
-				$context['post_error']['messages'][] = $txt['warning_notify_blank'];
-		}
-		else
+			if (empty($_POST['title']) || empty($_POST['body'])) {
+							$context['post_error']['messages'][] = $txt['warning_notify_blank'];
+			}
+		} else
 		{
-			if (empty($_POST['title']))
-				$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_title'];
-			if (empty($_POST['body']))
-				$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_body'];
+			if (empty($_POST['title'])) {
+							$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_title'];
+			}
+			if (empty($_POST['body'])) {
+							$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_body'];
+			}
 			// Add in few replacements.
 			/**
 			* These are the defaults:
@@ -300,9 +313,9 @@ 
 			$warning_body = parse_bbc($warning_body, true);
 		}
 		$context['preview_message'] = $warning_body;
+	} else {
+			$context['post_error']['messages'][] = array('value' => $txt['cannot_issue_warning'], 'attributes' => array('type' => 'error'));
 	}
-	else
-		$context['post_error']['messages'][] = array('value' => $txt['cannot_issue_warning'], 'attributes' => array('type' => 'error'));
 
 	$context['sub_template'] = 'warning';
 }

Sources/DbSearch-mysql.php

Braces +13 added lines, -10 removed lines

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

Sources/SearchAPI-Fulltext.php

Braces +44 added lines, -34 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class fulltext_search
@@ -98,8 +99,9 @@ 
 			$smcFunc['db_free_result']($request);
 		}
 		// 4 is the MySQL default...
-		else
-			$min_word_length = 4;
+		else {
+					$min_word_length = 4;
+		}
 
 		return $min_word_length;
 	}
@@ -138,8 +140,7 @@ 
 					$wordsSearch['words'][] = trim($word, "/*- ");
 					$wordsSearch['complex_words'][] = count($subwords) === 1 ? $word : '"' . $word . '"';
 				}
-			}
-			elseif ($smcFunc['strlen'](trim($word, "/*- ")) < $this->min_word_length)
+			} elseif ($smcFunc['strlen'](trim($word, "/*- ")) < $this->min_word_length)
 			{
 				// short words have feelings too
 				$wordsSearch['words'][] = trim($word, "/*- ");
@@ -149,8 +150,9 @@ 
 
 		$fulltextWord = count($subwords) === 1 ? $word : '"' . $word . '"';
 		$wordsSearch['indexed_words'][] = $fulltextWord;
-		if ($isExcluded)
-			$wordsExclude[] = $fulltextWord;
+		if ($isExcluded) {
+					$wordsExclude[] = $fulltextWord;
+		}
 	}
 
 	/**
@@ -166,41 +168,50 @@ 
 		$query_where = array();
 		$query_params = $search_data['params'];
 
-		if ($query_params['id_search'])
-			$query_select['id_search'] = '{int:id_search}';
+		if ($query_params['id_search']) {
+					$query_select['id_search'] = '{int:id_search}';
+		}
 
 		$count = 0;
-		if (empty($modSettings['search_simple_fulltext']))
-			foreach ($words['words'] as $regularWord)
+		if (empty($modSettings['search_simple_fulltext'])) {
+					foreach ($words['words'] as $regularWord)
 			{
 				$query_where[] = 'm.body' . (in_array($regularWord, $query_params['excluded_words']) ? ' NOT' : '') . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : 'RLIKE') . '{string:complex_body_' . $count . '}';
+		}
 				$query_params['complex_body_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($regularWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $regularWord), '\\\'') . '[[:>:]]';
 			}
 
-		if ($query_params['user_query'])
-			$query_where[] = '{raw:user_query}';
-		if ($query_params['board_query'])
-			$query_where[] = 'm.id_board {raw:board_query}';
+		if ($query_params['user_query']) {
+					$query_where[] = '{raw:user_query}';
+		}
+		if ($query_params['board_query']) {
+					$query_where[] = 'm.id_board {raw:board_query}';
+		}
 
-		if ($query_params['topic'])
-			$query_where[] = 'm.id_topic = {int:topic}';
-		if ($query_params['min_msg_id'])
-			$query_where[] = 'm.id_msg >= {int:min_msg_id}';
-		if ($query_params['max_msg_id'])
-			$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		if ($query_params['topic']) {
+					$query_where[] = 'm.id_topic = {int:topic}';
+		}
+		if ($query_params['min_msg_id']) {
+					$query_where[] = 'm.id_msg >= {int:min_msg_id}';
+		}
+		if ($query_params['max_msg_id']) {
+					$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		}
 
 		$count = 0;
-		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_phrases'] as $phrase)
+		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_phrases'] as $phrase)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : 'RLIKE') . '{string:exclude_subject_phrase_' . $count . '}';
+		}
 				$query_params['exclude_subject_phrase_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($phrase, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $phrase), '\\\'') . '[[:>:]]';
 			}
 		$count = 0;
-		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_subject_words'] as $excludedWord)
+		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_subject_words'] as $excludedWord)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : 'RLIKE') . '{string:exclude_subject_words_' . $count . '}';
+		}
 				$query_params['exclude_subject_words_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($excludedWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $excludedWord), '\\\'') . '[[:>:]]';
 			}
 
@@ -223,12 +234,11 @@ 
 				}
 				$query_where[] = 'to_tsvector({string:language_ftx},body) @@ to_tsquery({string:language_ftx},{string:body_match})';
 				$query_params['language_ftx'] = $language_ftx;
+			} else {
+							$query_where[] = 'MATCH (body) AGAINST ({string:body_match})';
 			}
-			else
-				$query_where[] = 'MATCH (body) AGAINST ({string:body_match})';
 			$query_params['body_match'] = implode(' ', array_diff($words['indexed_words'], $query_params['excluded_index_words']));
-		}
-		else
+		} else
 		{
 			$query_params['boolean_match'] = '';
 
@@ -242,10 +252,10 @@ 
 					$query_params['boolean_match'] .= (in_array($fulltextWord, $query_params['excluded_index_words']) ? '!' : '') . $fulltextWord . ' ';
 					$row++;
 				}
-			}
-			else
-				foreach ($words['indexed_words'] as $fulltextWord)
+			} else {
+							foreach ($words['indexed_words'] as $fulltextWord)
 					$query_params['boolean_match'] .= (in_array($fulltextWord, $query_params['excluded_index_words']) ? '-' : '+') . $fulltextWord . ' ';
+			}
 
 			$query_params['boolean_match'] = substr($query_params['boolean_match'], 0, -1);
 
@@ -268,9 +278,9 @@ 
 					}
 					$query_where[] = 'to_tsvector({string:language_ftx},body) @@ to_tsquery({string:language_ftx},{string:boolean_match})';
 					$query_params['language_ftx'] = $language_ftx;
+				} else {
+									$query_where[] = 'MATCH (body) AGAINST ({string:boolean_match} IN BOOLEAN MODE)';
 				}
-				else
-					$query_where[] = 'MATCH (body) AGAINST ({string:boolean_match} IN BOOLEAN MODE)';
 			}
 
 		}

Sources/ManageSearchEngines.php

Braces +109 added lines, -77 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point for this section.
@@ -38,8 +39,7 @@ 
 			'stats' => 'SpiderStats',
 		);
 		$default = 'stats';
-	}
-	else
+	} else
 	{
 		$subActions = array(
 			'settings' => 'ManageSearchEngineSettings',
@@ -90,11 +90,12 @@ 
 		{
 			disabledState = document.getElementById(\'spider_mode\').value == 0;';
 
-	foreach ($config_vars as $variable)
-		if ($variable[1] != 'spider_mode')
+	foreach ($config_vars as $variable) {
+			if ($variable[1] != 'spider_mode')
 			$javascript_function .= '
 			if (document.getElementById(\'' . $variable[1] . '\'))
 				document.getElementById(\'' . $variable[1] . '\').disabled = disabledState;';
+	}
 
 	$javascript_function .= '
 		}
@@ -102,8 +103,9 @@ 
 
 	call_integration_hook('integrate_modify_search_engine_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// We need to load the groups for the spider group thingy.
 	$request = $smcFunc['db_query']('', '
@@ -116,13 +118,15 @@ 
 			'moderator_group' => 3,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$config_vars['spider_group'][2][$row['id_group']] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$config_vars['spider_group'][2][$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure it's valid - note that regular members are given id_group = 1 which is reversed in Load.php - no admins here!
-	if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']]))
-		$_POST['spider_group'] = 0;
+	if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']])) {
+			$_POST['spider_group'] = 0;
+	}
 
 	// We'll want this for our easy save.
 	require_once($sourcedir . '/ManageServer.php');
@@ -166,8 +170,9 @@ 
 	}
 
 	// Are we adding a new one?
-	if (!empty($_POST['addSpider']))
-		return EditSpider();
+	if (!empty($_POST['addSpider'])) {
+			return EditSpider();
+	}
 	// User pressed the 'remove selection button'.
 	elseif (!empty($_POST['removeSpiders']) && !empty($_POST['remove']) && is_array($_POST['remove']))
 	{
@@ -175,8 +180,9 @@ 
 		validateToken('admin-ser');
 
 		// Make sure every entry is a proper integer.
-		foreach ($_POST['remove'] as $index => $spider_id)
-			$_POST['remove'][(int) $index] = (int) $spider_id;
+		foreach ($_POST['remove'] as $index => $spider_id) {
+					$_POST['remove'][(int) $index] = (int) $spider_id;
+		}
 
 		// Delete them all!
 		$smcFunc['db_query']('', '
@@ -215,8 +221,9 @@ 
 	);
 
 	$context['spider_last_seen'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['spider_last_seen'][$row['id_spider']] = $row['last_seen_time'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['spider_last_seen'][$row['id_spider']] = $row['last_seen_time'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	createToken('admin-ser');
@@ -346,8 +353,9 @@ 
 		)
 	);
 	$spiders = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spiders[$row['id_spider']] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spiders[$row['id_spider']] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spiders;
@@ -397,14 +405,15 @@ 
 		foreach ($ip_sets as $set)
 		{
 			$test = ip2range(trim($set));
-			if (!empty($test))
-				$ips[] = $set;
+			if (!empty($test)) {
+							$ips[] = $set;
+			}
 		}
 		$ips = implode(',', $ips);
 
 		// Goes in as it is...
-		if ($context['id_spider'])
-			$smcFunc['db_query']('', '
+		if ($context['id_spider']) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}spiders
 				SET spider_name = {string:spider_name}, user_agent = {string:spider_agent},
 					ip_info = {string:ip_info}
@@ -416,8 +425,8 @@ 
 					'ip_info' => $ips,
 				)
 			);
-		else
-			$smcFunc['db_insert']('insert',
+		} else {
+					$smcFunc['db_insert']('insert',
 				'{db_prefix}spiders',
 				array(
 					'spider_name' => 'string', 'user_agent' => 'string', 'ip_info' => 'string',
@@ -427,6 +436,7 @@ 
 				),
 				array('id_spider')
 			);
+		}
 
 
 		cache_put_data('spider_search', null);
@@ -454,13 +464,14 @@ 
 				'current_spider' => $context['id_spider'],
 			)
 		);
-		if ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['spider'] = array(
+		if ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['spider'] = array(
 				'id' => $row['id_spider'],
 				'name' => $row['spider_name'],
 				'agent' => $row['user_agent'],
 				'ip_info' => $row['ip_info'],
 			);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -477,8 +488,9 @@ 
 {
 	global $modSettings, $smcFunc;
 
-	if (isset($_SESSION['id_robot']))
-		unset($_SESSION['id_robot']);
+	if (isset($_SESSION['id_robot'])) {
+			unset($_SESSION['id_robot']);
+	}
 	$_SESSION['robot_check'] = time();
 
 	// We cache the spider data for ten minutes if we can.
@@ -492,15 +504,17 @@ 
 			)
 		);
 		$spider_data = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$spider_data[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$spider_data[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		cache_put_data('spider_search', $spider_data, 600);
 	}
 
-	if (empty($spider_data))
-		return false;
+	if (empty($spider_data)) {
+			return false;
+	}
 
 	// Only do these bits once.
 	$ci_user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
@@ -508,33 +522,38 @@ 
 	foreach ($spider_data as $spider)
 	{
 		// User agent is easy.
-		if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false)
-			$_SESSION['id_robot'] = $spider['id_spider'];
+		if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false) {
+					$_SESSION['id_robot'] = $spider['id_spider'];
+		}
 		// IP stuff is harder.
 		elseif ($_SERVER['REMOTE_ADDR'])
 		{
 			$ips = explode(',', $spider['ip_info']);
 			foreach ($ips as $ip)
 			{
-				if ($ip === '')
-					continue;
+				if ($ip === '') {
+									continue;
+				}
 
 				$ip = ip2range($ip);
 				if (!empty($ip))
 				{
-					if (inet_ptod($ip['low']) <= inet_ptod($_SERVER['REMOTE_ADDR']) && inet_ptod($ip['high']) >= inet_ptod($_SERVER['REMOTE_ADDR']))
-						$_SESSION['id_robot'] = $spider['id_spider'];
+					if (inet_ptod($ip['low']) <= inet_ptod($_SERVER['REMOTE_ADDR']) && inet_ptod($ip['high']) >= inet_ptod($_SERVER['REMOTE_ADDR'])) {
+											$_SESSION['id_robot'] = $spider['id_spider'];
+					}
 				}
 			}
 		}
 
-		if (isset($_SESSION['id_robot']))
-			break;
+		if (isset($_SESSION['id_robot'])) {
+					break;
+		}
 	}
 
 	// If this is low server tracking then log the spider here as opposed to the main logging function.
-	if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot']))
-		logSpider();
+	if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot'])) {
+			logSpider();
+	}
 
 	return !empty($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 }
@@ -548,8 +567,9 @@ 
 {
 	global $smcFunc, $modSettings, $context;
 
-	if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot']))
-		return;
+	if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot'])) {
+			return;
+	}
 
 	// Attempt to update today's entry.
 	if ($modSettings['spider_mode'] == 1)
@@ -590,9 +610,9 @@ 
 			$url = $_GET + array('USER_AGENT' => $_SERVER['HTTP_USER_AGENT']);
 			unset($url['sesc'], $url[$context['session_var']]);
 			$url = json_encode($url);
+		} else {
+					$url = '';
 		}
-		else
-			$url = '';
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}log_spider_hits',
@@ -620,12 +640,14 @@ 
 		)
 	);
 	$spider_hits = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_hits[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_hits[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($spider_hits))
-		return;
+	if (empty($spider_hits)) {
+			return;
+	}
 
 	// Attempt to update the master data.
 	$stat_inserts = array();
@@ -646,18 +668,20 @@ 
 				'hits' => $stat['num_hits'],
 			)
 		);
-		if ($smcFunc['db_affected_rows']() == 0)
-			$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		if ($smcFunc['db_affected_rows']() == 0) {
+					$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		}
 	}
 
 	// New stats?
-	if (!empty($stat_inserts))
-		$smcFunc['db_insert']('ignore',
+	if (!empty($stat_inserts)) {
+			$smcFunc['db_insert']('ignore',
 			'{db_prefix}log_spider_stats',
 			array('stat_date' => 'date', 'id_spider' => 'int', 'page_hits' => 'int', 'last_seen' => 'int'),
 			$stat_inserts,
 			array('stat_date', 'id_spider')
 		);
+	}
 
 	// All processed.
 	$smcFunc['db_query']('', '
@@ -700,8 +724,7 @@ 
 					'delete_period' => $deleteTime,
 				)
 			);
-		}
-		else
+		} else
 		{
 			// Deleting all of them
 			$smcFunc['db_query']('', '
@@ -791,10 +814,11 @@ 
 		foreach ($context['spider_logs']['rows'] as $k => $row)
 		{
 			// Feature disabled?
-			if (empty($row['data']['viewing']['value']) && isset($modSettings['spider_mode']) && $modSettings['spider_mode'] < 3)
-				$context['spider_logs']['rows'][$k]['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>';
-			else
-				$urls[$k] = array($row['data']['viewing']['value'], -1);
+			if (empty($row['data']['viewing']['value']) && isset($modSettings['spider_mode']) && $modSettings['spider_mode'] < 3) {
+							$context['spider_logs']['rows'][$k]['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>';
+			} else {
+							$urls[$k] = array($row['data']['viewing']['value'], -1);
+			}
 		}
 
 		// Now stick in the new URLs.
@@ -836,8 +860,9 @@ 
 		)
 	);
 	$spider_logs = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_logs[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_logs[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spider_logs;
@@ -913,14 +938,18 @@ 
 
 	// Prepare the dates for the drop down.
 	$date_choices = array();
-	for ($y = $min_year; $y <= $max_year; $y++)
-		for ($m = 1; $m <= 12; $m++)
+	for ($y = $min_year; $y <= $max_year; $y++) {
+			for ($m = 1;
+	}
+	$m <= 12; $m++)
 		{
 			// This doesn't count?
-			if ($y == $min_year && $m < $min_month)
-				continue;
-			if ($y == $max_year && $m > $max_month)
-				break;
+			if ($y == $min_year && $m < $min_month) {
+							continue;
+			}
+			if ($y == $max_year && $m > $max_month) {
+							break;
+			}
 
 			$date_choices[$y . $m] = $txt['months_short'][$m] . ' ' . $y;
 		}
@@ -933,13 +962,14 @@ 
 		' . $txt['spider_stats_select_month'] . ':
 		<select name="new_date" onchange="document.spider_stat_list.submit();">';
 
-	if (empty($date_choices))
-		$date_select .= '
+	if (empty($date_choices)) {
+			$date_select .= '
 			<option></option>';
-	else
-		foreach ($date_choices as $id => $text)
+	} else {
+			foreach ($date_choices as $id => $text)
 			$date_select .= '
 			<option value="' . $id . '"' . ($current_date == $id ? ' selected' : '') . '>' . $text . '</option>';
+	}
 
 	$date_select .= '
 		</select>
@@ -1063,8 +1093,9 @@ 
 		)
 	);
 	$spider_stats = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_stats[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_stats[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spider_stats;
@@ -1105,8 +1136,9 @@ 
 		array()
 	);
 	$spiders = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spiders[$row['id_spider']] = $row['spider_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spiders[$row['id_spider']] = $row['spider_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	updateSettings(array('spider_name_cache' => json_encode($spiders)));