albertlast / SMF2.1

Sources/RepairBoards.php

Spacing +37 added lines, -37 removed lines

@@ -232,7 +232,7 @@ 
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
 				WHERE t.id_topic IS NULL
 				GROUP BY m.id_topic, m.id_board',
-			'fix_processing' => function ($row) use ($smcFunc)
+			'fix_processing' => function($row) use ($smcFunc)
 			{
 				global $salvageBoardID;
 
@@ -318,7 +318,7 @@ 
 			// Remove all topics that have zero messages in the messages table.
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($topics) use ($smcFunc)
+				'process' => function($topics) use ($smcFunc)
 				{
 					$smcFunc['db_query']('', '
 						DELETE FROM {db_prefix}topics
@@ -356,21 +356,21 @@ 
 				  AND p.id_poll IS NULL
 				GROUP BY o.id_poll
 				  ',
-			'fix_processing' => function ($row) use ($smcFunc, $txt)
+			'fix_processing' => function($row) use ($smcFunc, $txt)
 			{
 				global $salvageBoardID;
 
 				$row['poster_name'] = !empty($row['poster_name']) ? $row['poster_name'] : $txt['guest'];
 				$row['id_poster'] = !empty($row['id_poster']) ? $row['id_poster'] : 0;
 
-				if(empty($row['id_board']))
+				if (empty($row['id_board']))
 				{
 					// Only if we don't have a reasonable idea of where to put it.
 					createSalvageArea();
-					$row['id_board'] = (int)$salvageBoardID;
+					$row['id_board'] = (int) $salvageBoardID;
 				}
 
-				if(empty($row['id_topic'])) {
+				if (empty($row['id_topic'])) {
 					$newMessageID = $smcFunc['db_insert']('',
 						'{db_prefix}messages',
 						array(
@@ -492,7 +492,7 @@ 
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)
 				WHERE p.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND t.id_poll IS NULL',
-			'fix_processing' => function ($row) use ($smcFunc, $txt)
+			'fix_processing' => function($row) use ($smcFunc, $txt)
 			{
 				global $salvageBoardID;
 
@@ -605,7 +605,7 @@ 
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_topic, t.id_first_msg, t.id_last_msg, t.approved, mf.approved
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row) use ($smcFunc)
+			'fix_processing' => function($row) use ($smcFunc)
 			{
 				$row['firstmsg_approved'] = (int) $row['firstmsg_approved'];
 				$row['myid_first_msg'] = (int) $row['myid_first_msg'];
@@ -634,7 +634,7 @@ 
 					)
 				);
 			},
-			'message_function' => function ($row) use ($txt, &$context)
+			'message_function' => function($row) use ($txt, &$context)
 			{
 				// A pretend error?
 				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
@@ -668,7 +668,7 @@ 
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_topic, t.num_replies, mf.approved
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row)
+			'fix_processing' => function($row)
 		{
 
 				global $smcFunc;
@@ -689,7 +689,7 @@ 
 				);
 
 		},
-			'message_function' => function ($row)
+			'message_function' => function($row)
 		{
 
 				global $txt, $context;
@@ -722,7 +722,7 @@ 
 				GROUP BY t.id_topic, t.unapproved_posts
 				HAVING unapproved_posts != COUNT(mu.id_msg)
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row)
+			'fix_processing' => function($row)
 		{
 
 				global $smcFunc;
@@ -764,7 +764,7 @@ 
 				WHERE b.id_board IS NULL
 					AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_board',
-			'fix_processing' => function ($row)
+			'fix_processing' => function($row)
 		{
 
 				global $smcFunc, $salvageCatID, $txt;
@@ -813,7 +813,7 @@ 
 				ORDER BY b.id_cat, b.id_board',
 			'fix_collect' => array(
 				'index' => 'id_cat',
-				'process' => function ($cats)
+				'process' => function($cats)
 				{
 					global $smcFunc, $salvageCatID;
 					createSalvageArea();
@@ -849,7 +849,7 @@ 
 			// Last step-make sure all non-guest posters still exist.
 			'fix_collect' => array(
 				'index' => 'id_msg',
-				'process' => function ($msgs)
+				'process' => function($msgs)
 		{
 
 					global $smcFunc;
@@ -878,7 +878,7 @@ 
 				ORDER BY b.id_parent, b.id_board',
 			'fix_collect' => array(
 				'index' => 'id_parent',
-				'process' => function ($parents)
+				'process' => function($parents)
 				{
 					global $smcFunc, $salvageBoardID, $salvageCatID;
 					createSalvageArea();
@@ -912,7 +912,7 @@ 
 					AND p.id_poll IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_poll',
-				'process' => function ($polls)
+				'process' => function($polls)
 		{
 
 					global $smcFunc;
@@ -946,7 +946,7 @@ 
 				ORDER BY cal.id_topic',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($events)
+				'process' => function($events)
 		{
 
 					global $smcFunc;
@@ -978,7 +978,7 @@ 
 					AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($topics)
+				'process' => function($topics)
 		{
 
 					global $smcFunc;
@@ -1010,7 +1010,7 @@ 
 				GROUP BY lt.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members)
+				'process' => function($members)
 		{
 
 					global $smcFunc;
@@ -1042,7 +1042,7 @@ 
 				GROUP BY lb.id_board',
 			'fix_collect' => array(
 				'index' => 'id_board',
-				'process' => function ($boards)
+				'process' => function($boards)
 		{
 
 					global $smcFunc;
@@ -1074,7 +1074,7 @@ 
 				GROUP BY lb.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) use ($smcFunc)
+				'process' => function($members) use ($smcFunc)
 				{
 					$smcFunc['db_query']('', '
 						DELETE FROM {db_prefix}log_boards
@@ -1103,7 +1103,7 @@ 
 				GROUP BY lmr.id_board',
 			'fix_collect' => array(
 				'index' => 'id_board',
-				'process' => function ($boards) use ($smcFunc)
+				'process' => function($boards) use ($smcFunc)
 				{
 					$smcFunc['db_query']('', '
 						DELETE FROM {db_prefix}log_mark_read
@@ -1132,7 +1132,7 @@ 
 				GROUP BY lmr.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) use ($smcFunc)
+				'process' => function($members) use ($smcFunc)
 				{
 					$smcFunc['db_query']('', '
 						DELETE FROM {db_prefix}log_mark_read
@@ -1161,7 +1161,7 @@ 
 				GROUP BY pmr.id_pm',
 			'fix_collect' => array(
 				'index' => 'id_pm',
-				'process' => function ($pms) use ($smcFunc)
+				'process' => function($pms) use ($smcFunc)
 				{
 					$smcFunc['db_query']('', '
 						DELETE FROM {db_prefix}pm_recipients
@@ -1191,7 +1191,7 @@ 
 				GROUP BY pmr.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members)
+				'process' => function($members)
 		{
 
 					global $smcFunc;
@@ -1223,7 +1223,7 @@ 
 					AND mem.id_member IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_pm',
-				'process' => function ($guestMessages)
+				'process' => function($guestMessages)
 		{
 
 					global $smcFunc;
@@ -1255,7 +1255,7 @@ 
 				GROUP BY ln.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) use ($smcFunc)
+				'process' => function($members) use ($smcFunc)
 				{
 					$smcFunc['db_query']('', '
 						DELETE FROM {db_prefix}log_notify
@@ -1282,7 +1282,7 @@ 
 					LEFT JOIN {db_prefix}log_search_subjects AS lss ON (lss.id_topic = t.id_topic)
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND lss.id_topic IS NULL',
-			'fix_full_processing' => function ($result)
+			'fix_full_processing' => function($result)
 		{
 
 				global $smcFunc;
@@ -1314,7 +1314,7 @@ 
 					);
 
 		},
-			'message_function' => function ($row)
+			'message_function' => function($row)
 		{
 
 				global $txt, $context;
@@ -1344,7 +1344,7 @@ 
 					AND t.id_topic IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($deleteTopics)
+				'process' => function($deleteTopics)
 		{
 
 					global $smcFunc;
@@ -1376,7 +1376,7 @@ 
 					AND mem.id_member IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members)
+				'process' => function($members)
 		{
 
 					global $smcFunc;
@@ -1407,7 +1407,7 @@ 
 					AND p.id_poll IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_poll',
-				'process' => function ($polls)
+				'process' => function($polls)
 		{
 
 					global $smcFunc;
@@ -1438,7 +1438,7 @@ 
 					AND lrc.id_report IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_report',
-				'process' => function ($reports)
+				'process' => function($reports)
 		{
 
 					global $smcFunc;
@@ -1469,7 +1469,7 @@ 
 					AND lr.id_report IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_report',
-				'process' => function ($reports)
+				'process' => function($reports)
 				{
 					global $smcFunc;
 					$smcFunc['db_query']('', '
@@ -1499,7 +1499,7 @@ 
 				GROUP BY lgr.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members)
+				'process' => function($members)
 				{
 					global $smcFunc;
 					$smcFunc['db_query']('', '
@@ -1529,7 +1529,7 @@ 
 				GROUP BY lgr.id_group',
 			'fix_collect' => array(
 				'index' => 'id_group',
-				'process' => function ($groups)
+				'process' => function($groups)
 				{
 					global $smcFunc;
 					$smcFunc['db_query']('', '

Braces +119 added lines, -85 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-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() - $time_start) < 3)
-		return;
+	if (!$force && (time() - $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);
@@ -612,8 +618,9 @@ 
 				$row['myid_last_msg'] = (int) $row['myid_last_msg'];
 
 				// Not really a problem?
-				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
-					return false;
+				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) {
+									return false;
+				}
 
 				$memberStartedID = (int) getMsgMemberID($row['myid_first_msg']);
 				$memberUpdatedID = (int) getMsgMemberID($row['myid_last_msg']);
@@ -637,15 +644,19 @@ 
 			'message_function' => function ($row) use ($txt, &$context)
 			{
 				// A pretend error?
-				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
-					return false;
+				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_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;
 			},
@@ -675,8 +686,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
@@ -695,11 +707,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;
 
@@ -1290,8 +1304,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',
@@ -1305,13 +1320,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)
@@ -1581,8 +1597,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))
@@ -1611,14 +1628,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']('',
@@ -1628,10 +1647,11 @@ 
 			);
 
 			// 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++;
 
@@ -1643,8 +1663,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']))
@@ -1654,10 +1675,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);
 						}
@@ -1668,13 +1690,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!
@@ -1684,8 +1708,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!
@@ -1694,30 +1719,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;
+						}
 					}
 				}
 			}
@@ -1735,16 +1764,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.
@@ -1757,8 +1787,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?
@@ -1781,10 +1812,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);
@@ -1799,8 +1831,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))
@@ -1832,8 +1865,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))