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, t.id_topic, t.id_board, t.id_member_started, m.member_name
 				  ',
-			'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))

Sources/Admin.php

Braces +75 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main admin handling function.<br>
@@ -444,8 +445,9 @@ 
 		foreach ($admin_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -457,24 +459,27 @@ 
 	unset($admin_areas);
 
 	// Nothing valid?
-	if ($admin_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($admin_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?action=admin',
 		'name' => $txt['admin_center'],
 	);
-	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['label'],
 		);
-	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';sa=' . $admin_include_data['current_subsection'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['subsections'][$admin_include_data['current_subsection']][0],
 		);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['admin_menu_id'] = $context['max_menu_id'];
@@ -484,16 +489,18 @@ 
 	$context['admin_area'] = $admin_include_data['current_area'];
 
 	// Now - finally - call the right place!
-	if (isset($admin_include_data['file']))
-		require_once($sourcedir . '/' . $admin_include_data['file']);
+	if (isset($admin_include_data['file'])) {
+			require_once($sourcedir . '/' . $admin_include_data['file']);
+	}
 
 	// Get the right callable.
 	$call = call_helper($admin_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call);
-}
+	if (!empty($call)) {
+			call_user_func($call);
+	}
+	}
 
 /**
  * The main administration section.
@@ -547,13 +554,14 @@ 
 
 	$context['sub_template'] = $context['admin_area'] == 'credits' ? 'credits' : 'admin';
 	$context['page_title'] = $context['admin_area'] == 'credits' ? $txt['support_credits_title'] : $txt['admin_center'];
-	if ($context['admin_area'] != 'credits')
-		$context[$context['admin_menu_name']]['tab_data'] = array(
+	if ($context['admin_area'] != 'credits') {
+			$context[$context['admin_menu_name']]['tab_data'] = array(
 			'title' => $txt['admin_center'],
 			'help' => '',
 			'description' => '<strong>' . $txt['hello_guest'] . ' ' . $context['user']['name'] . '!</strong>
 						' . sprintf($txt['admin_main_welcome'], $txt['admin_center'], $txt['help'], $txt['help']),
 		);
+	}
 
 	// Lastly, fill in the blanks in the support resources paragraphs.
 	$txt['support_resources_p1'] = sprintf($txt['support_resources_p1'],
@@ -571,9 +579,10 @@ 
 		'https://www.simplemachines.org/redirect/customize_support'
 	);
 
-	if ($context['admin_area'] == 'admin')
-		loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
-}
+	if ($context['admin_area'] == 'admin') {
+			loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
+	}
+	}
 
 /**
  * Get one of the admin information files from Simple Machines.
@@ -584,8 +593,9 @@ 
 
 	setMemoryLimit('32M');
 
-	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Strip off the forum cache part or we won't find it...
 	$_REQUEST['filename'] = str_replace($modSettings['browser_cache'], '', $_REQUEST['filename']);
@@ -600,27 +610,30 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	}
 
 	list ($file_data, $filetype) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// @todo Temp
 	// Figure out if sesc is still being used.
-	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript')
-		$file_data = '
+	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript') {
+			$file_data = '
 if (!(\'smfForum_sessionvar\' in window))
 	window.smfForum_sessionvar = \'sesc\';
 ' . strtr($file_data, array(';sesc=' => ';\' + window.smfForum_sessionvar + \'='));
+	}
 
 	$context['template_layers'] = array();
 	// Lets make sure we aren't going to output anything nasty.
 	@ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		@ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			@ob_start();
+	}
 
 	// Make sure they know what type of file we are.
 	header('Content-Type: ' . $filetype);
@@ -660,11 +673,12 @@ 
 		updateAdminPreferences();
 	}
 
-	if (trim($context['search_term']) == '')
-		$context['search_results'] = array();
-	else
-		call_helper($subActions[$context['search_type']]);
-}
+	if (trim($context['search_term']) == '') {
+			$context['search_results'] = array();
+	} else {
+			call_helper($subActions[$context['search_type']]);
+	}
+	}
 
 /**
  * A complicated but relatively quick internal search.
@@ -728,8 +742,9 @@ 
 
 	loadLanguage(implode('+', $language_files));
 
-	foreach ($include_files as $file)
-		require_once($sourcedir . '/' . $file . '.php');
+	foreach ($include_files as $file) {
+			require_once($sourcedir . '/' . $file . '.php');
+	}
 
 	/* This is the huge array that defines everything... it's a huge array of items formatted as follows:
 		0 = Language index (Can be array of indexes) to search through for this setting.
@@ -753,11 +768,12 @@ 
 		foreach ($section['areas'] as $menu_key => $menu_item)
 		{
 			$search_data['sections'][] = array($menu_item['label'], 'area=' . $menu_key);
-			if (!empty($menu_item['subsections']))
-				foreach ($menu_item['subsections'] as $key => $sublabel)
+			if (!empty($menu_item['subsections'])) {
+							foreach ($menu_item['subsections'] as $key => $sublabel)
 				{
 					if (isset($sublabel['label']))
 						$search_data['sections'][] = array($sublabel['label'], 'area=' . $menu_key . ';sa=' . $key);
+			}
 				}
 		}
 	}
@@ -767,9 +783,10 @@ 
 		// Get a list of their variables.
 		$config_vars = $setting_area[0](true);
 
-		foreach ($config_vars as $var)
-			if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
+		foreach ($config_vars as $var) {
+					if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
 				$search_data['settings'][] = array($var[(isset($var[2]) && in_array($var[2], array('file', 'db'))) ? 0 : 1], $setting_area[1], 'alttxt' => (isset($var[2]) && in_array($var[2], array('file', 'db'))) || isset($var[3]) ? (in_array($var[2], array('file', 'db')) ? $var[1] : $var[3]) : '');
+		}
 	}
 
 	$context['page_title'] = $txt['admin_search_results'];
@@ -782,8 +799,9 @@ 
 		foreach ($data as $item)
 		{
 			$found = false;
-			if (!is_array($item[0]))
-				$item[0] = array($item[0]);
+			if (!is_array($item[0])) {
+							$item[0] = array($item[0]);
+			}
 			foreach ($item[0] as $term)
 			{
 				if (stripos($term, $search_term) !== false || (isset($txt[$term]) && stripos($txt[$term], $search_term) !== false) || (isset($txt['setting_' . $term]) && stripos($txt['setting_' . $term], $search_term) !== false))
@@ -841,8 +859,9 @@ 
 	$postVars = explode(' ', $context['search_term']);
 
 	// Encode the search data.
-	foreach ($postVars as $k => $v)
-		$postVars[$k] = urlencode($v);
+	foreach ($postVars as $k => $v) {
+			$postVars[$k] = urlencode($v);
+	}
 
 	// This is what we will send.
 	$postVars = implode('+', $postVars);
@@ -854,8 +873,9 @@ 
 	$search_results = fetch_web_data($context['doc_apiurl'] . '?action=query&list=search&srprop=timestamp|snippet&format=xml&srwhat=text&srsearch=' . $postVars);
 
 	// If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded?
-	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true)
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	$search_results = $matches[1];
 
@@ -867,8 +887,9 @@ 
 	$results = new xmlArray($search_results, false);
 
 	// Move through the api layer.
-	if (!$results->exists('api'))
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$results->exists('api')) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	// Are there actually some results?
 	if ($results->exists('api/query/search/p'))
@@ -904,8 +925,9 @@ 
 	);
 
 	// If it's not got a sa set it must have come here for first time, pretend error log should be reversed.
-	if (!isset($_REQUEST['sa']))
-		$_REQUEST['desc'] = true;
+	if (!isset($_REQUEST['sa'])) {
+			$_REQUEST['desc'] = true;
+	}
 
 	// Setup some tab stuff.
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -955,9 +977,10 @@ 
 	unset($_SESSION['admin_time']);
 
 	// Clean any admin tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-admin') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-admin') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Themes/default/Printpage.template.php

Braces +11 added lines, -8 removed lines

@@ -144,11 +144,12 @@ 
 				<div class="question">', $txt['poll_question'], ': <strong>', $context['poll']['question'], '</strong>';
 
 		$options = 1;
-		foreach ($context['poll']['options'] as $option)
-			echo '
+		foreach ($context['poll']['options'] as $option) {
+					echo '
 					<div class="', $option['voted_this'] ? 'voted' : '', '">', $txt['option'], ' ', $options++, ': <strong>', $option['option'], '</strong>
 						', $context['allow_poll_view'] ? $txt['votes'] . ': ' . $option['votes'] . '' : '', '
 					</div>';
+		}
 
 		echo '
 			</div>';
@@ -170,9 +171,10 @@ 
 			echo '
 				<hr>';
 
-			foreach ($context['printattach'][$post['id_msg']] as $attach)
-				echo '
+			foreach ($context['printattach'][$post['id_msg']] as $attach) {
+							echo '
 					<img width="' . $attach['width'] . '" height="' . $attach['height'] . '" src="', $scripturl . '?action=dlattach;topic=' . $topic . '.0;attach=' . $attach['id_attach'] . '" alt="">';
+			}
 		}
 
 		echo '
@@ -207,12 +209,13 @@ 
 		<div class="print_options">';
 
 	// Which option is set, text or text&images
-	if (isset($_REQUEST['images']))
-		echo '
+	if (isset($_REQUEST['images'])) {
+			echo '
 			<a href="', $url_text, '">', $txt['print_page_text'], '</a> | <strong><a href="', $url_images, '">', $txt['print_page_images'], '</a></strong>';
-	else
-		echo '
+	} else {
+			echo '
 			<strong><a href="', $url_text, '">', $txt['print_page_text'], '</a></strong> | <a href="', $url_images, '">', $txt['print_page_images'], '</a>';
+	}
 
 	echo '
 		</div><!-- .print_options -->';

Themes/default/Poll.template.php

Braces +12 added lines, -8 removed lines

@@ -46,8 +46,8 @@ 
 				<h3 class="catbg">', $context['page_title'], '</h3>
 			</div>';
 
-	if (!empty($context['poll_error']['messages']))
-		echo '
+	if (!empty($context['poll_error']['messages'])) {
+			echo '
 			<div class="errorbox">
 				<dl class="poll_error">
 					<dt>
@@ -58,6 +58,7 @@ 
 					</dt>
 				</dl>
 			</div>';
+	}
 
 	echo '
 			<div>
@@ -79,8 +80,9 @@ 
 								<input type="text" name="options[', $choice['id'], ']" id="options-', $choice['id'], '" value="', $choice['label'], '" size="80" maxlength="255">';
 
 		// Does this option have a vote count yet, or is it new?
-		if ($choice['votes'] != -1)
-			echo ' (', $choice['votes'], ' ', $txt['votes'], ')';
+		if ($choice['votes'] != -1) {
+					echo ' (', $choice['votes'], ' ', $txt['votes'], ')';
+		}
 
 		echo '
 							</dd>';
@@ -118,14 +120,15 @@ 
 								<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', '>
 							</dd>';
 
-		if ($context['poll']['guest_vote_allowed'])
-			echo '
+		if ($context['poll']['guest_vote_allowed']) {
+					echo '
 							<dt>
 								<label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label>
 							</dt>
 							<dd>
 								<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll']['guest_vote']) ? ' checked' : '', '>
 							</dd>';
+		}
 	}
 
 	echo '
@@ -141,12 +144,13 @@ 
 					</fieldset>';
 
 	// If this is an edit, we can allow them to reset the vote counts.
-	if ($context['is_edit'])
-		echo '
+	if ($context['is_edit']) {
+			echo '
 					<fieldset id="poll_reset">
 						<legend>', $txt['reset_votes'], '</legend>
 						<input type="checkbox" name="resetVoteCount" value="on"> ' . $txt['reset_votes_check'] . '
 					</fieldset>';
+	}
 	echo '
 					<input type="submit" name="post" value="', $txt['save'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
 				</div><!-- .roundframe -->

Themes/default/Stats.template.php

Braces +26 added lines, -18 removed lines

@@ -44,10 +44,11 @@ 
 				<dt>', $txt['users_online_today'], ':</dt>
 				<dd>', $context['online_today'], '</dd>';
 
-	if (!empty($modSettings['hitStats']))
-		echo '
+	if (!empty($modSettings['hitStats'])) {
+			echo '
 				<dt>', $txt['num_hits'], ':</dt>
 				<dd>', $context['num_hits'], '</dd>';
+	}
 
 	echo '
 			</dl>
@@ -71,17 +72,19 @@ 
 				<dt>', $txt['gender_stats'], ':</dt>
 				<dd>';
 
-		foreach ($context['gender'] as $g => $n)
-			echo $g, ': ', $n, '<br>';
+		foreach ($context['gender'] as $g => $n) {
+					echo $g, ': ', $n, '<br>';
+		}
 
 		echo '
 				</dd>';
 	}
 
-	if (!empty($modSettings['hitStats']))
-		echo '
+	if (!empty($modSettings['hitStats'])) {
+			echo '
 				<dt>', $txt['average_hits'], ':</dt>
 				<dd>', $context['average_hits'], '</dd>';
+	}
 
 	echo '
 			</dl>';
@@ -105,14 +108,15 @@ 
 					</dt>
 					<dd class="statsbar">';
 
-			if (!empty($item['percent']))
-				echo '
+			if (!empty($item['percent'])) {
+							echo '
 						<div class="bar" style="width: ', $item['percent'], '%;">
 							<span class="righttext">', $item['num'], '</span>
 						</div>';
-			else
-				echo '
+			} else {
+							echo '
 						<div class="bar empty"><span class="righttext">', $item['num'], '</span></div>';
+			}
 
 			echo '
 					</dd>';
@@ -144,9 +148,10 @@ 
 					<th>', $txt['stats_new_members'], '</th>
 					<th>', $txt['most_online'], '</th>';
 
-		if (!empty($modSettings['hitStats']))
-			echo '
+		if (!empty($modSettings['hitStats'])) {
+					echo '
 					<th>', $txt['page_views'], '</th>';
+		}
 
 		echo '
 				</tr>
@@ -165,9 +170,10 @@ 
 					<th>', $year['new_members'], '</th>
 					<th>', $year['most_members_online'], '</th>';
 
-			if (!empty($modSettings['hitStats']))
-				echo '
+			if (!empty($modSettings['hitStats'])) {
+							echo '
 					<th>', $year['hits'], '</th>';
+			}
 
 			echo '
 				</tr>';
@@ -184,9 +190,10 @@ 
 					<th>', $month['new_members'], '</th>
 					<th>', $month['most_members_online'], '</th>';
 
-				if (!empty($modSettings['hitStats']))
-					echo '
+				if (!empty($modSettings['hitStats'])) {
+									echo '
 					<th>', $month['hits'], '</th>';
+				}
 
 				echo '
 				</tr>';
@@ -203,9 +210,10 @@ 
 					<td>', $day['new_members'], '</td>
 					<td>', $day['most_members_online'], '</td>';
 
-						if (!empty($modSettings['hitStats']))
-							echo '
+						if (!empty($modSettings['hitStats'])) {
+													echo '
 					<td>', $day['hits'], '</td>';
+						}
 
 						echo '
 				</tr>';

Themes/default/Admin.template.php

Spacing +1 added lines, -1 removed lines

@@ -945,7 +945,7 @@
 				}
 
 				echo isset($config_var['postinput']) ? '
-											' . $config_var['postinput'] : '','
+											' . $config_var['postinput'] : '', '
 									</dd>';
 			}
 		}

Braces +179 added lines, -128 removed lines

@@ -65,9 +65,10 @@ 
 										', implode(', ', $context['administrators']);
 
 	// If we have lots of admins... don't show them all.
-	if (!empty($context['more_admins_link']))
-		echo '
+	if (!empty($context['more_admins_link'])) {
+			echo '
 										(', $context['more_admins_link'], ')';
+	}
 
 	echo '
 									</div><!-- #version_details -->
@@ -84,17 +85,19 @@ 
 		foreach ($area['areas'] as $item_id => $item)
 		{
 			// No point showing the 'home' page here, we're already on it!
-			if ($area_id == 'forum' && $item_id == 'index')
-				continue;
+			if ($area_id == 'forum' && $item_id == 'index') {
+							continue;
+			}
 
 			$url = isset($item['url']) ? $item['url'] : $scripturl . '?action=admin;area=' . $item_id . (!empty($context[$context['admin_menu_name']]['extra_parameters']) ? $context[$context['admin_menu_name']]['extra_parameters'] : '');
 
-			if (!empty($item['icon_file']))
-				echo '
+			if (!empty($item['icon_file'])) {
+							echo '
 							<a href="', $url, '" class="admin_group', !empty($item['inactive']) ? ' inactive' : '', '"><img class="large_admin_menu_icon_file" src="', $item['icon_file'], '" alt="">', $item['label'], '</a>';
-			else
-				echo '
+			} else {
+							echo '
 							<a href="', $url, '"><span class="large_', $item['icon_class'], !empty($item['inactive']) ? ' inactive' : '', '"></span>', $item['label'], '</a>';
+			}
 		}
 
 		echo '
@@ -105,10 +108,11 @@ 
 					</div><!-- #admincenter -->';
 
 	// The below functions include all the scripts needed from the simplemachines.org site. The language and format are passed for internationalization.
-	if (empty($modSettings['disable_smf_js']))
-		echo '
+	if (empty($modSettings['disable_smf_js'])) {
+			echo '
 					<script src="', $scripturl, '?action=viewsmfile;filename=current-version.js"></script>
 					<script src="', $scripturl, '?action=viewsmfile;filename=latest-news.js"></script>';
+	}
 
 	// This sets the announcements and current versions themselves ;).
 	echo '
@@ -187,9 +191,10 @@ 
 								<em>', $version['version'], '</em>';
 
 		// more details for this item, show them a link
-		if ($context['can_admin'] && isset($version['more']))
-			echo
+		if ($context['can_admin'] && isset($version['more'])) {
+					echo
 								' <a href="', $scripturl, $version['more'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['version_check_more'], '</a>';
+		}
 		echo '
 								<br>';
 	}
@@ -220,21 +225,23 @@ 
 
 	foreach ($context['credits'] as $section)
 	{
-		if (isset($section['pretext']))
-			echo '
+		if (isset($section['pretext'])) {
+					echo '
 								<p>', $section['pretext'], '</p>
 								<hr>';
+		}
 
 		echo '
 								<dl>';
 
 		foreach ($section['groups'] as $group)
 		{
-			if (isset($group['title']))
-				echo '
+			if (isset($group['title'])) {
+							echo '
 									<dt>
 										<strong>', $group['title'], ':</strong>
 									</dt>';
+			}
 
 			echo '
 									<dd>', implode(', ', $group['members']), '</dd>';
@@ -243,10 +250,11 @@ 
 		echo '
 								</dl>';
 
-		if (isset($section['posttext']))
-			echo '
+		if (isset($section['posttext'])) {
+					echo '
 								<hr>
 								<p>', $section['posttext'], '</p>';
+		}
 	}
 
 	echo '
@@ -262,9 +270,10 @@ 
 						smfSupportVersions.forum = "', $context['forum_version'], '";';
 
 	// Don't worry, none of this is logged, it's just used to give information that might be of use.
-	foreach ($context['current_versions'] as $variable => $version)
-		echo '
+	foreach ($context['current_versions'] as $variable => $version) {
+			echo '
 						smfSupportVersions.', $variable, ' = "', $version['version'], '";';
+	}
 
 	// Now we just have to include the script and wait ;).
 	echo '
@@ -361,8 +370,8 @@ 
 								<tbody>';
 
 	// Loop through every source file displaying its version - using javascript.
-	foreach ($context['file_versions'] as $filename => $version)
-		echo '
+	foreach ($context['file_versions'] as $filename => $version) {
+			echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -374,6 +383,7 @@ 
 											<em id="currentSources', $filename, '">??</em>
 										</td>
 									</tr>';
+	}
 
 	// Default template files.
 	echo '
@@ -399,8 +409,8 @@ 
 							<table id="Default" class="table_grid">
 								<tbody>';
 
-	foreach ($context['default_template_versions'] as $filename => $version)
-		echo '
+	foreach ($context['default_template_versions'] as $filename => $version) {
+			echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -412,6 +422,7 @@ 
 											<em id="currentDefault', $filename, '">??</em>
 										</td>
 									</tr>';
+	}
 
 	// Now the language files...
 	echo '
@@ -439,8 +450,8 @@ 
 
 	foreach ($context['default_language_versions'] as $language => $files)
 	{
-		foreach ($files as $filename => $version)
-			echo '
+		foreach ($files as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '.<em>', $language, '</em>.php
@@ -452,6 +463,7 @@ 
 											<em id="current', $filename, '.', $language, '">??</em>
 										</td>
 									</tr>';
+		}
 	}
 
 	echo '
@@ -481,8 +493,8 @@ 
 							<table id="Templates" class="table_grid">
 								<tbody>';
 
-		foreach ($context['template_versions'] as $filename => $version)
-			echo '
+		foreach ($context['template_versions'] as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -494,6 +506,7 @@ 
 											<em id="currentTemplates', $filename, '">??</em>
 										</td>
 									</tr>';
+		}
 
 		echo '
 								</tbody>
@@ -523,8 +536,8 @@ 
 							<table id="Tasks" class="table_grid">
 								<tbody>';
 
-		foreach ($context['tasks_versions'] as $filename => $version)
-			echo '
+		foreach ($context['tasks_versions'] as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -536,6 +549,7 @@ 
 											<em id="currentTasks', $filename, '">??</em>
 										</td>
 									</tr>';
+		}
 
 		echo '
 								</tbody>
@@ -577,9 +591,10 @@ 
 {
 	global $context, $scripturl, $txt, $modSettings;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	// First section is for adding/removing words from the censored list.
 	echo '
@@ -594,11 +609,12 @@ 
 								<p>', $txt['admin_censored_where'], '</p>';
 
 	// Show text boxes for censoring [bad   ] => [good  ].
-	foreach ($context['censored_words'] as $vulgar => $proper)
-		echo '
+	foreach ($context['censored_words'] as $vulgar => $proper) {
+			echo '
 								<div class="block">
 									<input type="text" name="censor_vulgar[]" value="', $vulgar, '" size="30"> =&gt; <input type="text" name="censor_proper[]" value="', $proper, '" size="30">
 								</div>';
+	}
 
 	// Now provide a way to censor more words.
 	echo '
@@ -673,19 +689,21 @@ 
 						<div class="windowbg2 noup">
 							', $txt['not_done_reason'];
 
-	if (!empty($context['continue_percent']))
-		echo '
+	if (!empty($context['continue_percent'])) {
+			echo '
 							<div class="progress_bar">
 								<div class="full_bar">', $context['continue_percent'], '%</div>
 								<div class="green_percent" style="width: ', $context['continue_percent'], '%;"></div>
 							</div>';
+	}
 
-	if (!empty($context['substep_enabled']))
-		echo '
+	if (!empty($context['substep_enabled'])) {
+			echo '
 							<div class="progress_bar">
 								<div class="full_bar">', $context['substep_title'], ' (', $context['substep_continue_percent'], '%)</div>
 								<div class="blue_percent" style="width: ', $context['substep_continue_percent'], '%;"></div>
 							</div>';
+	}
 
 	echo '
 							<form action="', $scripturl, $context['continue_get_data'], '" method="post" accept-charset="', $context['character_set'], '" name="autoSubmit" id="autoSubmit">
@@ -720,35 +738,40 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 					<div class="errorbox">', sprintf($txt['settings_not_saved'], $context['saved_failed']), '</div>';
+	}
 
-	if (!empty($context['settings_pre_javascript']))
-		echo '
+	if (!empty($context['settings_pre_javascript'])) {
+			echo '
 					<script>', $context['settings_pre_javascript'], '</script>';
+	}
 
-	if (!empty($context['settings_insert_above']))
-		echo $context['settings_insert_above'];
+	if (!empty($context['settings_insert_above'])) {
+			echo $context['settings_insert_above'];
+	}
 
 	echo '
 					<div id="admincenter">
 						<form id="admin_form_wrapper" action="', $context['post_url'], '" method="post" accept-charset="', $context['character_set'], '"', !empty($context['force_form_onsubmit']) ? ' onsubmit="' . $context['force_form_onsubmit'] . '"' : '', '>';
 
 	// Is there a custom title?
-	if (isset($context['settings_title']))
-		echo '
+	if (isset($context['settings_title'])) {
+			echo '
 							<div class="cat_bar">
 								<h3 class="catbg">', $context['settings_title'], '</h3>
 							</div>';
+	}
 
 	// Have we got a message to display?
-	if (!empty($context['settings_message']))
-		echo '
+	if (!empty($context['settings_message'])) {
+			echo '
 							<div class="information">', $context['settings_message'], '</div>';
+	}
 
 	// Now actually loop through all the variables.
 	$is_open = false;
@@ -801,8 +824,9 @@ 
 		// Hang about? Are you pulling my leg - a callback?!
 		if (is_array($config_var) && $config_var['type'] == 'callback')
 		{
-			if (function_exists('template_callback_' . $config_var['name']))
-				call_user_func('template_callback_' . $config_var['name']);
+			if (function_exists('template_callback_' . $config_var['name'])) {
+							call_user_func('template_callback_' . $config_var['name']);
+			}
 
 			continue;
 		}
@@ -832,9 +856,10 @@ 
 				$text_types = array('color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time');
 
 				// Show the [?] button.
-				if ($config_var['help'])
-					echo '
+				if ($config_var['help']) {
+									echo '
 										<a id="setting_', $config_var['name'], '_help" href="', $scripturl, '?action=helpadmin;help=', $config_var['help'], '" onclick="return reqOverlayDiv(this.href);"><span class="generic_icons help" title="', $txt['help'], '"></span></a> ';
+				}
 
 				echo '
 										<a id="setting_', $config_var['name'], '"></a> <span', ($config_var['disabled'] ? ' style="color: #777777;"' : ($config_var['invalid'] ? ' class="error"' : '')), '><label for="', $config_var['name'], '">', $config_var['label'], '</label>', $subtext, ($config_var['type'] == 'password' ? '<br><em>' . $txt['admin_confirm_password'] . '</em>' : ''), '</span>
@@ -843,23 +868,26 @@ 
 										$config_var['preinput'];
 
 				// Show a check box.
-				if ($config_var['type'] == 'check')
-					echo '
+				if ($config_var['type'] == 'check') {
+									echo '
 										<input type="checkbox"', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '"', ($config_var['value'] ? ' checked' : ''), ' value="1">';
+				}
 				// Escape (via htmlspecialchars.) the text box.
-				elseif ($config_var['type'] == 'password')
-					echo '
+				elseif ($config_var['type'] == 'password') {
+									echo '
 										<input type="password"', $disabled, $javascript, ' name="', $config_var['name'], '[0]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), ' value="*#fakepass#*" onfocus="this.value = \'\'; this.form.', $config_var['name'], '.disabled = false;"><br>
 										<input type="password" disabled id="', $config_var['name'], '" name="', $config_var['name'], '[1]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), '>';
+				}
 				// Show a selection box.
 				elseif ($config_var['type'] == 'select')
 				{
 					echo '
 										<select name="', $config_var['name'], '" id="', $config_var['name'], '" ', $javascript, $disabled, (!empty($config_var['multiple']) ? ' multiple="multiple"' : ''), (!empty($config_var['multiple']) && !empty($config_var['size']) ? ' size="' . $config_var['size'] . '"' : ''), '>';
 
-					foreach ($config_var['data'] as $option)
-						echo '
+					foreach ($config_var['data'] as $option) {
+											echo '
 											<option value="', $option[0], '"', (!empty($config_var['value']) && ($option[0] == $config_var['value'] || (!empty($config_var['multiple']) && in_array($option[0], $config_var['value']))) ? ' selected' : ''), '>', $option[1], '</option>';
+					}
 					echo '
 										</select>';
 				}
@@ -876,16 +904,18 @@ 
 
 					foreach ($context['board_list'] as $id_cat => $cat)
 					{
-						if (!$first)
-							echo '
+						if (!$first) {
+													echo '
 											<hr>';
+						}
 						echo '
 											<strong>', $cat['name'], '</strong>
 											<ul>';
 
-						foreach ($cat['boards'] as $id_board => $brd)
-							echo '
+						foreach ($cat['boards'] as $id_board => $brd) {
+													echo '
 												<li><label><input type="checkbox" name="', $config_var['name'], '[', $brd['id'], ']" value="1"', in_array($brd['id'], $config_var['value']) ? ' checked' : '', '> ', $brd['child_level'] > 0 ? str_repeat('&nbsp; &nbsp;', $brd['child_level']) : '', $brd['name'], '</label></li>';
+						}
 
 						echo '
 											</ul>';
@@ -895,12 +925,14 @@ 
 										</fieldset>';
 				}
 				// Text area?
-				elseif ($config_var['type'] == 'large_text')
-					echo '
+				elseif ($config_var['type'] == 'large_text') {
+									echo '
 										<textarea rows="', (!empty($config_var['size']) ? $config_var['size'] : (!empty($config_var['rows']) ? $config_var['rows'] : 4)), '" cols="', (!empty($config_var['cols']) ? $config_var['cols'] : 30), '" ', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '">', $config_var['value'], '</textarea>';
+				}
 				// Permission group?
-				elseif ($config_var['type'] == 'permissions')
-					theme_inline_permissions($config_var['name']);
+				elseif ($config_var['type'] == 'permissions') {
+									theme_inline_permissions($config_var['name']);
+				}
 
 				// BBC selection?
 				elseif ($config_var['type'] == 'bbc')
@@ -912,22 +944,24 @@ 
 
 					foreach ($context['bbc_columns'] as $bbcColumn)
 					{
-						foreach ($bbcColumn as $bbcTag)
-							echo '
+						foreach ($bbcColumn as $bbcTag) {
+													echo '
 												<li class="list_bbc floatleft">
 													<input type="checkbox" name="', $config_var['name'], '_enabledTags[]" id="tag_', $config_var['name'], '_', $bbcTag['tag'], '" value="', $bbcTag['tag'], '"', !in_array($bbcTag['tag'], $context['bbc_sections'][$config_var['name']]['disabled']) ? ' checked' : '', '> <label for="tag_', $config_var['name'], '_', $bbcTag['tag'], '">', $bbcTag['tag'], '</label>', $bbcTag['show_help'] ? ' (<a href="' . $scripturl . '?action=helpadmin;help=tag_' . $bbcTag['tag'] . '" onclick="return reqOverlayDiv(this.href);">?</a>)' : '', '
 												</li>';
+						}
 					}
 					echo '					</ul>
 											<input type="checkbox" id="bbc_', $config_var['name'], '_select_all" onclick="invertAll(this, this.form, \'', $config_var['name'], '_enabledTags\');"', $context['bbc_sections'][$config_var['name']]['all_selected'] ? ' checked' : '', '> <label for="bbc_', $config_var['name'], '_select_all"><em>', $txt['bbcTagsToUse_select_all'], '</em></label>
 										</fieldset>';
 				}
 				// A simple message?
-				elseif ($config_var['type'] == 'var_message')
-					echo '
+				elseif ($config_var['type'] == 'var_message') {
+									echo '
 										<div', !empty($config_var['name']) ? ' id="' . $config_var['name'] . '"' : '', '>
 											', $config_var['var_message'], '
 										</div>';
+				}
 				// Assume it must be a text box
 				else
 				{
@@ -952,62 +986,70 @@ 
 											' . $config_var['postinput'] : '','
 									</dd>';
 			}
-		}
-		else
+		} else
 		{
 			// Just show a separator.
-			if ($config_var == '')
-				echo '
+			if ($config_var == '') {
+							echo '
 								</dl>
 								<hr>
 								<dl class="settings">';
-			else
-				echo '
+			} else {
+							echo '
 									<dd>
 										<strong>' . $config_var . '</strong>
 									</dd>';
+			}
 		}
 	}
 
-	if ($is_open)
-		echo '
+	if ($is_open) {
+			echo '
 								</dl>';
+	}
 
-	if (empty($context['settings_save_dont_show']))
-		echo '
+	if (empty($context['settings_save_dont_show'])) {
+			echo '
 								<input type="submit" value="', $txt['save'], '"', (!empty($context['save_disabled']) ? ' disabled' : ''), (!empty($context['settings_save_onclick']) ? ' onclick="' . $context['settings_save_onclick'] . '"' : ''), ' class="button">';
+	}
 
-	if ($is_open)
-		echo '
+	if ($is_open) {
+			echo '
 							</div><!-- .windowbg2 -->';
+	}
 
 
 	// At least one token has to be used!
-	if (isset($context['admin-ssc_token']))
-		echo '
+	if (isset($context['admin-ssc_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-ssc_token_var'], '" value="', $context['admin-ssc_token'], '">';
+	}
 
-	if (isset($context['admin-dbsc_token']))
-		echo '
+	if (isset($context['admin-dbsc_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-dbsc_token_var'], '" value="', $context['admin-dbsc_token'], '">';
+	}
 
-	if (isset($context['admin-mp_token']))
-		echo '
+	if (isset($context['admin-mp_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-mp_token_var'], '" value="', $context['admin-mp_token'], '">';
+	}
 
 	echo '
 							<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 						</form>
 					</div><!-- #admincenter -->';
 
-	if (!empty($context['settings_post_javascript']))
-		echo '
+	if (!empty($context['settings_post_javascript'])) {
+			echo '
 					<script>
 						', $context['settings_post_javascript'], '
 					</script>';
+	}
 
-	if (!empty($context['settings_insert_below']))
-		echo $context['settings_insert_below'];
+	if (!empty($context['settings_insert_below'])) {
+			echo $context['settings_insert_below'];
+	}
 
 	// We may have added a board listing. If we did, we need to make it work.
 	addInlineJavascript('
@@ -1030,9 +1072,10 @@ 
 {
 	global $context, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	// Standard fields.
 	template_show_list('standard_profile_fields');
@@ -1066,11 +1109,12 @@ 
 	{
 		loadLanguage('Errors');
 
-		if (isset($txt['custom_option_' . $_GET['msg']]))
-			echo '
+		if (isset($txt['custom_option_' . $_GET['msg']])) {
+					echo '
 					<div class="errorbox">',
 						$txt['custom_option_' . $_GET['msg']], '
 					</div>';
+		}
 	}
 
 	echo '
@@ -1137,9 +1181,10 @@ 
 										<dd>
 											<select name="placement" id="placement">';
 
-	foreach ($context['cust_profile_fields_placement'] as $order => $name)
-		echo '
+	foreach ($context['cust_profile_fields_placement'] as $order => $name) {
+			echo '
 												<option value="', $order, '"', $context['field']['placement'] == $order ? ' selected' : '', '>', $txt['custom_profile_placement_' . $name], '</option>';
+	}
 
 	echo '
 											</select>
@@ -1163,9 +1208,10 @@ 
 										<dd>
 											<select name="field_type" id="field_type" onchange="updateInputBoxes();">';
 
-	foreach (array('text', 'textarea', 'select', 'radio', 'check') as $field_type)
-		echo '
+	foreach (array('text', 'textarea', 'select', 'radio', 'check') as $field_type) {
+			echo '
 												<option value="', $field_type, '"', $context['field']['type'] == $field_type ? ' selected' : '', '>', $txt['custom_profile_type_' . $field_type], '</option>';
+	}
 
 	echo '
 											</select>
@@ -1197,9 +1243,10 @@ 
 										</dt>
 										<dd id="options_dd">';
 
-	foreach ($context['field']['options'] as $k => $option)
-		echo '
+	foreach ($context['field']['options'] as $k => $option) {
+			echo '
 											', $k == 0 ? '' : '<br>', '<input type="radio" name="default_select" value="', $k, '"', $context['field']['default_select'] == $option ? ' checked' : '', '><input type="text" name="select_option[', $k, ']" value="', $option, '">';
+	}
 
 	echo '
 											<span id="addopt"></span>
@@ -1263,9 +1310,10 @@ 
 								</fieldset>
 								<input type="submit" name="save" value="', $txt['save'], '" class="button">';
 
-	if ($context['fid'])
-		echo '
+	if ($context['fid']) {
+			echo '
 								<input type="submit" name="delete" value="', $txt['delete'], '" data-confirm="', $txt['custom_edit_delete_sure'], '" class="button you_sure">';
+	}
 
 	echo '
 							</div><!-- .windowbg2 -->
@@ -1312,8 +1360,7 @@ 
 							<p class="centertext">
 								<strong>', $txt['admin_search_results_none'], '</strong>
 							</p>';
-	}
-	else
+	} else
 	{
 		echo '
 							<ol class="search_results">';
@@ -1340,9 +1387,10 @@ 
 								<li>
 									<a href="', $result['url'], '"><strong>', $result['name'], '</strong></a> [', isset($txt['admin_search_section_' . $result['type']]) ? $txt['admin_search_section_' . $result['type']] : $result['type'], ']';
 
-				if ($result['help'])
-					echo '
+				if ($result['help']) {
+									echo '
 									<p class="double_height">', $result['help'], '</p>';
+				}
 
 				echo '
 								</li>';
@@ -1382,10 +1430,11 @@ 
 									<strong>', $txt['setup_verification_answer'], '</strong>
 								</dd>';
 
-		if (!empty($context['qa_by_lang'][$lang_id]))
-			foreach ($context['qa_by_lang'][$lang_id] as $q_id)
+		if (!empty($context['qa_by_lang'][$lang_id])) {
+					foreach ($context['qa_by_lang'][$lang_id] as $q_id)
 			{
 				$question = $context['question_answers'][$q_id];
+		}
 
 				echo '
 								<dt>
@@ -1393,9 +1442,10 @@ 
 								</dt>
 								<dd>';
 
-				foreach ($question['answers'] as $answer)
-					echo '
+				foreach ($question['answers'] as $answer) {
+									echo '
 									<input type="text" name="answer[', $lang_id, '][', $q_id, '][]" value="', $answer, '" size="50" class="verification_answer">';
+				}
 
 				echo '
 									<div class="qa_add_answer"><a href="javascript:void(0);" onclick="return addAnswer(this);">[ ', $txt['setup_verification_add_answer'], ' ]</a></div>
@@ -1434,11 +1484,12 @@ 
 							', $txt['errors_found'], ':
 							<ul>';
 
-			foreach ($context['repair_errors'] as $error)
-				echo '
+			foreach ($context['repair_errors'] as $error) {
+							echo '
 								<li>
 									', $error, '
 								</li>';
+			}
 
 			echo '
 							</ul>
@@ -1448,16 +1499,15 @@ 
 							<p class="padding">
 								<strong><a href="', $scripturl, '?action=admin;area=repairboards;fixErrors;', $context['session_var'], '=', $context['session_id'], '">', $txt['yes'], '</a> - <a href="', $scripturl, '?action=admin;area=maintain">', $txt['no'], '</a></strong>
 							</p>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 							<p>', $txt['maintain_no_errors'], '</p>
 							<p class="padding">
 								<a href="', $scripturl, '?action=admin;area=maintain;sa=routine">', $txt['maintain_return'], '</a>
 							</p>';
+		}
 
-	}
-	else
+	} else
 	{
 		if (!empty($context['redirect_to_recount']))
 		{
@@ -1469,8 +1519,7 @@ 
 								<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 								<input type="submit" name="recount" id="recount_now" value="', $txt['errors_recount_now'], '">
 							</form>';
-		}
-		else
+		} else
 		{
 			echo '
 							<p>', $txt['errors_fixed'], '</p>
@@ -1561,9 +1610,10 @@ 
 								<tr class="windowbg">
 									<td class="equal_table">', $key, '</td>';
 
-				foreach ($setting as $key_lm => $value)
-					echo '
+				foreach ($setting as $key_lm => $value) {
+									echo '
 									<td class="equal_table">', $value, '</td>';
+				}
 
 				echo '
 								</tr>';
@@ -1623,8 +1673,8 @@ 
 {
 	global $context, $txt;
 
-	if ($context['user']['is_admin'])
-		echo '
+	if ($context['user']['is_admin']) {
+			echo '
 								<span class="floatright admin_search">
 									<span class="generic_icons filter centericon"></span>
 									<input type="search" name="search_term" value="', $txt['admin_search'], '" onclick="if (this.value == \'', $txt['admin_search'], '\') this.value = \'\';">
@@ -1635,6 +1685,7 @@ 
 									</select>
 									<input type="submit" name="search_go" id="search_go" value="', $txt['admin_search_go'], '" class="button">
 								</span>';
-}
+	}
+	}
 
 ?>
\ No newline at end of file

Themes/default/ManageNews.template.php

Braces +21 added lines, -14 removed lines

@@ -18,9 +18,10 @@ 
 	global $context, $txt, $scripturl;
 
 	// Are we done sending the newsletter?
-	if (!empty($context['newsletter_sent']))
-		echo '
+	if (!empty($context['newsletter_sent'])) {
+			echo '
 	<div class="infobox">', $txt['admin_news_newsletter_' . $context['newsletter_sent']], '</div>';
+	}
 
 	echo '
 	<div id="admincenter">
@@ -39,9 +40,10 @@ 
 					</dt>
 					<dd>';
 
-	foreach ($context['groups'] as $group)
-		echo '
+	foreach ($context['groups'] as $group) {
+			echo '
 						<label for="groups_', $group['id'], '"><input type="checkbox" name="groups[', $group['id'], ']" id="groups_', $group['id'], '" value="', $group['id'], '" checked> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em><br>';
+	}
 
 	echo '
 						<br>
@@ -82,9 +84,10 @@ 
 						</dt>
 						<dd>';
 
-	foreach ($context['groups'] as $group)
-		echo '
+	foreach ($context['groups'] as $group) {
+			echo '
 							<label for="exclude_groups_', $group['id'], '"><input type="checkbox" name="exclude_groups[', $group['id'], ']" id="exclude_groups_', $group['id'], '" value="', $group['id'], '"> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em><br>';
+	}
 
 	echo '
 							<br>
@@ -230,9 +233,10 @@ 
 				<div id="bbcBox_message"></div>';
 
 	// What about smileys?
-	if (!empty($context['smileys']['postform']) || !empty($context['smileys']['popup']))
-		echo '
+	if (!empty($context['smileys']['postform']) || !empty($context['smileys']['popup'])) {
+			echo '
 				<div id="smileyBox_message"></div>';
+	}
 
 	// Show BBC buttons, smileys and textbox.
 	echo '
@@ -253,9 +257,10 @@ 
 			<input type="hidden" name="email_force" value="', $context['email_force'], '">
 			<input type="hidden" name="total_emails" value="', $context['total_emails'], '">';
 
-	foreach ($context['recipients'] as $key => $values)
-		echo '
+	foreach ($context['recipients'] as $key => $values) {
+			echo '
 			<input type="hidden" name="', $key, '" value="', implode(($key == 'emails' ? ';' : ','), $values), '">';
+	}
 
 	echo '
 			<script>';
@@ -413,9 +418,10 @@ 
 				<input type="hidden" name="parse_html" value="', $context['parse_html'], '">';
 
 	// All the things we must remember!
-	foreach ($context['recipients'] as $key => $values)
-		echo '
+	foreach ($context['recipients'] as $key => $values) {
+			echo '
 				<input type="hidden" name="', $key, '" value="', implode(($key == 'emails' ? ';' : ','), $values), '">';
+	}
 
 	echo '
 			</div><!-- .windowbg -->
@@ -448,9 +454,10 @@ 
 {
 	global $context, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 			<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	template_show_list('news_lists');
 }

Themes/default/ManageMembers.template.php

Braces +6 added lines, -4 removed lines

@@ -148,8 +148,8 @@ 
 				</thead>
 				<tbody>';
 
-	foreach ($context['membergroups'] as $membergroup)
-		echo '
+	foreach ($context['membergroups'] as $membergroup) {
+			echo '
 					<tr class="windowbg">
 						<td>', $membergroup['name'], '</td>
 						<td class="centercol">
@@ -159,6 +159,7 @@ 
 							', $membergroup['can_be_additional'] ? '<input type="checkbox" name="membergroups[2][]" value="' . $membergroup['id'] . '" checked>' : '', '
 						</td>
 					</tr>';
+	}
 
 	echo '
 					<tr class="windowbg">
@@ -185,8 +186,8 @@ 
 				</thead>
 				<tbody>';
 
-	foreach ($context['postgroups'] as $postgroup)
-		echo '
+	foreach ($context['postgroups'] as $postgroup) {
+			echo '
 					<tr class="windowbg">
 						<td>
 							', $postgroup['name'], '
@@ -195,6 +196,7 @@ 
 							<input type="checkbox" name="postgroups[]" value="', $postgroup['id'], '" checked>
 						</td>
 					</tr>';
+	}
 
 	echo '
 					<tr class="windowbg">

Themes/default/Profile.template.php

Spacing +1 added lines, -2 removed lines

@@ -3096,8 +3096,7 @@
 			<div class="roundframe">
 				<div>
 		', !empty($context['tfa_backup']) ? '
-					<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' :
-			($modSettings['tfa_mode'] == 2 ? '
+					<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' : ($modSettings['tfa_mode'] == 2 ? '
 									<div class="smalltext"><strong>' . $txt['tfa_forced_desc'] . '</strong></div>' : ''), '
 									<div class="smalltext">', $txt['tfa_desc'], '</div>
 									<div class="floatleft">

Braces +508 added lines, -392 removed lines

@@ -18,23 +18,25 @@ 
 	global $context;
 
 	// Prevent Chrome from auto completing fields when viewing/editing other members profiles
-	if (isBrowser('is_chrome') && !$context['user']['is_owner'])
-		echo '
+	if (isBrowser('is_chrome') && !$context['user']['is_owner']) {
+			echo '
 			<script>
 				disableAutoComplete();
 			</script>';
+	}
 
 	// If an error occurred while trying to save previously, give the user a clue!
 	echo '
 			', template_error_message();
 
 	// If the profile was update successfully, let the user know this.
-	if (!empty($context['profile_updated']))
-		echo '
+	if (!empty($context['profile_updated'])) {
+			echo '
 			<div class="infobox">
 				', $context['profile_updated'], '
 			</div>';
-}
+	}
+	}
 
 /**
  * Template for any HTML needed below the profile (closing off divs/tables, etc.)
@@ -99,19 +101,19 @@ 
 		</div>
 		<div class="alerts_unread">';
 
-	if (empty($context['unread_alerts']))
-		template_alerts_all_read();
-
-	else
+	if (empty($context['unread_alerts'])) {
+			template_alerts_all_read();
+	} else
 	{
-		foreach ($context['unread_alerts'] as $id_alert => $details)
-			echo '
+		foreach ($context['unread_alerts'] as $id_alert => $details) {
+					echo '
 			<div class="unread">
 				', !empty($details['sender']) ? $details['sender']['avatar']['image'] : '', '
 				<div class="details">
 					', !empty($details['icon']) ? $details['icon'] : '', '<span>', $details['text'], '</span> - ', $details['time'], '
 				</div>
 			</div>';
+		}
 	}
 
 	echo '
@@ -161,10 +163,11 @@ 
 			<div class="custom_fields_above_name">
 				<ul>';
 
-		foreach ($context['print_custom_fields']['above_member'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['above_member'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -176,20 +179,22 @@ 
 			<div class="username clear">
 				<h4>';
 
-	if (!empty($context['print_custom_fields']['before_member']))
-		foreach ($context['print_custom_fields']['before_member'] as $field)
+	if (!empty($context['print_custom_fields']['before_member'])) {
+			foreach ($context['print_custom_fields']['before_member'] as $field)
 			if (!empty($field['output_html']))
 				echo '
 					<span>', $field['output_html'], '</span>';
+	}
 
 	echo '
 					', $context['member']['name'];
 
-	if (!empty($context['print_custom_fields']['after_member']))
-		foreach ($context['print_custom_fields']['after_member'] as $field)
+	if (!empty($context['print_custom_fields']['after_member'])) {
+			foreach ($context['print_custom_fields']['after_member'] as $field)
 			if (!empty($field['output_html']))
 				echo '
 					<span>', $field['output_html'], '</span>';
+	}
 
 
 	echo '
@@ -205,10 +210,11 @@ 
 			<div class="custom_fields_below_avatar">
 				<ul>';
 
-		foreach ($context['print_custom_fields']['below_avatar'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['below_avatar'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -220,22 +226,25 @@ 
 			<ul class="clear">';
 
 	// Email is only visible if it's your profile or you have the moderate_forum permission
-	if ($context['member']['show_email'])
-		echo '
+	if ($context['member']['show_email']) {
+			echo '
 				<li><a href="mailto:', $context['member']['email'], '" title="', $context['member']['email'], '" rel="nofollow"><span class="generic_icons mail" title="' . $txt['email'] . '"></span></a></li>';
+	}
 
 	// Don't show an icon if they haven't specified a website.
-	if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website']))
-		echo '
+	if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website'])) {
+			echo '
 				<li><a href="', $context['member']['website']['url'], '" title="' . $context['member']['website']['title'] . '" target="_blank">', ($settings['use_image_buttons'] ? '<span class="generic_icons www" title="' . $context['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
+	}
 
 	// Are there any custom profile fields as icons?
 	if (!empty($context['print_custom_fields']['icons']))
 	{
-		foreach ($context['print_custom_fields']['icons'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['icons'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 				<li class="custom_field">', $field['output_html'], '</li>';
+		}
 	}
 
 	echo '
@@ -244,24 +253,27 @@ 
 				', $context['can_send_pm'] ? '<a href="' . $context['member']['online']['href'] . '" title="' . $context['member']['online']['text'] . '" rel="nofollow">' : '', $settings['use_image_buttons'] ? '<span class="' . ($context['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $context['member']['online']['text'] . '"></span>' : $context['member']['online']['label'], $context['can_send_pm'] ? '</a>' : '', $settings['use_image_buttons'] ? '<span class="smalltext"> ' . $context['member']['online']['label'] . '</span>' : '';
 
 	// Can they add this member as a buddy?
-	if (!empty($context['can_have_buddy']) && !$context['user']['is_owner'])
-		echo '
+	if (!empty($context['can_have_buddy']) && !$context['user']['is_owner']) {
+			echo '
 				<br>
 				<a href="', $scripturl, '?action=buddy;u=', $context['id_member'], ';', $context['session_var'], '=', $context['session_id'], '">[', $txt['buddy_' . ($context['member']['is_buddy'] ? 'remove' : 'add')], ']</a>';
+	}
 
 	echo '
 			</span>';
 
-	if (!$context['user']['is_owner'] && $context['can_send_pm'])
-		echo '
+	if (!$context['user']['is_owner'] && $context['can_send_pm']) {
+			echo '
 			<a href="', $scripturl, '?action=pm;sa=send;u=', $context['id_member'], '" class="infolinks">', $txt['profile_sendpm_short'], '</a>';
+	}
 
 	echo '
 			<a href="', $scripturl, '?action=profile;area=showposts;u=', $context['id_member'], '" class="infolinks">', $txt['showPosts'], '</a>';
 
-	if ($context['user']['is_owner'] && !empty($modSettings['drafts_post_enabled']))
-		echo '
+	if ($context['user']['is_owner'] && !empty($modSettings['drafts_post_enabled'])) {
+			echo '
 			<a href="', $scripturl, '?action=profile;area=showdrafts;u=', $context['id_member'], '" class="infolinks">', $txt['drafts_show'], '</a>';
+	}
 
 	echo '
 			<a href="', $scripturl, '?action=profile;area=statistics;u=', $context['id_member'], '" class="infolinks">', $txt['statPanel'], '</a>';
@@ -273,10 +285,11 @@ 
 			<div class="custom_fields_bottom">
 				<ul class="nolist">';
 
-		foreach ($context['print_custom_fields']['bottom_poster'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['bottom_poster'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -289,30 +302,35 @@ 
 		<div id="detailedinfo">
 			<dl class="settings">';
 
-	if ($context['user']['is_owner'] || $context['user']['is_admin'])
-		echo '
+	if ($context['user']['is_owner'] || $context['user']['is_admin']) {
+			echo '
 				<dt>', $txt['username'], ': </dt>
 				<dd>', $context['member']['username'], '</dd>';
+	}
 
-	if (!isset($context['disabled_fields']['posts']))
-		echo '
+	if (!isset($context['disabled_fields']['posts'])) {
+			echo '
 				<dt>', $txt['profile_posts'], ': </dt>
 				<dd>', $context['member']['posts'], ' (', $context['member']['posts_per_day'], ' ', $txt['posts_per_day'], ')</dd>';
+	}
 
-	if ($context['member']['show_email'])
-		echo '
+	if ($context['member']['show_email']) {
+			echo '
 				<dt>', $txt['email'], ': </dt>
 				<dd><a href="mailto:', $context['member']['email'], '">', $context['member']['email'], '</a></dd>';
+	}
 
-	if (!empty($modSettings['titlesEnable']) && !empty($context['member']['title']))
-		echo '
+	if (!empty($modSettings['titlesEnable']) && !empty($context['member']['title'])) {
+			echo '
 				<dt>', $txt['custom_title'], ': </dt>
 				<dd>', $context['member']['title'], '</dd>';
+	}
 
-	if (!empty($context['member']['blurb']))
-		echo '
+	if (!empty($context['member']['blurb'])) {
+			echo '
 				<dt>', $txt['personal_text'], ': </dt>
 				<dd>', $context['member']['blurb'], '</dd>';
+	}
 
 	echo '
 				<dt>', $txt['age'], ':</dt>
@@ -326,19 +344,21 @@ 
 	{
 		$fields = array();
 
-		foreach ($context['print_custom_fields']['standard'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['standard'] as $field) {
+					if (!empty($field['output_html']))
 				$fields[] = $field;
+		}
 
 		if (count($fields) > 0)
 		{
 			echo '
 			<dl class="settings">';
 
-			foreach ($fields as $field)
-				echo '
+			foreach ($fields as $field) {
+							echo '
 				<dt>', $field['name'], ':</dt>
 				<dd>', $field['output_html'], '</dd>';
+			}
 
 			echo '
 			</dl>';
@@ -358,9 +378,10 @@ 
 					<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=', ($context['can_issue_warning'] && !$context['user']['is_owner'] ? 'issuewarning' : 'viewwarning'), '">', $context['member']['warning'], '%</a>';
 
 		// Can we provide information on what this means?
-		if (!empty($context['warning_status']))
-			echo '
+		if (!empty($context['warning_status'])) {
+					echo '
 					<span class="smalltext">(', $context['warning_status'], ')</span>';
+		}
 
 		echo '
 				</dd>';
@@ -371,11 +392,12 @@ 
 	{
 
 		// If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves.
-		if (!empty($context['activate_message']))
-			echo '
+		if (!empty($context['activate_message'])) {
+					echo '
 				<dt class="clear">
 					<span class="alert">', $context['activate_message'], '</span> (<a href="', $context['activate_link'], '"', ($context['activate_type'] == 4 ? ' class="you_sure" data-confirm="' . $txt['profileConfirm'] . '"' : ''), '>', $context['activate_link_text'], '</a>)
 				</dt>';
+		}
 
 		// If the current member is banned, show a message and possibly a link to the ban.
 		if (!empty($context['member']['bans']))
@@ -387,10 +409,11 @@ 
 				<dt class="clear" id="ban_info" style="display: none;">
 					<strong>', $txt['user_banned_by_following'], ':</strong>';
 
-			foreach ($context['member']['bans'] as $ban)
-				echo '
+			foreach ($context['member']['bans'] as $ban) {
+							echo '
 					<br>
 					<span class="smalltext">', $ban['explanation'], '</span>';
+			}
 
 			echo '
 				</dt>';
@@ -404,30 +427,34 @@ 
 	// If the person looking is allowed, they can check the members IP address and hostname.
 	if ($context['can_see_ip'])
 	{
-		if (!empty($context['member']['ip']))
-		echo '
+		if (!empty($context['member']['ip'])) {
+				echo '
 				<dt>', $txt['ip'], ': </dt>
 				<dd><a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['member']['ip'], ';u=', $context['member']['id'], '">', $context['member']['ip'], '</a></dd>';
+		}
 
-		if (empty($modSettings['disableHostnameLookup']) && !empty($context['member']['ip']))
-			echo '
+		if (empty($modSettings['disableHostnameLookup']) && !empty($context['member']['ip'])) {
+					echo '
 				<dt>', $txt['hostname'], ': </dt>
 				<dd>', $context['member']['hostname'], '</dd>';
+		}
 	}
 
 	echo '
 				<dt>', $txt['local_time'], ':</dt>
 				<dd>', $context['member']['local_time'], '</dd>';
 
-	if (!empty($modSettings['userLanguage']) && !empty($context['member']['language']))
-		echo '
+	if (!empty($modSettings['userLanguage']) && !empty($context['member']['language'])) {
+			echo '
 				<dt>', $txt['language'], ':</dt>
 				<dd>', $context['member']['language'], '</dd>';
+	}
 
-	if ($context['member']['show_last_login'])
-		echo '
+	if ($context['member']['show_last_login']) {
+			echo '
 				<dt>', $txt['lastLoggedIn'], ': </dt>
 				<dd>', $context['member']['last_login'], (!empty($context['member']['is_hidden']) ? ' (' . $txt['hidden'] . ')' : ''), '</dd>';
+	}
 
 	echo '
 			</dl>';
@@ -439,10 +466,11 @@ 
 			<div class="custom_fields_above_signature">
 				<ul class="nolist">';
 
-		foreach ($context['print_custom_fields']['above_signature'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['above_signature'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -450,12 +478,13 @@ 
 	}
 
 	// Show the users signature.
-	if ($context['signature_enabled'] && !empty($context['member']['signature']))
-		echo '
+	if ($context['signature_enabled'] && !empty($context['member']['signature'])) {
+			echo '
 			<div class="signature">
 				<h5>', $txt['signature'], ':</h5>
 				', $context['member']['signature'], '
 			</div>';
+	}
 
 	// Are there any custom profile fields for below the signature?
 	if (!empty($context['print_custom_fields']['below_signature']))
@@ -464,10 +493,11 @@ 
 			<div class="custom_fields_below_signature">
 				<ul class="nolist">';
 
-		foreach ($context['print_custom_fields']['below_signature'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['below_signature'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -513,62 +543,70 @@ 
 			</div>
 			<div class="list_posts">';
 
-			if (!$post['approved'])
-				echo '
+			if (!$post['approved']) {
+							echo '
 				<div class="approve_post">
 					<em>', $txt['post_awaiting_approval'], '</em>
 				</div>';
+			}
 
 			echo '
 				', $post['body'], '
 			</div>';
 
-			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
-				echo '
+			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
+							echo '
 			<div class="floatright">
 				<ul class="quickbuttons">';
+			}
 
 			// If they *can* reply?
-			if ($post['can_reply'])
-				echo '
+			if ($post['can_reply']) {
+							echo '
 					<li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>';
+			}
 
 			// If they *can* quote?
-			if ($post['can_quote'])
-				echo '
+			if ($post['can_quote']) {
+							echo '
 					<li><a href="', $scripturl . '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
+			}
 
 			// How about... even... remove it entirely?!
-			if ($post['can_delete'])
-				echo '
+			if ($post['can_delete']) {
+							echo '
 					<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
+			}
 
-			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
-				echo '
+			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
+							echo '
 				</ul>
 			</div><!-- .floatright -->';
+			}
 
 			echo '
 		</div><!-- $post[css_class] -->';
 		}
+	} else {
+			template_show_list('attachments');
 	}
-	else
-		template_show_list('attachments');
 
 	// No posts? Just end with a informative message.
-	if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts'])))
-		echo '
+	if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts']))) {
+			echo '
 		<div class="windowbg2">
 			', isset($context['attachments']) ? $txt['show_attachments_none'] : ($context['is_topics'] ? $txt['show_topics_none'] : $txt['show_posts_none']), '
 		</div>';
+	}
 
 	// Show more page numbers.
-	if (!empty($context['page_index']))
-		echo '
+	if (!empty($context['page_index'])) {
+			echo '
 		<div class="pagesection">
 			<div class="pagelinks">', $context['page_index'], '</div>
 		</div>';
-}
+	}
+	}
 
 /**
  * Template for showing alerts within the alerts popup
@@ -578,11 +616,12 @@ 
 	global $context, $txt, $scripturl;
 
 	// Do we have an update message?
-	if (!empty($context['update_message']))
-		echo '
+	if (!empty($context['update_message'])) {
+			echo '
 		<div class="infobox">
 			', $context['update_message'], '.
 		</div>';
+	}
 
 	echo '
 		<div class="cat_bar">
@@ -591,13 +630,12 @@ 
 			</h3>
 		</div>';
 
-	if (empty($context['alerts']))
-		echo '
+	if (empty($context['alerts'])) {
+			echo '
 		<div class="information">
 			', $txt['alerts_none'], '
 		</div>';
-
-	else
+	} else
 	{
 		// Start the form.
 		echo '
@@ -659,12 +697,12 @@ 
 		</div>' : '';
 
 	// No drafts? Just show an informative message.
-	if (empty($context['drafts']))
-		echo '
+	if (empty($context['drafts'])) {
+			echo '
 		<div class="windowbg2 centertext">
 			', $txt['draft_none'], '
 		</div>';
-	else
+	} else
 	{
 		// For every draft to be displayed, give it its own div, and show the important details of the draft.
 		foreach ($context['drafts'] as $draft)
@@ -676,13 +714,15 @@ 
 				<h5>
 					<strong><a href="', $scripturl, '?board=', $draft['board']['id'], '.0">', $draft['board']['name'], '</a> / ', $draft['topic']['link'], '</strong> &nbsp; &nbsp;';
 
-			if (!empty($draft['sticky']))
-				echo '
+			if (!empty($draft['sticky'])) {
+							echo '
 					<span class="generic_icons sticky" title="', $txt['sticky_topic'], '"></span>';
+			}
 
-			if (!empty($draft['locked']))
-				echo '
+			if (!empty($draft['locked'])) {
+							echo '
 					<span class="generic_icons lock" title="', $txt['locked_topic'], '"></span>';
+			}
 
 			echo '
 				</h5>
@@ -715,13 +755,13 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $context['member']['name']), '</div>';
-
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 	<div class="errorbox">', $context['saved_failed'], '</div>';
+	}
 
 	echo '
 	<div id="edit_buddies">
@@ -736,14 +776,16 @@ 
 					<th scope="col" class="quarter_table">', $txt['name'], '</th>
 					<th scope="col">', $txt['status'], '</th>';
 
-	if (allowedTo('moderate_forum'))
-		echo '
+	if (allowedTo('moderate_forum')) {
+			echo '
 					<th scope="col">', $txt['email'], '</th>';
+	}
 
-	if (!empty($context['custom_pf']))
-		foreach ($context['custom_pf'] as $column)
+	if (!empty($context['custom_pf'])) {
+			foreach ($context['custom_pf'] as $column)
 				echo '
 					<th scope="col">', $column['label'], '</th>';
+	}
 
 	echo '
 					<th scope="col">', $txt['remove'], '</th>
@@ -752,13 +794,14 @@ 
 			<tbody>';
 
 	// If they don't have any buddies don't list them!
-	if (empty($context['buddies']))
-		echo '
+	if (empty($context['buddies'])) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="', allowedTo('moderate_forum') ? '10' : '9', '">
 						<strong>', $txt['no_buddies'], '</strong>
 					</td>
 				</tr>';
+	}
 
 		// Now loop through each buddy showing info on each.
 	else
@@ -772,17 +815,19 @@ 
 						<a href="', $buddy['online']['href'], '"><span class="' . ($buddy['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $buddy['online']['text'] . '"></span></a>
 					</td>';
 
-			if ($buddy['show_email'])
-				echo '
+			if ($buddy['show_email']) {
+							echo '
 					<td>
 						<a href="mailto:' . $buddy['email'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $buddy['name'] . '"></span></a>
 					</td>';
+			}
 
 			// Show the custom profile fields for this user.
-			if (!empty($context['custom_pf']))
-				foreach ($context['custom_pf'] as $key => $column)
+			if (!empty($context['custom_pf'])) {
+							foreach ($context['custom_pf'] as $key => $column)
 					echo '
 					<td class="lefttext">', $buddy['options'][$key], '</td>';
+			}
 
 			echo '
 					<td>
@@ -815,9 +860,10 @@ 
 			</dl>
 		</div>';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 		<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -843,13 +889,13 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $context['member']['name']), '</div>';
-
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 	<div class="errorbox">', $context['saved_failed'], '</div>';
+	}
 
 	echo '
 	<div id="edit_buddies">
@@ -864,9 +910,10 @@ 
 					<th scope="col" class="quarter_table">', $txt['name'], '</th>
 					<th scope="col">', $txt['status'], '</th>';
 
-	if (allowedTo('moderate_forum'))
-		echo '
+	if (allowedTo('moderate_forum')) {
+			echo '
 					<th scope="col">', $txt['email'], '</th>';
+	}
 
 	echo '
 					<th scope="col">', $txt['ignore_remove'], '</th>
@@ -875,13 +922,14 @@ 
 			<tbody>';
 
 	// If they don't have anyone on their ignore list, don't list it!
-	if (empty($context['ignore_list']))
-		echo '
+	if (empty($context['ignore_list'])) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="', allowedTo('moderate_forum') ? '4' : '3', '">
 						<strong>', $txt['no_ignore'], '</strong>
 					</td>
 				</tr>';
+	}
 
 	// Now loop through each buddy showing info on each.
 	foreach ($context['ignore_list'] as $member)
@@ -893,11 +941,12 @@ 
 						<a href="', $member['online']['href'], '"><span class="' . ($member['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $member['online']['text'] . '"></span></a>
 					</td>';
 
-		if ($member['show_email'])
-			echo '
+		if ($member['show_email']) {
+					echo '
 					<td>
 						<a href="mailto:' . $member['email'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $member['name'] . '"></span></a>
 					</td>';
+		}
 		echo '
 					<td>
 						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=lists;sa=ignore;remove=', $member['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons delete" title="', $txt['ignore_remove'], '"></span></a>
@@ -927,9 +976,10 @@ 
 			</dl>
 		</div>';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 		<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -975,9 +1025,10 @@ 
 					<a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['last_ip'], ';u=', $context['member']['id'], '">', $context['last_ip'], '</a>';
 
 	// Second address detected?
-	if (!empty($context['last_ip2']))
-		echo '
+	if (!empty($context['last_ip2'])) {
+			echo '
 					, <a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['last_ip2'], ';u=', $context['member']['id'], '">', $context['last_ip2'], '</a>';
+	}
 
 	echo '
 				</dd>';
@@ -1043,9 +1094,10 @@ 
 		</div>
 		<div class="windowbg2 noup">';
 
-		foreach ($context['whois_servers'] as $server)
-			echo '
+		foreach ($context['whois_servers'] as $server) {
+					echo '
 			<a href="', $server['url'], '" target="_blank"', isset($context['auto_whois_server']) && $context['auto_whois_server']['name'] == $server['name'] ? ' style="font-weight: bold;"' : '', '>', $server['name'], '</a><br>';
+		}
 		echo '
 		</div>
 		<br>';
@@ -1057,13 +1109,12 @@ 
 			<h3 class="catbg">', $txt['members_from_ip'], ' ', $context['ip'], '</h3>
 		</div>';
 
-	if (empty($context['ips']))
-		echo '
+	if (empty($context['ips'])) {
+			echo '
 		<p class="windowbg2 description">
 			<em>', $txt['no_members_from_ip'], '</em>
 		</p>';
-
-	else
+	} else
 	{
 		echo '
 		<table class="table_grid">
@@ -1076,12 +1127,13 @@ 
 			<tbody>';
 
 		// Loop through each of the members and display them.
-		foreach ($context['ips'] as $ip => $memberlist)
-			echo '
+		foreach ($context['ips'] as $ip => $memberlist) {
+					echo '
 				<tr class="windowbg">
 					<td><a href="', $context['base_url'], ';searchip=', $ip, '">', $ip, '</a></td>
 					<td>', implode(', ', $memberlist), '</td>
 				</tr>';
+		}
 
 		echo '
 			</tbody>
@@ -1123,11 +1175,10 @@ 
 			</h3>
 		</div>';
 
-	if ($context['member']['has_all_permissions'])
-		echo '
+	if ($context['member']['has_all_permissions']) {
+			echo '
 		<div class="information">', $txt['showPermissions_all'], '</div>';
-
-	else
+	} else
 	{
 		echo '
 		<div class="information">',$txt['showPermissions_help'], '</div>
@@ -1142,9 +1193,10 @@ 
 			<div class="windowbg smalltext">
 				', $txt['showPermissions_restricted_boards_desc'], ':<br>';
 
-			foreach ($context['no_access_boards'] as $no_access_board)
-				echo '
+			foreach ($context['no_access_boards'] as $no_access_board) {
+							echo '
 				<a href="', $scripturl, '?board=', $no_access_board['id'], '.0">', $no_access_board['name'], '</a>', $no_access_board['is_last'] ? '' : ', ';
+			}
 			echo '
 			</div>';
 		}
@@ -1176,12 +1228,13 @@ 
 							</td>
 							<td class="smalltext">';
 
-				if ($permission['is_denied'])
-					echo '
+				if ($permission['is_denied']) {
+									echo '
 								<span class="alert">', $txt['showPermissions_denied'], ': ', implode(', ', $permission['groups']['denied']), '</span>';
-				else
-					echo '
+				} else {
+									echo '
 								', $txt['showPermissions_given'], ': ', implode(', ', $permission['groups']['allowed']);
+				}
 
 				echo '
 							</td>
@@ -1192,10 +1245,10 @@ 
 				</table>
 			</div><!-- .tborder -->
 			<br>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg2">', $txt['showPermissions_none_general'], '</p>';
+		}
 
 		// Board permission section.
 		echo '
@@ -1206,14 +1259,16 @@ 
 						<select name="board" onchange="if (this.options[this.selectedIndex].value) this.form.submit();">
 							<option value="0"', $context['board'] == 0 ? ' selected' : '', '>', $txt['showPermissions_global'], '</option>';
 
-		if (!empty($context['boards']))
-			echo '
+		if (!empty($context['boards'])) {
+					echo '
 							<option value="" disabled>---------------------------</option>';
+		}
 
 		// Fill the box with any local permission boards.
-		foreach ($context['boards'] as $board)
-			echo '
+		foreach ($context['boards'] as $board) {
+					echo '
 							<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['name'], ' (', $board['profile_name'], ')</option>';
+		}
 
 		echo '
 						</select>
@@ -1242,13 +1297,13 @@ 
 						</td>
 						<td class="smalltext">';
 
-				if ($permission['is_denied'])
-					echo '
+				if ($permission['is_denied']) {
+									echo '
 							<span class="alert">', $txt['showPermissions_denied'], ': ', implode(', ', $permission['groups']['denied']), '</span>';
-
-				else
-					echo '
+				} else {
+									echo '
 							', $txt['showPermissions_given'], ': ', implode(', ', $permission['groups']['allowed']);
+				}
 
 				echo '
 						</td>
@@ -1257,10 +1312,10 @@ 
 			echo '
 				</tbody>
 			</table>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg2">', $txt['showPermissions_none_board'], '</p>';
+		}
 	echo '
 		</div><!-- #permissions -->';
 	}
@@ -1301,9 +1356,10 @@ 
 			</div>';
 
 	// If they haven't post at all, don't draw the graph.
-	if (empty($context['posts_by_time']))
-		echo '
+	if (empty($context['posts_by_time'])) {
+			echo '
 			<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
+	}
 
 	// Otherwise do!
 	else
@@ -1312,8 +1368,8 @@ 
 			<ul class="activity_stats flow_hidden">';
 
 		// The labels.
-		foreach ($context['posts_by_time'] as $time_of_day)
-			echo '
+		foreach ($context['posts_by_time'] as $time_of_day) {
+					echo '
 				<li', $time_of_day['is_last'] ? ' class="last"' : '', '>
 					<div class="bar" style="padding-top: ', ((int) (100 - $time_of_day['relative_percent'])), 'px;" title="', sprintf($txt['statPanel_activityTime_posts'], $time_of_day['posts'], $time_of_day['posts_percent']), '">
 						<div style="height: ', (int) $time_of_day['relative_percent'], 'px;">
@@ -1322,6 +1378,7 @@ 
 					</div>
 					<span class="stats_hour">', $time_of_day['hour_format'], '</span>
 				</li>';
+		}
 
 		echo '
 			</ul>';
@@ -1340,11 +1397,10 @@ 
 					</h3>
 				</div>';
 
-	if (empty($context['popular_boards']))
-		echo '
+	if (empty($context['popular_boards'])) {
+			echo '
 				<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
-
-	else
+	} else
 	{
 		echo '
 				<dl class="stats">';
@@ -1374,10 +1430,10 @@ 
 					</h3>
 				</div>';
 
-	if (empty($context['board_activity']))
-		echo '
+	if (empty($context['board_activity'])) {
+			echo '
 				<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
-	else
+	} else
 	{
 		echo '
 				<dl class="stats">';
@@ -1428,90 +1484,97 @@ 
 				<h3 class="catbg profile_hd">';
 
 		// Don't say "Profile" if this isn't the profile...
-		if (!empty($context['profile_header_text']))
-			echo '
+		if (!empty($context['profile_header_text'])) {
+					echo '
 					', $context['profile_header_text'];
-		else
-			echo '
+		} else {
+					echo '
 					', $txt['profile'];
+		}
 
 		echo '
 				</h3>
 			</div>';
 
 	// Have we some description?
-	if ($context['page_desc'])
-		echo '
+	if ($context['page_desc']) {
+			echo '
 			<p class="information">', $context['page_desc'], '</p>';
+	}
 
 	echo '
 			<div class="roundframe">';
 
 	// Any bits at the start?
-	if (!empty($context['profile_prehtml']))
-		echo '
+	if (!empty($context['profile_prehtml'])) {
+			echo '
 				<div>', $context['profile_prehtml'], '</div>';
+	}
 
-	if (!empty($context['profile_fields']))
-		echo '
+	if (!empty($context['profile_fields'])) {
+			echo '
 				<dl class="settings">';
+	}
 
 	// Start the big old loop 'of love.
 	$lastItem = 'hr';
 	foreach ($context['profile_fields'] as $key => $field)
 	{
 		// We add a little hack to be sure we never get more than one hr in a row!
-		if ($lastItem == 'hr' && $field['type'] == 'hr')
-			continue;
+		if ($lastItem == 'hr' && $field['type'] == 'hr') {
+					continue;
+		}
 
 		$lastItem = $field['type'];
-		if ($field['type'] == 'hr')
-			echo '
+		if ($field['type'] == 'hr') {
+					echo '
 				</dl>
 				<hr>
 				<dl class="settings">';
-
-		elseif ($field['type'] == 'callback')
+		} elseif ($field['type'] == 'callback')
 		{
 			if (isset($field['callback_func']) && function_exists('template_profile_' . $field['callback_func']))
 			{
 				$callback_func = 'template_profile_' . $field['callback_func'];
 				$callback_func();
 			}
-		}
-		else
+		} else
 		{
 			echo '
 					<dt>
 						<strong', !empty($field['is_error']) ? ' class="error"' : '', '>', $field['type'] !== 'label' ? '<label for="' . $key . '">' : '', $field['label'], $field['type'] !== 'label' ? '</label>' : '', '</strong>';
 
 			// Does it have any subtext to show?
-			if (!empty($field['subtext']))
-				echo '
+			if (!empty($field['subtext'])) {
+							echo '
 						<br>
 						<span class="smalltext">', $field['subtext'], '</span>';
+			}
 
 			echo '
 					</dt>
 					<dd>';
 
 			// Want to put something infront of the box?
-			if (!empty($field['preinput']))
-				echo '
+			if (!empty($field['preinput'])) {
+							echo '
 						', $field['preinput'];
+			}
 
 			// What type of data are we showing?
-			if ($field['type'] == 'label')
-				echo '
+			if ($field['type'] == 'label') {
+							echo '
 						', $field['value'];
+			}
 
 			// Maybe it's a text box - very likely!
 			elseif (in_array($field['type'], array('int', 'float', 'text', 'password', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'number', 'time', 'url')))
 			{
-				if ($field['type'] == 'int' || $field['type'] == 'float')
-					$type = 'number';
-				else
-					$type = $field['type'];
+				if ($field['type'] == 'int' || $field['type'] == 'float') {
+									$type = 'number';
+				} else {
+									$type = $field['type'];
+				}
 				$step = $field['type'] == 'float' ? ' step="0.1"' : '';
 
 
@@ -1519,10 +1582,11 @@ 
 						<input type="', $type, '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" ', $field['input_attr'], ' ', $step, '>';
 			}
 			// You "checking" me out? ;)
-			elseif ($field['type'] == 'check')
-				echo '
+			elseif ($field['type'] == 'check') {
+							echo '
 						<input type="hidden" name="', $key, '" value="0">
 						<input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" ', $field['input_attr'], '>';
+			}
 
 			// Always fun - select boxes!
 			elseif ($field['type'] == 'select')
@@ -1533,14 +1597,16 @@ 
 				if (isset($field['options']))
 				{
 					// Is this some code to generate the options?
-					if (!is_array($field['options']))
-						$field['options'] = $field['options']();
+					if (!is_array($field['options'])) {
+											$field['options'] = $field['options']();
+					}
 
 					// Assuming we now have some!
-					if (is_array($field['options']))
-						foreach ($field['options'] as $value => $name)
+					if (is_array($field['options'])) {
+											foreach ($field['options'] as $value => $name)
 							echo '
 							<option value="', $value, '"', $value == $field['value'] ? ' selected' : '', '>', $name, '</option>';
+					}
 				}
 
 				echo '
@@ -1548,31 +1614,34 @@ 
 			}
 
 			// Something to end with?
-			if (!empty($field['postinput']))
-				echo '
+			if (!empty($field['postinput'])) {
+							echo '
 						', $field['postinput'];
+			}
 
 			echo '
 					</dd>';
 		}
 	}
 
-	if (!empty($context['profile_fields']))
-		echo '
+	if (!empty($context['profile_fields'])) {
+			echo '
 				</dl>';
+	}
 
 	// Are there any custom profile fields - if so print them!
 	if (!empty($context['custom_fields']))
 	{
-		if ($lastItem != 'hr')
-			echo '
+		if ($lastItem != 'hr') {
+					echo '
 				<hr>';
+		}
 
 		echo '
 				<dl class="settings">';
 
-		foreach ($context['custom_fields'] as $field)
-			echo '
+		foreach ($context['custom_fields'] as $field) {
+					echo '
 					<dt>
 						<strong>', $field['name'], ': </strong><br>
 						<span class="smalltext">', $field['desc'], '</span>
@@ -1580,6 +1649,7 @@ 
 					<dd>
 						', $field['input_html'], '
 					</dd>';
+		}
 
 		echo '
 				</dl>';
@@ -1587,13 +1657,14 @@ 
 	}
 
 	// Any closing HTML?
-	if (!empty($context['profile_posthtml']))
-		echo '
+	if (!empty($context['profile_posthtml'])) {
+			echo '
 				<div>', $context['profile_posthtml'], '</div>';
+	}
 
 	// Only show the password box if it's actually needed.
-	if ($context['require_password'])
-		echo '
+	if ($context['require_password']) {
+			echo '
 				<dl class="settings">
 					<dt>
 						<strong', isset($context['modify_error']['bad_password']) || isset($context['modify_error']['no_password']) ? ' class="error"' : '', '><label for="oldpasswrd">', $txt['current_password'], ': </label></strong><br>
@@ -1603,18 +1674,21 @@ 
 						<input type="password" name="oldpasswrd" id="oldpasswrd" size="20">
 					</dd>
 				</dl>';
+	}
 
 	// The button shouldn't say "Change profile" unless we're changing the profile...
-	if (!empty($context['submit_button_text']))
-		echo '
+	if (!empty($context['submit_button_text'])) {
+			echo '
 				<input type="submit" name="save" value="', $context['submit_button_text'], '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="save" value="', $txt['change_profile'], '" class="button">';
+	}
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -1624,10 +1698,11 @@ 
 		</form>';
 
 	// Any final spellchecking stuff?
-	if (!empty($context['show_spellchecking']))
-		echo '
+	if (!empty($context['show_spellchecking'])) {
+			echo '
 		<form name="spell_form" id="spell_form" method="post" accept-charset="', $context['character_set'], '" target="spellWindow" action="', $scripturl, '?action=spellcheck"><input type="hidden" name="spellstring" value=""></form>';
-}
+	}
+	}
 
 /**
  * Personal Message settings.
@@ -1664,10 +1739,11 @@ 
 						<select name="pm_receive_from" id="pm_receive_from">
 							<option value="0"', empty($context['receive_from']) || (empty($modSettings['enable_buddylist']) && $context['receive_from'] < 3) ? ' selected' : '', '>', $txt['pm_receive_from_everyone'], '</option>';
 
-	if (!empty($modSettings['enable_buddylist']))
-		echo '
+	if (!empty($modSettings['enable_buddylist'])) {
+			echo '
 							<option value="1"', !empty($context['receive_from']) && $context['receive_from'] == 1 ? ' selected' : '', '>', $txt['pm_receive_from_ignore'], '</option>
 							<option value="2"', !empty($context['receive_from']) && $context['receive_from'] == 2 ? ' selected' : '', '>', $txt['pm_receive_from_buddies'], '</option>';
+	}
 
 	echo '
 							<option value="3"', !empty($context['receive_from']) && $context['receive_from'] > 2 ? ' selected' : '', '>', $txt['pm_receive_from_admins'], '</option>
@@ -1710,11 +1786,12 @@ 
 		if (empty($setting) || !is_array($setting))
 		{
 			// Insert a separator (unless this is the first item in the list)
-			if ($i !== $first_option_key)
-				echo '
+			if ($i !== $first_option_key) {
+							echo '
 				</dl>
 				<hr>
 				<dl class="settings">';
+			}
 
 			// Should we give a name to this section?
 			if (is_string($setting) && !empty($setting))
@@ -1723,69 +1800,67 @@ 
 				echo '
 					<dt><strong>' . $setting . '</strong></dt>
 					<dd></dd>';
+			} else {
+							$titled_section = false;
 			}
-			else
-				$titled_section = false;
 
 			continue;
 		}
 
 		// Is this disabled?
-		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled']))
-			continue;
-
-		elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage']))
-			continue;
-
-		elseif ($setting['id'] == 'show_no_censored' && empty($modSettings['allow_no_censored']))
-			continue;
-
-		elseif ($setting['id'] == 'posts_apply_ignore_list' && empty($modSettings['enable_buddylist']))
-			continue;
-
-		elseif ($setting['id'] == 'wysiwyg_default' && !empty($modSettings['disable_wysiwyg']))
-			continue;
-
-		elseif ($setting['id'] == 'drafts_autosave_enabled' && (empty($modSettings['drafts_autosave_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled']))))
-			continue;
-
-		elseif ($setting['id'] == 'drafts_show_saved_enabled' && (empty($modSettings['drafts_show_saved_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled']))))
-			continue;
+		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled'])) {
+					continue;
+		} elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage'])) {
+					continue;
+		} elseif ($setting['id'] == 'show_no_censored' && empty($modSettings['allow_no_censored'])) {
+					continue;
+		} elseif ($setting['id'] == 'posts_apply_ignore_list' && empty($modSettings['enable_buddylist'])) {
+					continue;
+		} elseif ($setting['id'] == 'wysiwyg_default' && !empty($modSettings['disable_wysiwyg'])) {
+					continue;
+		} elseif ($setting['id'] == 'drafts_autosave_enabled' && (empty($modSettings['drafts_autosave_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) {
+					continue;
+		} elseif ($setting['id'] == 'drafts_show_saved_enabled' && (empty($modSettings['drafts_show_saved_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) {
+					continue;
+		}
 
 		// Some of these may not be set...  Set to defaults here
 		$opts = array('topics_per_page', 'messages_per_page', 'display_quick_mod');
-		if (in_array($setting['id'], $opts) && !isset($context['member']['options'][$setting['id']]))
-			$context['member']['options'][$setting['id']] = 0;
-
-		if (!isset($setting['type']) || $setting['type'] == 'bool')
-			$setting['type'] = 'checkbox';
-
-		elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			$setting['type'] = 'number';
+		if (in_array($setting['id'], $opts) && !isset($context['member']['options'][$setting['id']])) {
+					$context['member']['options'][$setting['id']] = 0;
+		}
 
-		elseif ($setting['type'] == 'string')
-			$setting['type'] = 'text';
+		if (!isset($setting['type']) || $setting['type'] == 'bool') {
+					$setting['type'] = 'checkbox';
+		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
+					$setting['type'] = 'number';
+		} elseif ($setting['type'] == 'string') {
+					$setting['type'] = 'text';
+		}
 
-		if (isset($setting['options']))
-			$setting['type'] = 'list';
+		if (isset($setting['options'])) {
+					$setting['type'] = 'list';
+		}
 
 		echo '
 					<dt>
 						<label for="', $setting['id'], '">', !$titled_section ? '<strong>' : '', $setting['label'], !$titled_section ? '</strong>' : '', '</label>';
 
-		if (isset($setting['description']))
-			echo '
+		if (isset($setting['description'])) {
+					echo '
 						<br>
 						<span class="smalltext">', $setting['description'], '</span>';
+		}
 		echo '
 					</dt>
 					<dd>';
 
 		// Display checkbox options
-		if ($setting['type'] == 'checkbox')
-			echo '
+		if ($setting['type'] == 'checkbox') {
+					echo '
 						<input type="hidden" name="default_options[' . $setting['id'] . ']" value="0">
 						<input type="checkbox" name="default_options[', $setting['id'], ']" id="', $setting['id'], '"', !empty($context['member']['options'][$setting['id']]) ? ' checked' : '', ' value="1">';
+		}
 
 		// How about selection lists, we all love them
 		elseif ($setting['type'] == 'list')
@@ -1793,9 +1868,10 @@ 
 			echo '
 						<select name="default_options[', $setting['id'], ']" id="', $setting['id'], '"', '>';
 
-			foreach ($setting['options'] as $value => $label)
-				echo '
+			foreach ($setting['options'] as $value => $label) {
+							echo '
 							<option value="', $value, '"', $value == $context['member']['options'][$setting['id']] ? ' selected' : '', '>', $label, '</option>';
+			}
 
 			echo '
 						</select>';
@@ -1811,14 +1887,13 @@ 
 
 				echo '
 						<input type="number"', $min . $max . $step;
-			}
-			elseif (isset($setting['type']) && $setting['type'] == 'url')
-				echo'
+			} elseif (isset($setting['type']) && $setting['type'] == 'url') {
+							echo'
 						<input type="url"';
-
-			else
-				echo '
+			} else {
+							echo '
 						<input type="text"';
+			}
 
 			echo ' name="default_options[', $setting['id'], ']" id="', $setting['id'], '" value="', isset($context['member']['options'][$setting['id']]) ? $context['member']['options'][$setting['id']] : $setting['value'], '"', $setting['type'] == 'number' ? ' size="5"' : '', '>';
 		}
@@ -1855,8 +1930,8 @@ 
 				<dl class="settings">';
 
 	// Allow notification on announcements to be disabled?
-	if (!empty($modSettings['allow_disableAnnounce']))
-		echo '
+	if (!empty($modSettings['allow_disableAnnounce'])) {
+			echo '
 					<dt>
 						<label for="notify_announcements">', $txt['notify_important_email'], '</label>
 					</dt>
@@ -1864,15 +1939,17 @@ 
 						<input type="hidden" name="notify_announcements" value="0">
 						<input type="checkbox" id="notify_announcements" name="notify_announcements" value="1"', !empty($context['member']['notify_announcements']) ? ' checked' : '', '>
 					</dd>';
+	}
 
-	if (!empty($modSettings['enable_ajax_alerts']))
-		echo '
+	if (!empty($modSettings['enable_ajax_alerts'])) {
+			echo '
 					<dt>
 						<label for="notify_send_body">', $txt['notify_alert_timeout'], '</label>
 					</dt>
 					<dd>
 						<input type="number" size="4" id="notify_alert_timeout" name="opt_alert_timeout" min="0" value="', $context['member']['alert_timeout'], '">
 					</dd>';
+	}
 
 	echo '
 				</dl>
@@ -1904,9 +1981,10 @@ 
 
 				$label = $txt['alert_opt_' . $opts[1]];
 				$label_pos = isset($opts['label']) ? $opts['label'] : '';
-				if ($label_pos == 'before')
-					echo '
+				if ($label_pos == 'before') {
+									echo '
 						<label for="opt_', $opts[1], '">', $label, '</label>';
+				}
 
 				$this_value = isset($context['alert_prefs'][$opts[1]]) ? $context['alert_prefs'][$opts[1]] : 0;
 				switch ($opts[0])
@@ -1920,17 +1998,19 @@ 
 						echo '
 						<select name="opt_', $opts[1], '" id="opt_', $opts[1], '">';
 
-						foreach ($opts['opts'] as $k => $v)
-							echo '
+						foreach ($opts['opts'] as $k => $v) {
+													echo '
 							<option value="', $k, '"', $this_value == $k ? ' selected' : '', '>', $v, '</option>';
+						}
 						echo '
 						</select>';
 						break;
 				}
 
-				if ($label_pos == 'after')
-					echo '
+				if ($label_pos == 'after') {
+									echo '
 						<label for="opt_', $opts[1], '">', $label, '</label>';
+				}
 
 				echo '
 					</td>
@@ -2047,11 +2127,12 @@ 
 			<p class="information">', $txt['groupMembership_info'], '</p>';
 
 	// Do we have an update message?
-	if (!empty($context['update_message']))
-		echo '
+	if (!empty($context['update_message'])) {
+			echo '
 			<div class="infobox">
 				', $context['update_message'], '.
 			</div>';
+	}
 
 	echo '
 			<div id="groups">';
@@ -2073,8 +2154,7 @@ 
 						</div>
 					</div>
 				</div><!-- .groupmembership -->';
-	}
-	else
+	} else
 	{
 		echo '
 				<div class="title_bar">
@@ -2086,27 +2166,30 @@ 
 			echo '
 				<div class="windowbg" id="primdiv_', $group['id'], '">';
 
-				if ($context['can_edit_primary'])
-					echo '
+				if ($context['can_edit_primary']) {
+									echo '
 					<input type="radio" name="primary" id="primary_', $group['id'], '" value="', $group['id'], '"', $group['is_primary'] ? ' checked' : '', ' onclick="highlightSelected(\'primdiv_' . $group['id'] . '\');"', $group['can_be_primary'] ? '' : ' disabled', '>';
+				}
 
 				echo '
 					<label for="primary_', $group['id'], '"><strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), '</label>';
 
 				// Can they leave their group?
-				if ($group['can_leave'])
-					echo '
+				if ($group['can_leave']) {
+									echo '
 					<a href="' . $scripturl . '?action=profile;save;u=' . $context['id_member'] . ';area=groupmembership;' . $context['session_var'] . '=' . $context['session_id'] . ';gid=' . $group['id'] . ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '">' . $txt['leave_group'] . '</a>';
+				}
 
 				echo '
 				</div><!-- .windowbg -->';
 		}
 
-		if ($context['can_edit_primary'])
-			echo '
+		if ($context['can_edit_primary']) {
+					echo '
 				<div class="padding righttext">
 					<input type="submit" value="', $txt['make_primary'], '" class="button">
 				</div>';
+		}
 
 		// Any groups they can join?
 		if (!empty($context['groups']['available']))
@@ -2122,17 +2205,16 @@ 
 				<div class="windowbg">
 					<strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), '';
 
-				if ($group['type'] == 3)
-					echo '
+				if ($group['type'] == 3) {
+									echo '
 					<a href="', $scripturl, '?action=profile;save;u=', $context['id_member'], ';area=groupmembership;', $context['session_var'], '=', $context['session_id'], ';gid=', $group['id'], ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '" class="button floatright">', $txt['join_group'], '</a>';
-
-				elseif ($group['type'] == 2 && $group['pending'])
-					echo '
+				} elseif ($group['type'] == 2 && $group['pending']) {
+									echo '
 					<span class="floatright">', $txt['approval_pending'], '</span>';
-
-				elseif ($group['type'] == 2)
-					echo '
+				} elseif ($group['type'] == 2) {
+									echo '
 					<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=groupmembership;request=', $group['id'], '" class="button floatright">', $txt['request_group'], '</a>';
+				}
 
 				echo '
 				</div><!-- .windowbg -->';
@@ -2155,9 +2237,10 @@ 
 
 						prevDiv.className = "windowbg";
 					}';
-		if (isset($context['groups']['member'][$context['primary_group']]))
-			echo '
+		if (isset($context['groups']['member'][$context['primary_group']])) {
+					echo '
 					highlightSelected("primdiv_' . $context['primary_group'] . '");';
+		}
 
 		echo '
 				</script>';
@@ -2166,9 +2249,10 @@ 
 	echo '
 			</div><!-- #groups -->';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 			<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2216,14 +2300,15 @@ 
 
 		foreach ($category['boards'] as $board)
 		{
-			if ($i == $limit)
-				echo '
+			if ($i == $limit) {
+							echo '
 						</ul>
 					</li>
 				</ul>
 				<ul class="ignoreboards floatright">
 					<li class="category">
 						<ul>';
+			}
 
 			echo '
 							<li class="board" style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">
@@ -2269,10 +2354,11 @@ 
 
 	// Work out the starting color.
 	$context['current_color'] = $context['colors'][0];
-	foreach ($context['colors'] as $limit => $color)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['colors'] as $limit => $color) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_color'] = $color;
-}
+	}
+	}
 
 // Show all warnings of a user?
 function template_viewWarning()
@@ -2311,14 +2397,15 @@ 
 				</dd>';
 
 	// There's some impact of this?
-	if (!empty($context['level_effects'][$context['current_level']]))
-		echo '
+	if (!empty($context['level_effects'][$context['current_level']])) {
+			echo '
 				<dt>
 					<strong>', $txt['profile_viewwarning_impact'], ':</strong>
 				</dt>
 				<dd>
 					', $context['level_effects'][$context['current_level']], '
 				</dd>';
+	}
 
 	echo '
 			</dl>
@@ -2356,10 +2443,11 @@ 
 
 			// Otherwise see what we can do...';
 
-	foreach ($context['notification_templates'] as $k => $type)
-		echo '
+	foreach ($context['notification_templates'] as $k => $type) {
+			echo '
 			if (index == ', $k, ')
 				document.getElementById(\'warn_body\').value = "', strtr($type['body'], array('"' => "'", "\n" => '\\n', "\r" => '')), '";';
+	}
 
 	echo '
 		}
@@ -2369,10 +2457,11 @@ 
 			// Also set the right effect.
 			effectText = "";';
 
-	foreach ($context['level_effects'] as $limit => $text)
-		echo '
+	foreach ($context['level_effects'] as $limit => $text) {
+			echo '
 			if (slideAmount >= ', $limit, ')
 				effectText = "', $text, '";';
+	}
 
 	echo '
 			setInnerHTML(document.getElementById(\'cur_level_div\'), slideAmount + \'% (\' + effectText + \')\');
@@ -2387,32 +2476,35 @@ 
 			</h3>
 		</div>';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 		<p class="information">', $txt['profile_warning_desc'], '</p>';
+	}
 
 	echo '
 		<div class="windowbg">
 			<dl class="settings">';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 				<dt>
 					<strong>', $txt['profile_warning_name'], ':</strong>
 				</dt>
 				<dd>
 					<strong>', $context['member']['name'], '</strong>
 				</dd>';
+	}
 
 	echo '
 				<dt>
 					<strong>', $txt['profile_warning_level'], ':</strong>';
 
 	// Is there only so much they can apply?
-	if ($context['warning_limit'])
-		echo '
+	if ($context['warning_limit']) {
+			echo '
 					<br>
 					<span class="smalltext">', sprintf($txt['profile_warning_limit_attribute'], $context['warning_limit']), '</span>';
+	}
 
 	echo '
 				</dt>
@@ -2467,9 +2559,10 @@ 
 						<option value="-1">', $txt['profile_warning_notify_template'], '</option>
 						<option value="-1" disabled>------------------------------</option>';
 
-		foreach ($context['notification_templates'] as $id_template => $template)
-			echo '
+		foreach ($context['notification_templates'] as $id_template => $template) {
+					echo '
 						<option value="', $id_template, '">', $template['title'], '</option>';
+		}
 
 		echo '
 					</select>
@@ -2482,9 +2575,10 @@ 
 			</dl>
 			<div class="righttext">';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2500,8 +2594,8 @@ 
 	echo '
 	<script>';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 		modifyWarnNotify();
 		$(document).ready(function() {
 			$("#preview_button").click(function() {
@@ -2540,6 +2634,7 @@ 
 			});
 			return false;
 		}';
+	}
 
 	echo '
 	</script>';
@@ -2562,17 +2657,19 @@ 
 			</div>';
 
 	// If deleting another account give them a lovely info box.
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 			<p class="information">', $txt['deleteAccount_desc'], '</p>';
+	}
 
 	echo '
 			<div class="windowbg2">';
 
 	// If they are deleting their account AND the admin needs to approve it - give them another piece of info ;)
-	if ($context['needs_approval'])
-		echo '
+	if ($context['needs_approval']) {
+			echo '
 				<div class="errorbox">', $txt['deleteAccount_approval'], '</div>';
+	}
 
 	// If the user is deleting their own account warn them first - and require a password!
 	if ($context['user']['is_owner'])
@@ -2584,9 +2681,10 @@ 
 					<input type="password" name="oldpasswrd" size="20">
 					<input type="submit" value="', $txt['yes'], '" class="button">';
 
-		if (!empty($context['token_check']))
-			echo '
+		if (!empty($context['token_check'])) {
+					echo '
 					<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+		}
 
 		echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2616,10 +2714,11 @@ 
 						<option value="topics">', $txt['deleteAccount_topics'], '</option>
 					</select>';
 
-			if ($context['show_perma_delete'])
-				echo '
+			if ($context['show_perma_delete']) {
+							echo '
 					<br>
 					<label for="perma_delete"><input type="checkbox" name="perma_delete" id="perma_delete" value="1">', $txt['deleteAccount_permanent'], ':</label>';
+			}
 
 			echo '
 				</div>';
@@ -2632,9 +2731,10 @@ 
 				<div>
 					<input type="submit" value="', $txt['delete'], '" class="button">';
 
-		if (!empty($context['token_check']))
-			echo '
+		if (!empty($context['token_check'])) {
+					echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+		}
 
 		echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2660,8 +2760,8 @@ 
 					<hr>';
 
 	// Only show the password box if it's actually needed.
-	if ($context['require_password'])
-		echo '
+	if ($context['require_password']) {
+			echo '
 					<dl class="settings">
 						<dt>
 							<strong', isset($context['modify_error']['bad_password']) || isset($context['modify_error']['no_password']) ? ' class="error"' : '', '>', $txt['current_password'], ': </strong><br>
@@ -2671,13 +2771,15 @@ 
 							<input type="password" name="oldpasswrd" size="20">
 						</dd>
 					</dl>';
+	}
 
 	echo '
 					<div class="righttext">';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 						<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 						<input type="submit" value="', $txt['change_profile'], '" class="button">
@@ -2704,9 +2806,10 @@ 
 			<ul id="list_errors">';
 
 		// Cycle through each error and display an error message.
-		foreach ($context['post_errors'] as $error)
-			echo '
+		foreach ($context['post_errors'] as $error) {
+					echo '
 				<li>', isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : $error, '</li>';
+		}
 
 		echo '
 			</ul>';
@@ -2732,12 +2835,13 @@ 
 								<select name="id_group" ', ($context['user']['is_owner'] && $context['member']['group_id'] == 1 ? 'onchange="if (this.value != 1 &amp;&amp; !confirm(\'' . $txt['deadmin_confirm'] . '\')) this.value = 1;"' : ''), '>';
 
 	// Fill the select box with all primary member groups that can be assigned to a member.
-	foreach ($context['member_groups'] as $member_group)
-		if (!empty($member_group['can_be_primary']))
+	foreach ($context['member_groups'] as $member_group) {
+			if (!empty($member_group['can_be_primary']))
 			echo '
 									<option value="', $member_group['id'], '"', $member_group['is_primary'] ? ' selected' : '', '>
 										', $member_group['name'], '
 									</option>';
+	}
 
 	echo '
 								</select>
@@ -2750,10 +2854,11 @@ 
 									<input type="hidden" name="additional_groups[]" value="0">';
 
 	// For each membergroup show a checkbox so members can be assigned to more than one group.
-	foreach ($context['member_groups'] as $member_group)
-		if ($member_group['can_be_additional'])
+	foreach ($context['member_groups'] as $member_group) {
+			if ($member_group['can_be_additional'])
 			echo '
 									<label for="additional_groups-', $member_group['id'], '"><input type="checkbox" name="additional_groups[]" value="', $member_group['id'], '" id="additional_groups-', $member_group['id'], '"', $member_group['is_additional'] ? ' checked' : '', '> ', $member_group['name'], '</label><br>';
+	}
 
 	echo '
 								</span>
@@ -2813,9 +2918,10 @@ 
 								<span class="smalltext">', $txt['sig_info'], '</span><br>
 								<br>';
 
-	if ($context['show_spellchecking'])
-		echo '
+	if ($context['show_spellchecking']) {
+			echo '
 								<input type="button" value="', $txt['spell_check'], '" onclick="spellCheck(\'creator\', \'signature\');" class="button">';
+	}
 
 	echo '
 							</dt>
@@ -2823,17 +2929,20 @@ 
 								<textarea class="editor" onkeyup="calcCharLeft();" id="signature" name="signature" rows="5" cols="50">', $context['member']['signature'], '</textarea><br>';
 
 	// If there is a limit at all!
-	if (!empty($context['signature_limits']['max_length']))
-		echo '
+	if (!empty($context['signature_limits']['max_length'])) {
+			echo '
 								<span class="smalltext">', sprintf($txt['max_sig_characters'], $context['signature_limits']['max_length']), ' <span id="signatureLeft">', $context['signature_limits']['max_length'], '</span></span><br>';
+	}
 
-	if (!empty($context['show_preview_button']))
-		echo '
+	if (!empty($context['show_preview_button'])) {
+			echo '
 								<input type="button" name="preview_signature" id="preview_button" value="', $txt['preview_signature'], '" class="button">';
+	}
 
-	if ($context['signature_warning'])
-		echo '
+	if ($context['signature_warning']) {
+			echo '
 								<span class="smalltext">', $context['signature_warning'], '</span>';
+	}
 
 	// Some javascript used to count how many characters have been used so far in the signature.
 	echo '
@@ -2878,9 +2987,10 @@ 
 										<select name="cat" id="cat" size="10" onchange="changeSel(\'\');" onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'server_stored\');">';
 
 		// This lists all the file categories.
-		foreach ($context['avatars'] as $avatar)
-			echo '
+		foreach ($context['avatars'] as $avatar) {
+					echo '
 											<option value="', $avatar['filename'] . ($avatar['is_dir'] ? '/' : ''), '"', ($avatar['checked'] ? ' selected' : ''), '>', $avatar['name'], '</option>';
+		}
 
 		echo '
 										</select>
@@ -2912,20 +3022,22 @@ 
 	}
 
 	// If the user can link to an off server avatar, show them a box to input the address.
-	if (!empty($context['member']['avatar']['allow_external']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_external'])) {
+			echo '
 								<div id="avatar_external">
 									<div class="smalltext">', $txt['avatar_by_url'], '</div>', !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_download_and_resize' ? template_max_size('external') : '', '
 									<input type="text" name="userpicpersonal" size="45" value="', ((stristr($context['member']['avatar']['external'], 'http://') || stristr($context['member']['avatar']['external'], 'https://')) ? $context['member']['avatar']['external'] : 'http://'), '" onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'external\');" onchange="if (typeof(previewExternalAvatar) != \'undefined\') previewExternalAvatar(this.value);">
 								</div>';
+	}
 
 	// If the user is able to upload avatars to the server show them an upload box.
-	if (!empty($context['member']['avatar']['allow_upload']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_upload'])) {
+			echo '
 								<div id="avatar_upload">
 									<input type="file" size="44" name="attachment" id="avatar_upload_box" value="" onchange="readfromUpload(this)"  onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'upload\');" accept="image/gif, image/jpeg, image/jpg, image/png">', template_max_size('upload'), '
 									', (!empty($context['member']['avatar']['id_attach']) ? '<br><img src="' . $context['member']['avatar']['href'] . (strpos($context['member']['avatar']['href'], '?') === false ? '?' : '&amp;') . 'time=' . time() . '" alt="" id="attached_image"><input type="hidden" name="id_attach" value="' . $context['member']['avatar']['id_attach'] . '">' : ''), '
 								</div>';
+	}
 
 	// if the user is able to use Gravatar avatars show then the image preview
 	if (!empty($context['member']['avatar']['allow_gravatar']))
@@ -2934,16 +3046,17 @@ 
 								<div id="avatar_gravatar">
 									<img src="' . $context['member']['avatar']['href'] . '" alt="">';
 
-		if (empty($modSettings['gravatarAllowExtraEmail']))
-			echo '
+		if (empty($modSettings['gravatarAllowExtraEmail'])) {
+					echo '
 									<div class="smalltext">', $txt['gravatar_noAlternateEmail'], '</div>';
-		else
+		} else
 		{
 			// Depending on other stuff, the stored value here might have some odd things in it from other areas.
-			if ($context['member']['avatar']['external'] == $context['member']['email'])
-				$textbox_value = '';
-			else
-				$textbox_value = $context['member']['avatar']['external'];
+			if ($context['member']['avatar']['external'] == $context['member']['email']) {
+							$textbox_value = '';
+			} else {
+							$textbox_value = $context['member']['avatar']['external'];
+			}
 
 			echo '
 									<div class="smalltext">', $txt['gravatar_alternateEmail'], '</div>
@@ -3015,8 +3128,9 @@ 
 	$h = !empty($modSettings['avatar_max_height_' . $type]) ? comma_format($modSettings['avatar_max_height_' . $type]) : 0;
 
 	$suffix = (!empty($w) ? 'w' : '') . (!empty($h) ? 'h' : '');
-	if (empty($suffix))
-		return;
+	if (empty($suffix)) {
+			return;
+	}
 
 	echo '
 								<div class="smalltext">', sprintf($txt['avatar_max_size_' . $suffix], $w, $h), '</div>';
@@ -3041,9 +3155,10 @@ 
 								<select name="easyformat" id="easyformat" onchange="document.forms.creator.time_format.value = this.options[this.selectedIndex].value;">';
 
 	// Help the user by showing a list of common time formats.
-	foreach ($context['easy_timeformats'] as $time_format)
-		echo '
+	foreach ($context['easy_timeformats'] as $time_format) {
+			echo '
 									<option value="', $time_format['format'], '"', $time_format['format'] == $context['member']['time_format'] ? ' selected' : '', '>', $time_format['title'], '</option>';
+	}
 
 	echo '
 								</select><br>
@@ -3081,9 +3196,10 @@ 
 							<dd>
 								<select name="smiley_set" id="smiley_set" onchange="document.getElementById(\'smileypr\').src = this.selectedIndex == 0 ? \'', $settings['images_url'], '/blank.png\' : \'', $modSettings['smileys_url'], '/\' + (this.selectedIndex != 1 ? this.options[this.selectedIndex].value : \'', !empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'], '\') + \'/smiley.gif\';">';
 
-	foreach ($context['smiley_sets'] as $set)
-		echo '
+	foreach ($context['smiley_sets'] as $set) {
+			echo '
 									<option value="', $set['id'], '"', $set['selected'] ? ' selected' : '', '>', $set['name'], '</option>';
+	}
 
 	echo '
 								</select>
@@ -3135,10 +3251,11 @@ 
 										<img src="', $context['tfa_qr_url'], '" alt="">
 									</div>';
 
-	if (!empty($context['from_ajax']))
-		echo '
+	if (!empty($context['from_ajax'])) {
+			echo '
 					<br>
 					<a href="javascript:self.close();"></a>';
+	}
 
 	echo '
 				</div>
@@ -3178,17 +3295,16 @@ 
 							</dt>
 							<dd>';
 
-	if (!$context['tfa_enabled'] && $context['user']['is_owner'])
-		echo '
+	if (!$context['tfa_enabled'] && $context['user']['is_owner']) {
+			echo '
 								<a href="', !empty($modSettings['force_ssl']) && $modSettings['force_ssl'] < 2 ? strtr($scripturl, array('http://' => 'https://')) : $scripturl, '?action=profile;area=tfasetup" id="enable_tfa">', $txt['tfa_profile_enable'], '</a>';
-
-	elseif (!$context['tfa_enabled'])
-		echo '
+	} elseif (!$context['tfa_enabled']) {
+			echo '
 								', $txt['tfa_profile_disabled'];
-
-	else
-		echo '
+	} else {
+			echo '
 								', sprintf($txt['tfa_profile_enabled'], $scripturl . '?action=profile;u=' . $context['id_member'] . ';area=tfasetup;disable');
+	}
 
 	echo '
 							</dd>';