SimpleMachines / SMF2.1

Sources/ManageSearchEngines.php

Braces +109 added lines, -77 removed lines

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

Sources/DbExtra-postgresql.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
 
-	$pg_tables = array('pg_catalog','information_schema');
+	$pg_tables = array('pg_catalog', 'information_schema');
 
 	$request = $smcFunc['db_query']('', '
 		SELECT pg_relation_size(C.oid) AS "size"
@@ -289,7 +289,7 @@ 
 {
 	static $ver;
 
-	if(!empty($ver))
+	if (!empty($ver))
 		return $ver;
 
 	global $smcFunc;

Braces +37 added lines, -27 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the functions implemented in this file to the $smcFunc array.
@@ -23,8 +24,8 @@ 
 {
 	global $smcFunc;
 
-	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table')
-		$smcFunc += array(
+	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table') {
+			$smcFunc += array(
 			'db_backup_table' => 'smf_db_backup_table',
 			'db_optimize_table' => 'smf_db_optimize_table',
 			'db_table_sql' => 'smf_db_table_sql',
@@ -32,7 +33,8 @@ 
 			'db_get_version' => 'smf_db_get_version',
 			'db_get_engine' => 'smf_db_get_engine',
 		);
-}
+	}
+	}
 
 /**
  * Backup $table to $backup_table.
@@ -48,13 +50,14 @@ 
 
 	// Do we need to drop it first?
 	$tables = smf_db_list_tables(false, $backup_table);
-	if (!empty($tables))
-		$smcFunc['db_query']('', '
+	if (!empty($tables)) {
+			$smcFunc['db_query']('', '
 			DROP TABLE {raw:backup_table}',
 			array(
 				'backup_table' => $backup_table,
 			)
 		);
+	}
 
 	/**
 	 * @todo Should we create backups of sequences as well?
@@ -117,8 +120,9 @@ 
 			)
 		);
 
-	if (!$request)
-		return -1;
+	if (!$request) {
+			return -1;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT pg_relation_size(C.oid) AS "size"
@@ -136,11 +140,12 @@ 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
-	if (isset($row['size']))
-			return ($old_size - $row['size']) / 1024;
-	else
-		return 0;
-}
+	if (isset($row['size'])) {
+				return ($old_size - $row['size']) / 1024;
+	} else {
+			return 0;
+	}
+	}
 
 /**
  * This function lists all tables in the database.
@@ -167,8 +172,9 @@ 
 	);
 
 	$tables = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$tables[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$tables[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $tables;
@@ -209,12 +215,14 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if ($row['data_type'] == 'character varying')
-			$row['data_type'] = 'varchar';
-		elseif ($row['data_type'] == 'character')
-			$row['data_type'] = 'char';
-		if ($row['character_maximum_length'])
-			$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+		if ($row['data_type'] == 'character varying') {
+					$row['data_type'] = 'varchar';
+		} elseif ($row['data_type'] == 'character') {
+					$row['data_type'] = 'char';
+		}
+		if ($row['character_maximum_length']) {
+					$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+		}
 
 		// Make the CREATE for this column.
 		$schema_create .= ' "' . $row['column_name'] . '" ' . $row['data_type'] . ($row['is_nullable'] != 'YES' ? ' NOT NULL' : '');
@@ -265,13 +273,14 @@ 
 	{
 		if ($row['is_primary'])
 		{
-			if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-				continue;
+			if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0) {
+							continue;
+			}
 
 			$index_create .= $crlf . 'ALTER TABLE ' . $tableName . ' ADD PRIMARY KEY ("' . $matches[1] . '");';
+		} else {
+					$index_create .= $crlf . $row['inddef'] . ';';
 		}
-		else
-			$index_create .= $crlf . $row['inddef'] . ';';
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -289,8 +298,9 @@ 
 {
 	static $ver;
 
-	if(!empty($ver))
-		return $ver;
+	if(!empty($ver)) {
+			return $ver;
+	}
 
 	global $smcFunc;
 

Sources/ManageScheduledTasks.php

Braces +54 added lines, -38 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Scheduled tasks management dispatcher. This function checks permissions and delegates
@@ -40,10 +41,11 @@ 
 	);
 
 	// We need to find what's the action.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $_REQUEST['sa'];
-	else
-		$context['sub_action'] = 'tasks';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $_REQUEST['sa'];
+	} else {
+			$context['sub_action'] = 'tasks';
+	}
 
 	// Now for the lovely tabs. That we all love.
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -90,9 +92,10 @@ 
 
 		// Enable and disable as required.
 		$enablers = array(0);
-		foreach ($_POST['enable_task'] as $id => $enabled)
-			if ($enabled)
+		foreach ($_POST['enable_task'] as $id => $enabled) {
+					if ($enabled)
 				$enablers[] = (int) $id;
+		}
 
 		// Do the update!
 		$smcFunc['db_query']('', '
@@ -130,8 +133,9 @@ 
 
 		// Lets figure out which ones they want to run.
 		$tasks = array();
-		foreach ($_POST['run_task'] as $task => $dummy)
-			$tasks[] = (int) $task;
+		foreach ($_POST['run_task'] as $task => $dummy) {
+					$tasks[] = (int) $task;
+		}
 
 		// Load up the tasks.
 		$request = $smcFunc['db_query']('', '
@@ -151,36 +155,41 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// What kind of task are we handling?
-			if (!empty($row['callable']))
-				$task_string = $row['callable'];
+			if (!empty($row['callable'])) {
+							$task_string = $row['callable'];
+			}
 
 			// Default SMF task or old mods?
-			elseif (function_exists('scheduled_' . $row['task']))
-				$task_string = 'scheduled_' . $row['task'];
+			elseif (function_exists('scheduled_' . $row['task'])) {
+							$task_string = 'scheduled_' . $row['task'];
+			}
 
 			// One last resource, the task name.
-			elseif (!empty($row['task']))
-				$task_string = $row['task'];
+			elseif (!empty($row['task'])) {
+							$task_string = $row['task'];
+			}
 
 			$start_time = microtime();
 			// The functions got to exist for us to use it.
-			if (empty($task_string))
-				continue;
+			if (empty($task_string)) {
+							continue;
+			}
 
 			// Try to stop a timeout, this would be bad...
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			// Get the callable.
 			$callable_task = call_helper($task_string, true);
 
 			// Perform the task.
-			if (!empty($callable_task))
-				$completed = call_user_func($callable_task);
-
-			else
-				$completed = false;
+			if (!empty($callable_task)) {
+							$completed = call_user_func($callable_task);
+			} else {
+							$completed = false;
+			}
 
 			// Log that we did it ;)
 			if ($completed)
@@ -197,8 +206,9 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If we had any errors, push them to session so we can pick them up next time to tell the user.
-		if (!empty($context['scheduled_errors']))
-			$_SESSION['st_error'] = $context['scheduled_errors'];
+		if (!empty($context['scheduled_errors'])) {
+					$_SESSION['st_error'] = $context['scheduled_errors'];
+		}
 
 		redirectexit('action=admin;area=scheduledtasks;done');
 	}
@@ -370,8 +380,9 @@ 
 	$context['server_time'] = timeformat(time(), false, 'server');
 
 	// Cleaning...
-	if (!isset($_GET['tid']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['tid'])) {
+			fatal_lang_error('no_access', false);
+	}
 	$_GET['tid'] = (int) $_GET['tid'];
 
 	// Saving?
@@ -387,10 +398,12 @@ 
 		preg_match('~(\d{1,2}):(\d{1,2})~', $_POST['offset'], $matches);
 
 		// If a half is empty then assume zero offset!
-		if (!isset($matches[2]) || $matches[2] > 59)
-			$matches[2] = 0;
-		if (!isset($matches[1]) || $matches[1] > 23)
-			$matches[1] = 0;
+		if (!isset($matches[2]) || $matches[2] > 59) {
+					$matches[2] = 0;
+		}
+		if (!isset($matches[1]) || $matches[1] > 23) {
+					$matches[1] = 0;
+		}
 
 		// Now the offset is easy; easy peasy - except we need to offset by a few hours...
 		$offset = $matches[1] * 3600 + $matches[2] * 60 - date('Z');
@@ -400,8 +413,9 @@ 
 		$unit = in_array(substr($_POST['unit'], 0, 1), array('m', 'h', 'd', 'w')) ? substr($_POST['unit'], 0, 1) : 'd';
 
 		// Don't allow one minute intervals.
-		if ($interval == 1 && $unit == 'm')
-			$interval = 2;
+		if ($interval == 1 && $unit == 'm') {
+					$interval = 2;
+		}
 
 		// Is it disabled?
 		$disabled = !isset($_POST['enabled']) ? 1 : 0;
@@ -439,8 +453,9 @@ 
 	);
 
 	// Should never, ever, happen!
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_access', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_access', false);
+	}
 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
@@ -598,13 +613,14 @@ 
 		)
 	);
 	$log_entries = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$log_entries[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$log_entries[] = array(
 			'id' => $row['id_log'],
 			'name' => isset($txt['scheduled_task_' . $row['task']]) ? $txt['scheduled_task_' . $row['task']] : $row['task'],
 			'time_run' => $row['time_run'],
 			'time_taken' => $row['time_taken'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $log_entries;

Sources/Class-Package.php

Indentation +2 added lines, -2 removed lines

@@ -793,7 +793,7 @@ 
 		if (!$this->connection)
 		{
 			$this->error = 'bad_server';
-            		$this->last_message = 'Invalid Server';
+					$this->last_message = 'Invalid Server';
 			return;
 		}
 
@@ -801,7 +801,7 @@ 
 		if (!$this->check_response(220))
 		{
 			$this->error = 'bad_response';
-		        $this->last_message = 'Bad Response';
+				$this->last_message = 'Bad Response';
 			return;
 		}
 

Braces +266 added lines, -199 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class xmlArray
@@ -65,8 +66,9 @@ 
 		}
 
 		// Is the input an array? (ie. passed from file()?)
-		if (is_array($data))
-			$data = implode('', $data);
+		if (is_array($data)) {
+					$data = implode('', $data);
+		}
 
 		// Remove any xml declaration or doctype, and parse out comments and CDATA.
 		$data = preg_replace('/<!--.*?-->/s', '', $this->_to_cdata(preg_replace(array('/^<\?xml.+?\?' . '>/is', '/<!DOCTYPE[^>]+?' . '>/s'), '', $data)));
@@ -101,8 +103,9 @@ 
 		// Get the element, in array form.
 		$array = $this->path($path);
 
-		if ($array === false)
-			return false;
+		if ($array === false) {
+					return false;
+		}
 
 		// Getting elements into this is a bit complicated...
 		if ($get_elements && !is_string($array))
@@ -113,8 +116,9 @@ 
 			foreach ($array->array as $val)
 			{
 				// Skip the name and any attributes.
-				if (is_array($val))
-					$temp .= $this->_xml($val, null);
+				if (is_array($val)) {
+									$temp .= $this->_xml($val, null);
+				}
 			}
 
 			// Just get the XML data and then take out the CDATAs.
@@ -156,32 +160,35 @@ 
 			elseif (substr($el, 0, 1) == '@')
 			{
 				// It simplifies things if the attribute is already there ;).
-				if (isset($array[$el]))
-					return $array[$el];
-				else
+				if (isset($array[$el])) {
+									return $array[$el];
+				} else
 				{
 					$trace = debug_backtrace();
 					$i = 0;
-					while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this))
-						$i++;
+					while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this)) {
+											$i++;
+					}
 					$debug = ' (from ' . $trace[$i - 1]['file'] . ' on line ' . $trace[$i - 1]['line'] . ')';
 
 					// Cause an error.
-					if ($this->debug_level & E_NOTICE)
-						trigger_error('Undefined XML attribute: ' . substr($el, 1) . $debug, E_USER_NOTICE);
+					if ($this->debug_level & E_NOTICE) {
+											trigger_error('Undefined XML attribute: ' . substr($el, 1) . $debug, E_USER_NOTICE);
+					}
 					return false;
 				}
+			} else {
+							$lvl = null;
 			}
-			else
-				$lvl = null;
 
 			// Find this element.
 			$array = $this->_path($array, $el, $lvl);
 		}
 
 		// Clean up after $lvl, for $return_full.
-		if ($return_full && (!isset($array['name']) || substr($array['name'], -1) != ']'))
-			$array = array('name' => $el . '[]', $array);
+		if ($return_full && (!isset($array['name']) || substr($array['name'], -1) != ']')) {
+					$array = array('name' => $el . '[]', $array);
+		}
 
 		// Create the right type of class...
 		$newClass = get_class($this);
@@ -216,10 +223,11 @@ 
 				$el = substr($el, 0, strpos($el, '['));
 			}
 			// Find an attribute.
-			elseif (substr($el, 0, 1) == '@')
-				return isset($array[$el]);
-			else
-				$lvl = null;
+			elseif (substr($el, 0, 1) == '@') {
+							return isset($array[$el]);
+			} else {
+							$lvl = null;
+			}
 
 			// Find this element.
 			$array = $this->_path($array, $el, $lvl, true);
@@ -244,8 +252,9 @@ 
 		$i = 0;
 		foreach ($temp->array as $item)
 		{
-			if (is_array($item))
-				$i++;
+			if (is_array($item)) {
+							$i++;
+			}
 		}
 
 		return $i;
@@ -269,8 +278,9 @@ 
 		foreach ($xml->array as $val)
 		{
 			// Skip these, they aren't elements.
-			if (!is_array($val) || $val['name'] == '!')
-				continue;
+			if (!is_array($val) || $val['name'] == '!') {
+							continue;
+			}
 
 			// Create the right type of class...
 			$newClass = get_class($this);
@@ -297,14 +307,16 @@ 
 			$path = $this->path($path);
 
 			// The path was not found
-			if ($path === false)
-				return false;
+			if ($path === false) {
+							return false;
+			}
 
 			$path = $path->array;
 		}
 		// Just use the current array.
-		else
-			$path = $this->array;
+		else {
+					$path = $this->array;
+		}
 
 		// Add the xml declaration to the front.
 		return '<?xml version="1.0"?' . '>' . $this->_xml($path, 0);
@@ -326,14 +338,16 @@ 
 			$path = $this->path($path);
 
 			// The path was not found
-			if ($path === false)
-				return false;
+			if ($path === false) {
+							return false;
+			}
 
 			$path = $path->array;
 		}
 		// No, so just use the current array.
-		else
-			$path = $this->array;
+		else {
+					$path = $this->array;
+		}
 
 		return $this->_array($path);
 	}
@@ -355,8 +369,9 @@ 
 		{
 			// Find and remove the next tag.
 			preg_match('/\A<([\w\-:]+)((?:\s+.+?)?)([\s]?\/)?' . '>/', $data, $match);
-			if (isset($match[0]))
-				$data = preg_replace('/' . preg_quote($match[0], '/') . '/s', '', $data, 1);
+			if (isset($match[0])) {
+							$data = preg_replace('/' . preg_quote($match[0], '/') . '/s', '', $data, 1);
+			}
 
 			// Didn't find a tag?  Keep looping....
 			if (!isset($match[1]) || $match[1] == '')
@@ -367,11 +382,12 @@ 
 					$text_value = $this->_from_cdata($data);
 					$data = '';
 
-					if ($text_value != '')
-						$current[] = array(
+					if ($text_value != '') {
+											$current[] = array(
 							'name' => '!',
 							'value' => $text_value
 						);
+					}
 				}
 				// If the < isn't immediately next to the current position... more data.
 				elseif (strpos($data, '<') > 0)
@@ -379,11 +395,12 @@ 
 					$text_value = $this->_from_cdata(substr($data, 0, strpos($data, '<')));
 					$data = substr($data, strpos($data, '<'));
 
-					if ($text_value != '')
-						$current[] = array(
+					if ($text_value != '') {
+											$current[] = array(
 							'name' => '!',
 							'value' => $text_value
 						);
+					}
 				}
 				// If we're looking at a </something> with no start, kill it.
 				elseif (strpos($data, '<') !== false && strpos($data, '<') == 0)
@@ -393,22 +410,23 @@ 
 						$text_value = $this->_from_cdata(substr($data, 0, strpos($data, '<', 1)));
 						$data = substr($data, strpos($data, '<', 1));
 
-						if ($text_value != '')
-							$current[] = array(
+						if ($text_value != '') {
+													$current[] = array(
 								'name' => '!',
 								'value' => $text_value
 							);
-					}
-					else
+						}
+					} else
 					{
 						$text_value = $this->_from_cdata($data);
 						$data = '';
 
-						if ($text_value != '')
-							$current[] = array(
+						if ($text_value != '') {
+													$current[] = array(
 								'name' => '!',
 								'value' => $text_value
 							);
+						}
 					}
 				}
 
@@ -425,8 +443,9 @@ 
 			{
 				// Because PHP 5.2.0+ seems to croak using regex, we'll have to do this the less fun way.
 				$last_tag_end = strpos($data, '</' . $match[1] . '>');
-				if ($last_tag_end === false)
-					continue;
+				if ($last_tag_end === false) {
+									continue;
+				}
 
 				$offset = 0;
 				while (1 == 1)
@@ -434,16 +453,17 @@ 
 					// Where is the next start tag?
 					$next_tag_start = strpos($data, '<' . $match[1], $offset);
 					// If the next start tag is after the last end tag then we've found the right close.
-					if ($next_tag_start === false || $next_tag_start > $last_tag_end)
-						break;
+					if ($next_tag_start === false || $next_tag_start > $last_tag_end) {
+											break;
+					}
 
 					// If not then find the next ending tag.
 					$next_tag_end = strpos($data, '</' . $match[1] . '>', $offset);
 
 					// Didn't find one? Then just use the last and sod it.
-					if ($next_tag_end === false)
-						break;
-					else
+					if ($next_tag_end === false) {
+											break;
+					} else
 					{
 						$last_tag_end = $next_tag_end;
 						$offset = $next_tag_start + 1;
@@ -457,16 +477,17 @@ 
 				if (!empty($inner_match))
 				{
 					// Parse the inner data.
-					if (strpos($inner_match, '<') !== false)
-						$el += $this->_parse($inner_match);
-					elseif (trim($inner_match) != '')
+					if (strpos($inner_match, '<') !== false) {
+											$el += $this->_parse($inner_match);
+					} elseif (trim($inner_match) != '')
 					{
 						$text_value = $this->_from_cdata($inner_match);
-						if ($text_value != '')
-							$el[] = array(
+						if ($text_value != '') {
+													$el[] = array(
 								'name' => '!',
 								'value' => $text_value
 							);
+						}
 					}
 				}
 			}
@@ -478,8 +499,9 @@ 
 				preg_match_all('/([\w:]+)="(.+?)"/', $match[2], $attr, PREG_SET_ORDER);
 
 				// Set them as @attribute-name.
-				foreach ($attr as $match_attr)
-					$el['@' . $match_attr[1]] = $match_attr[2];
+				foreach ($attr as $match_attr) {
+									$el['@' . $match_attr[1]] = $match_attr[2];
+				}
 			}
 		}
 
@@ -503,16 +525,18 @@ 
 		if (is_array($array) && !isset($array['name']))
 		{
 			$temp = '';
-			foreach ($array as $val)
-				$temp .= $this->_xml($val, $indent);
+			foreach ($array as $val) {
+							$temp .= $this->_xml($val, $indent);
+			}
 			return $temp;
 		}
 
 		// This is just text!
-		if ($array['name'] == '!')
-			return $indentation . '<![CDATA[' . $array['value'] . ']]>';
-		elseif (substr($array['name'], -2) == '[]')
-			$array['name'] = substr($array['name'], 0, -2);
+		if ($array['name'] == '!') {
+					return $indentation . '<![CDATA[' . $array['value'] . ']]>';
+		} elseif (substr($array['name'], -2) == '[]') {
+					$array['name'] = substr($array['name'], 0, -2);
+		}
 
 		// Start the element.
 		$output = $indentation . '<' . $array['name'];
@@ -523,9 +547,9 @@ 
 		// Run through and recursively output all the elements or attrbutes inside this.
 		foreach ($array as $k => $v)
 		{
-			if (substr($k, 0, 1) == '@')
-				$output .= ' ' . substr($k, 1) . '="' . $v . '"';
-			elseif (is_array($v))
+			if (substr($k, 0, 1) == '@') {
+							$output .= ' ' . substr($k, 1) . '="' . $v . '"';
+			} elseif (is_array($v))
 			{
 				$output_el .= $this->_xml($v, $indent === null ? null : $indent + 1);
 				$inside_elements = true;
@@ -533,10 +557,11 @@ 
 		}
 
 		// Indent, if necessary.... then close the tag.
-		if ($inside_elements)
-			$output .= '>' . $output_el . $indentation . '</' . $array['name'] . '>';
-		else
-			$output .= ' />';
+		if ($inside_elements) {
+					$output .= '>' . $output_el . $indentation . '</' . $array['name'] . '>';
+		} else {
+					$output .= ' />';
+		}
 
 		return $output;
 	}
@@ -553,19 +578,22 @@ 
 		$text = '';
 		foreach ($array as $value)
 		{
-			if (!is_array($value) || !isset($value['name']))
-				continue;
+			if (!is_array($value) || !isset($value['name'])) {
+							continue;
+			}
 
-			if ($value['name'] == '!')
-				$text .= $value['value'];
-			else
-				$return[$value['name']] = $this->_array($value);
+			if ($value['name'] == '!') {
+							$text .= $value['value'];
+			} else {
+							$return[$value['name']] = $this->_array($value);
+			}
 		}
 
-		if (empty($return))
-			return $text;
-		else
-			return $return;
+		if (empty($return)) {
+					return $text;
+		} else {
+					return $return;
+		}
 	}
 
 	/**
@@ -583,24 +611,28 @@ 
 		foreach ($parts as $part)
 		{
 			// Handle XML comments.
-			if (!$inCdata && $part === '<!--')
-				$inComment = true;
-			if ($inComment && $part === '-->')
-				$inComment = false;
-			elseif ($inComment)
-				continue;
+			if (!$inCdata && $part === '<!--') {
+							$inComment = true;
+			}
+			if ($inComment && $part === '-->') {
+							$inComment = false;
+			} elseif ($inComment) {
+							continue;
+			}
 
 			// Handle Cdata blocks.
-			elseif (!$inComment && $part === '<![CDATA[')
-				$inCdata = true;
-			elseif ($inCdata && $part === ']]>')
-				$inCdata = false;
-			elseif ($inCdata)
-				$output .= htmlentities($part, ENT_QUOTES);
+			elseif (!$inComment && $part === '<![CDATA[') {
+							$inCdata = true;
+			} elseif ($inCdata && $part === ']]>') {
+							$inCdata = false;
+			} elseif ($inCdata) {
+							$output .= htmlentities($part, ENT_QUOTES);
+			}
 
 			// Everything else is kept as is.
-			else
-				$output .= $part;
+			else {
+							$output .= $part;
+			}
 		}
 
 		return $output;
@@ -635,22 +667,26 @@ 
 	protected function _fetch($array)
 	{
 		// Don't return anything if this is just a string.
-		if (is_string($array))
-			return '';
+		if (is_string($array)) {
+					return '';
+		}
 
 		$temp = '';
 		foreach ($array as $text)
 		{
 			// This means it's most likely an attribute or the name itself.
-			if (!isset($text['name']))
-				continue;
+			if (!isset($text['name'])) {
+							continue;
+			}
 
 			// This is text!
-			if ($text['name'] == '!')
-				$temp .= $text['value'];
+			if ($text['name'] == '!') {
+							$temp .= $text['value'];
+			}
 			// Another element - dive in ;).
-			else
-				$temp .= $this->_fetch($text);
+			else {
+							$temp .= $this->_fetch($text);
+			}
 		}
 
 		// Return all the bits and pieces we've put together.
@@ -669,12 +705,14 @@ 
 	protected function _path($array, $path, $level, $no_error = false)
 	{
 		// Is $array even an array?  It might be false!
-		if (!is_array($array))
-			return false;
+		if (!is_array($array)) {
+					return false;
+		}
 
 		// Asking for *no* path?
-		if ($path == '' || $path == '.')
-			return $array;
+		if ($path == '' || $path == '.') {
+					return $array;
+		}
 		$paths = explode('|', $path);
 
 		// A * means all elements of any name.
@@ -685,16 +723,18 @@ 
 		// Check each element.
 		foreach ($array as $value)
 		{
-			if (!is_array($value) || $value['name'] === '!')
-				continue;
+			if (!is_array($value) || $value['name'] === '!') {
+							continue;
+			}
 
 			if ($show_all || in_array($value['name'], $paths))
 			{
 				// Skip elements before "the one".
-				if ($level !== null && $level > 0)
-					$level--;
-				else
-					$results[] = $value;
+				if ($level !== null && $level > 0) {
+									$level--;
+				} else {
+									$results[] = $value;
+				}
 			}
 		}
 
@@ -703,21 +743,25 @@ 
 		{
 			$trace = debug_backtrace();
 			$i = 0;
-			while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this))
-				$i++;
+			while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this)) {
+							$i++;
+			}
 			$debug = ' from ' . $trace[$i - 1]['file'] . ' on line ' . $trace[$i - 1]['line'];
 
 			// Cause an error.
-			if ($this->debug_level & E_NOTICE && !$no_error)
-				trigger_error('Undefined XML element: ' . $path . $debug, E_USER_NOTICE);
+			if ($this->debug_level & E_NOTICE && !$no_error) {
+							trigger_error('Undefined XML element: ' . $path . $debug, E_USER_NOTICE);
+			}
 			return false;
 		}
 		// Only one result.
-		elseif (count($results) == 1 || $level !== null)
-			return $results[0];
+		elseif (count($results) == 1 || $level !== null) {
+					return $results[0];
+		}
 		// Return the result set.
-		else
-			return $results + array('name' => $path . '[]');
+		else {
+					return $results + array('name' => $path . '[]');
+		}
 	}
 }
 
@@ -764,8 +808,9 @@ 
 		$this->error = false;
 		$this->pasv = array();
 
-		if ($ftp_server !== null)
-			$this->connect($ftp_server, $ftp_port, $ftp_user, $ftp_pass);
+		if ($ftp_server !== null) {
+					$this->connect($ftp_server, $ftp_port, $ftp_user, $ftp_pass);
+		}
 	}
 
 	/**
@@ -778,14 +823,16 @@ 
 	 */
 	public function connect($ftp_server, $ftp_port = 21, $ftp_user = 'anonymous', $ftp_pass = 'ftpclient@simplemachines.org')
 	{
-		if (strpos($ftp_server, 'ftp://') === 0)
-			$ftp_server = substr($ftp_server, 6);
-		elseif (strpos($ftp_server, 'ftps://') === 0)
-			$ftp_server = 'ssl://' . substr($ftp_server, 7);
-		if (strpos($ftp_server, 'http://') === 0)
-			$ftp_server = substr($ftp_server, 7);
-		elseif (strpos($ftp_server, 'https://') === 0)
-			$ftp_server = substr($ftp_server, 8);
+		if (strpos($ftp_server, 'ftp://') === 0) {
+					$ftp_server = substr($ftp_server, 6);
+		} elseif (strpos($ftp_server, 'ftps://') === 0) {
+					$ftp_server = 'ssl://' . substr($ftp_server, 7);
+		}
+		if (strpos($ftp_server, 'http://') === 0) {
+					$ftp_server = substr($ftp_server, 7);
+		} elseif (strpos($ftp_server, 'https://') === 0) {
+					$ftp_server = substr($ftp_server, 8);
+		}
 		$ftp_server = strtr($ftp_server, array('/' => '', ':' => '', '@' => ''));
 
 		// Connect to the FTP server.
@@ -834,12 +881,14 @@ 
 	 */
 	public function chdir($ftp_path)
 	{
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// No slash on the end, please...
-		if ($ftp_path !== '/' && substr($ftp_path, -1) === '/')
-			$ftp_path = substr($ftp_path, 0, -1);
+		if ($ftp_path !== '/' && substr($ftp_path, -1) === '/') {
+					$ftp_path = substr($ftp_path, 0, -1);
+		}
 
 		fwrite($this->connection, 'CWD ' . $ftp_path . "\r\n");
 		if (!$this->check_response(250))
@@ -860,11 +909,13 @@ 
 	 */
 	public function chmod($ftp_file, $chmod)
 	{
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
-		if ($ftp_file == '')
-			$ftp_file = '.';
+		if ($ftp_file == '') {
+					$ftp_file = '.';
+		}
 
 		// Do we have a file or a dir?
 		$is_dir = is_dir($ftp_file);
@@ -880,9 +931,7 @@ 
 			{
 				$is_writable = true;
 				break;
-			}
-
-			else
+			} else
 			{
 				// Convert the chmod value from octal (0777) to text ("777").
 				fwrite($this->connection, 'SITE CHMOD ' . decoct($val) . ' ' . $ftp_file . "\r\n");
@@ -905,8 +954,9 @@ 
 	public function unlink($ftp_file)
 	{
 		// We are actually connected, right?
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Delete file X.
 		fwrite($this->connection, 'DELE ' . $ftp_file . "\r\n");
@@ -935,9 +985,9 @@ 
 	{
 		// Wait for a response that isn't continued with -, but don't wait too long.
 		$time = time();
-		do
-			$this->last_message = fgets($this->connection, 1024);
-		while ((strlen($this->last_message) < 4 || strpos($this->last_message, ' ') === 0 || strpos($this->last_message, ' ', 3) !== 3) && time() - $time < 5);
+		do {
+					$this->last_message = fgets($this->connection, 1024);
+		} while ((strlen($this->last_message) < 4 || strpos($this->last_message, ' ') === 0 || strpos($this->last_message, ' ', 3) !== 3) && time() - $time < 5);
 
 		// Was the desired response returned?
 		return is_array($desired) ? in_array(substr($this->last_message, 0, 3), $desired) : substr($this->last_message, 0, 3) == $desired;
@@ -951,15 +1001,16 @@ 
 	public function passive()
 	{
 		// We can't create a passive data connection without a primary one first being there.
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Request a passive connection - this means, we'll talk to you, you don't talk to us.
 		@fwrite($this->connection, 'PASV' . "\r\n");
 		$time = time();
-		do
-			$response = fgets($this->connection, 1024);
-		while (strpos($response, ' ', 3) !== 3 && time() - $time < 5);
+		do {
+					$response = fgets($this->connection, 1024);
+		} while (strpos($response, ' ', 3) !== 3 && time() - $time < 5);
 
 		// If it's not 227, we weren't given an IP and port, which means it failed.
 		if (strpos($response, '227 ') !== 0)
@@ -990,12 +1041,14 @@ 
 	public function create_file($ftp_file)
 	{
 		// First, we have to be connected... very important.
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// I'd like one passive mode, please!
-		if (!$this->passive())
-			return false;
+		if (!$this->passive()) {
+					return false;
+		}
 
 		// Seems logical enough, so far...
 		fwrite($this->connection, 'STOR ' . $ftp_file . "\r\n");
@@ -1030,12 +1083,14 @@ 
 	public function list_dir($ftp_path = '', $search = false)
 	{
 		// Are we even connected...?
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Passive... non-agressive...
-		if (!$this->passive())
-			return false;
+		if (!$this->passive()) {
+					return false;
+		}
 
 		// Get the listing!
 		fwrite($this->connection, 'LIST -1' . ($search ? 'R' : '') . ($ftp_path == '' ? '' : ' ' . $ftp_path) . "\r\n");
@@ -1051,8 +1106,9 @@ 
 
 		// Read in the file listing.
 		$data = '';
-		while (!feof($fp))
-			$data .= fread($fp, 4096);
+		while (!feof($fp)) {
+					$data .= fread($fp, 4096);
+		}
 		fclose($fp);
 
 		// Everything go okay?
@@ -1074,21 +1130,23 @@ 
 	 */
 	public function locate($file, $listing = null)
 	{
-		if ($listing === null)
-			$listing = $this->list_dir('', true);
+		if ($listing === null) {
+					$listing = $this->list_dir('', true);
+		}
 		$listing = explode("\n", $listing);
 
 		@fwrite($this->connection, 'PWD' . "\r\n");
 		$time = time();
-		do
-			$response = fgets($this->connection, 1024);
-		while ($response[3] != ' ' && time() - $time < 5);
+		do {
+					$response = fgets($this->connection, 1024);
+		} while ($response[3] != ' ' && time() - $time < 5);
 
 		// Check for 257!
-		if (preg_match('~^257 "(.+?)" ~', $response, $match) != 0)
-			$current_dir = strtr($match[1], array('""' => '"'));
-		else
-			$current_dir = '';
+		if (preg_match('~^257 "(.+?)" ~', $response, $match) != 0) {
+					$current_dir = strtr($match[1], array('""' => '"'));
+		} else {
+					$current_dir = '';
+		}
 
 		for ($i = 0, $n = count($listing); $i < $n; $i++)
 		{
@@ -1101,12 +1159,15 @@ 
 			// Okay, this file's name is:
 			$listing[$i] = $current_dir . '/' . trim(strlen($listing[$i]) > 30 ? strrchr($listing[$i], ' ') : $listing[$i]);
 
-			if ($file[0] == '*' && substr($listing[$i], -(strlen($file) - 1)) == substr($file, 1))
-				return $listing[$i];
-			if (substr($file, -1) == '*' && substr($listing[$i], 0, strlen($file) - 1) == substr($file, 0, -1))
-				return $listing[$i];
-			if (basename($listing[$i]) == $file || $listing[$i] == $file)
-				return $listing[$i];
+			if ($file[0] == '*' && substr($listing[$i], -(strlen($file) - 1)) == substr($file, 1)) {
+							return $listing[$i];
+			}
+			if (substr($file, -1) == '*' && substr($listing[$i], 0, strlen($file) - 1) == substr($file, 0, -1)) {
+							return $listing[$i];
+			}
+			if (basename($listing[$i]) == $file || $listing[$i] == $file) {
+							return $listing[$i];
+			}
 		}
 
 		return false;
@@ -1121,8 +1182,9 @@ 
 	public function create_dir($ftp_dir)
 	{
 		// We must be connected to the server to do something.
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Make this new beautiful directory!
 		fwrite($this->connection, 'MKD ' . $ftp_dir . "\r\n");
@@ -1154,35 +1216,40 @@ 
 
 				$path = strtr($_SERVER['DOCUMENT_ROOT'], array('/home/' . $match[1] . '/' => '', '/home2/' . $match[1] . '/' => ''));
 
-				if (substr($path, -1) == '/')
-					$path = substr($path, 0, -1);
+				if (substr($path, -1) == '/') {
+									$path = substr($path, 0, -1);
+				}
 
-				if (strlen(dirname($_SERVER['PHP_SELF'])) > 1)
-					$path .= dirname($_SERVER['PHP_SELF']);
+				if (strlen(dirname($_SERVER['PHP_SELF'])) > 1) {
+									$path .= dirname($_SERVER['PHP_SELF']);
+				}
+			} elseif (strpos($filesystem_path, '/var/www/') === 0) {
+							$path = substr($filesystem_path, 8);
+			} else {
+							$path = strtr(strtr($filesystem_path, array('\\' => '/')), array($_SERVER['DOCUMENT_ROOT'] => ''));
 			}
-			elseif (strpos($filesystem_path, '/var/www/') === 0)
-				$path = substr($filesystem_path, 8);
-			else
-				$path = strtr(strtr($filesystem_path, array('\\' => '/')), array($_SERVER['DOCUMENT_ROOT'] => ''));
+		} else {
+					$path = '';
 		}
-		else
-			$path = '';
 
 		if (is_resource($this->connection) && $this->list_dir($path) == '')
 		{
 			$data = $this->list_dir('', true);
 
-			if ($lookup_file === null)
-				$lookup_file = $_SERVER['PHP_SELF'];
+			if ($lookup_file === null) {
+							$lookup_file = $_SERVER['PHP_SELF'];
+			}
 
 			$found_path = dirname($this->locate('*' . basename(dirname($lookup_file)) . '/' . basename($lookup_file), $data));
-			if ($found_path == false)
-				$found_path = dirname($this->locate(basename($lookup_file)));
-			if ($found_path != false)
-				$path = $found_path;
+			if ($found_path == false) {
+							$found_path = dirname($this->locate(basename($lookup_file)));
+			}
+			if ($found_path != false) {
+							$path = $found_path;
+			}
+		} elseif (is_resource($this->connection)) {
+					$found_path = true;
 		}
-		elseif (is_resource($this->connection))
-			$found_path = true;
 
 		return array($username, $path, isset($found_path));
 	}

Doc Comments +4 added lines, -4 removed lines

@@ -257,7 +257,7 @@ 
 	 * of elements, an array of xmlArray's is returned for use with foreach.
 	 * Example use:
 	 *  foreach ($xml->set('html/body/p') as $p)
-	 * @param $path string The path to search for.
+	 * @param string $path string The path to search for.
 	 * @return xmlArray[] An array of xmlArray objects
 	 */
 	public function set($path)
@@ -855,7 +855,7 @@ 
 	 * Changes a files atrributes (chmod)
 	 *
 	 * @param string $ftp_file The file to CHMOD
-	 * @param int|string $chmod The value for the CHMOD operation
+	 * @param integer $chmod The value for the CHMOD operation
 	 * @return boolean Whether or not the operation was successful
 	 */
 	public function chmod($ftp_file, $chmod)
@@ -1025,7 +1025,7 @@ 
 	 *
 	 * @param string $ftp_path The path to the directory
 	 * @param bool $search Whether or not to get a recursive directory listing
-	 * @return string|boolean The results of the command or false if unsuccessful
+	 * @return false|string The results of the command or false if unsuccessful
 	 */
 	public function list_dir($ftp_path = '', $search = false)
 	{
@@ -1070,7 +1070,7 @@ 
 	 *
 	 * @param string $file The name of a file
 	 * @param string $listing A directory listing or null to generate one
-	 * @return string|boolean The name of the file or false if it wasn't found
+	 * @return string|false The name of the file or false if it wasn't found
 	 */
 	public function locate($file, $listing = null)
 	{

Sources/Mentions.php

Braces +26 added lines, -18 removed lines

@@ -50,8 +50,8 @@ 
 			)
 		);
 		$members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member']] = array(
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member']] = array(
 				'id' => $row['id_member'],
 				'real_name' => $row['real_name'],
 				'email_address' => $row['email_address'],
@@ -62,6 +62,7 @@ 
 				),
 				'lngfile' => $row['lngfile'],
 			);
+		}
 		$smcFunc['db_free_result']($request);
 
 		return $members;
@@ -83,13 +84,14 @@ 
 
 		call_integration_hook('mention_insert_' . $content_type, array($content_id, &$members));
 
-		foreach ($members as $member)
-			$smcFunc['db_insert']('ignore',
+		foreach ($members as $member) {
+					$smcFunc['db_insert']('ignore',
 				'{db_prefix}mentions',
 				array('content_id' => 'int', 'content_type' => 'string', 'id_member' => 'int', 'id_mentioned' => 'int', 'time' => 'int'),
 				array((int) $content_id, $content_type, $id_member, $member['id'], time()),
 				array('content_id', 'content_type', 'id_mentioned')
 			);
+		}
 	}
 
 	/**
@@ -103,8 +105,9 @@ 
 	 */
 	public static function getBody($body, array $members)
 	{
-		foreach ($members as $member)
-			$body = str_ireplace(static::$char . $member['real_name'], '[member=' . $member['id'] . ']' . $member['real_name'] . '[/member]', $body);
+		foreach ($members as $member) {
+					$body = str_ireplace(static::$char . $member['real_name'], '[member=' . $member['id'] . ']' . $member['real_name'] . '[/member]', $body);
+		}
 
 		return $body;
 	}
@@ -123,8 +126,9 @@ 
 
 		$possible_names = self::getPossibleMentions($body);
 
-		if (empty($possible_names) || !allowedTo('mention'))
-			return array();
+		if (empty($possible_names) || !allowedTo('mention')) {
+					return array();
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_member, real_name
@@ -140,8 +144,9 @@ 
 		$members = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (stripos($body, static::$char . $row['real_name']) === false)
-				continue;
+			if (stripos($body, static::$char . $row['real_name']) === false) {
+							continue;
+			}
 
 			$members[$row['id_member']] = array(
 				'id' => $row['id_member'],
@@ -185,8 +190,9 @@ 
 		$body = htmlspecialchars_decode(preg_replace('~<br\s*/?\>~', "\n", str_replace('&nbsp;', ' ', $body)), ENT_QUOTES);
 
 		// Remove quotes, we don't want to get double mentions.
-		while (preg_match('~\[quote[^\]]*\](.+?)\[\/quote\]~s', $body))
-			$body = preg_replace('~\[quote[^\]]*\](.+?)\[\/quote\]~s', '', $body);
+		while (preg_match('~\[quote[^\]]*\](.+?)\[\/quote\]~s', $body)) {
+					$body = preg_replace('~\[quote[^\]]*\](.+?)\[\/quote\]~s', '', $body);
+		}
 
 		$matches = array();
 		$string = str_split($body);
@@ -197,9 +203,9 @@ 
 			{
 				$depth++;
 				$matches[] = array();
+			} elseif ($char == "\n") {
+							$depth = 0;
 			}
-			elseif ($char == "\n")
-				$depth = 0;
 
 			for ($i = $depth; $i > 0; $i--)
 			{
@@ -212,8 +218,9 @@ 
 			}
 		}
 
-		foreach ($matches as $k => $match)
-			$matches[$k] = substr(implode('', $match), 1);
+		foreach ($matches as $k => $match) {
+					$matches[$k] = substr(implode('', $match), 1);
+		}
 
 		// Names can have spaces, other breaks, or they can't...we try to match every possible
 		// combination.
@@ -223,8 +230,9 @@ 
 			$match = preg_split('/([^\w])/', $match, -1, PREG_SPLIT_DELIM_CAPTURE);
 			$count = count($match);
 			
-			for ($i = 1; $i <= $count; $i++)
-				$names[] = $smcFunc['htmlspecialchars']($smcFunc['htmltrim'](implode('', array_slice($match, 0, $i))));
+			for ($i = 1; $i <= $count; $i++) {
+							$names[] = $smcFunc['htmlspecialchars']($smcFunc['htmltrim'](implode('', array_slice($match, 0, $i))));
+			}
 		}
 
 		$names = array_unique($names);

Sources/ManageSettings.php

Spacing +15 added lines, -15 removed lines

@@ -1326,7 +1326,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						$isChecked = $rowData['disabled'] ? '' : ' checked';
 						$onClickHandler = $rowData['can_show_register'] ? sprintf(' onclick="document.getElementById(\'reg_%1$s\').disabled = !this.checked;"', $rowData['id']) : '';
@@ -1342,7 +1342,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						$isChecked = $rowData['on_register'] && !$rowData['disabled'] ? ' checked' : '';
 						$isDisabled = $rowData['can_show_register'] ? '' : ' disabled';
@@ -1389,15 +1389,15 @@ 
 					'value' => $txt['custom_profile_fieldorder'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($context, $txt, $scripturl)
+					'function' => function($rowData) use ($context, $txt, $scripturl)
 					{
-						$return = '<p class="centertext bold_text">'. $rowData['field_order'] .'<br />';
+						$return = '<p class="centertext bold_text">' . $rowData['field_order'] . '<br />';
 
 						if ($rowData['field_order'] > 1)
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="' . $txt['custom_edit_order_move'] . ' ' . $txt['custom_edit_order_up'] . '"></span></a>';
 
 						if ($rowData['field_order'] < $context['custFieldsMaxOrder'])
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="' . $txt['custom_edit_order_move'] . ' ' . $txt['custom_edit_order_down'] . '"></span></a>';
 
 						$return .= '</p>';
 
@@ -1415,7 +1415,7 @@ 
 					'value' => $txt['custom_profile_fieldname'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($scripturl)
+					'function' => function($rowData) use ($scripturl)
 					{
 						return sprintf('<a href="%1$s?action=admin;area=featuresettings;sa=profileedit;fid=%2$d">%3$s</a><div class="smalltext">%4$s</div>', $scripturl, $rowData['id_field'], $rowData['field_name'], $rowData['field_desc']);
 					},
@@ -1431,7 +1431,7 @@ 
 					'value' => $txt['custom_profile_fieldtype'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						$textKey = sprintf('custom_profile_type_%1$s', $rowData['field_type']);
 						return isset($txt[$textKey]) ? $txt[$textKey] : $textKey;
@@ -1449,7 +1449,7 @@ 
 					'value' => $txt['custom_profile_active'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return $rowData['active'] ? $txt['yes'] : $txt['no'];
 					},
@@ -1466,7 +1466,7 @@ 
 					'value' => $txt['custom_profile_placement'],
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						global $txt, $context;
 
@@ -1701,7 +1701,7 @@ 
 			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
 
 		// All good, proceed.
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = {int:old_order}
 			WHERE field_order = {int:new_order}',
@@ -1710,7 +1710,7 @@ 
 				'old_order' => $context['field']['order'],
 			)
 		);
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = {int:new_order}
 			WHERE id_field = {int:id_field}',
@@ -1812,7 +1812,7 @@ 
 			$smcFunc['db_free_result']($request);
 
 			$unique = false;
-			for ($i = 0; !$unique && $i < 9; $i ++)
+			for ($i = 0; !$unique && $i < 9; $i++)
 			{
 				if (!in_array($col_name, $current_fields))
 					$unique = true;
@@ -1985,7 +1985,7 @@ 
 		);
 
 		// Re-arrange the order.
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = field_order - 1
 			WHERE field_order > {int:current_order}',
@@ -2249,7 +2249,7 @@ 
 	$context['token_check'] = 'noti-admin';
 
 	// Specify our action since we'll want to post back here instead of the profile
-	$context['action'] = 'action=admin;area=featuresettings;sa=alerts;'. $context['session_var'] .'='. $context['session_id'];
+	$context['action'] = 'action=admin;area=featuresettings;sa=alerts;' . $context['session_var'] . '=' . $context['session_id'];
 
 	loadTemplate('Profile');
 	loadLanguage('Profile');

Braces +273 added lines, -199 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function makes sure the requested subaction does exists, if it doesn't, it sets a default action or.
@@ -205,16 +206,18 @@ 
 	{
 		$all_zones = timezone_identifiers_list();
 		// Make sure we set the value to the same as the printed value.
-		foreach ($all_zones as $zone)
-			$config_vars['default_timezone'][2][$zone] = $zone;
+		foreach ($all_zones as $zone) {
+					$config_vars['default_timezone'][2][$zone] = $zone;
+		}
+	} else {
+			unset($config_vars['default_timezone']);
 	}
-	else
-		unset($config_vars['default_timezone']);
 
 	call_integration_hook('integrate_modify_basic_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -222,8 +225,9 @@ 
 		checkSession();
 
 		// Prevent absurd boundaries here - make it a day tops.
-		if (isset($_POST['lastActive']))
-			$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
+		if (isset($_POST['lastActive'])) {
+					$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
+		}
 
 		call_integration_hook('integrate_save_basic_settings');
 
@@ -268,8 +272,9 @@ 
 
 	call_integration_hook('integrate_modify_bbc_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -286,13 +291,15 @@ 
 
 		// Clean up the tags.
 		$bbcTags = array();
-		foreach (parse_bbc(false) as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach (parse_bbc(false) as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
-		if (!isset($_POST['disabledBBC_enabledTags']))
-			$_POST['disabledBBC_enabledTags'] = array();
-		elseif (!is_array($_POST['disabledBBC_enabledTags']))
-			$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
+		if (!isset($_POST['disabledBBC_enabledTags'])) {
+					$_POST['disabledBBC_enabledTags'] = array();
+		} elseif (!is_array($_POST['disabledBBC_enabledTags'])) {
+					$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
+		}
 		// Work out what is actually disabled!
 		$_POST['disabledBBC'] = implode(',', array_diff($bbcTags, $_POST['disabledBBC_enabledTags']));
 
@@ -336,8 +343,9 @@ 
 
 	call_integration_hook('integrate_layout_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -378,8 +386,9 @@ 
 
 	call_integration_hook('integrate_likes_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -417,8 +426,9 @@ 
 
 	call_integration_hook('integrate_mentions_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -462,8 +472,8 @@ 
 			'enable' => array('check', 'warning_enable'),
 	);
 
-	if (!empty($modSettings['warning_settings']) && $currently_enabled)
-		$config_vars += array(
+	if (!empty($modSettings['warning_settings']) && $currently_enabled) {
+			$config_vars += array(
 			'',
 				array('int', 'warning_watch', 'subtext' => $txt['setting_warning_watch_note'] . ' ' . $txt['zero_to_disable']),
 				'moderate' => array('int', 'warning_moderate', 'subtext' => $txt['setting_warning_moderate_note'] . ' ' . $txt['zero_to_disable']),
@@ -472,15 +482,18 @@ 
 				'rem2' => array('int', 'warning_decrement', 'subtext' => $txt['setting_warning_decrement_note'] . ' ' . $txt['zero_to_disable']),
 				array('permissions', 'view_warning'),
 		);
+	}
 
 	call_integration_hook('integrate_warning_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Cannot use moderation if post moderation is not enabled.
-	if (!$modSettings['postmod_active'])
-		unset($config_vars['moderate']);
+	if (!$modSettings['postmod_active']) {
+			unset($config_vars['moderate']);
+	}
 
 	// Will need the utility functions from here.
 	require_once($sourcedir . '/ManageServer.php');
@@ -505,16 +518,16 @@ 
 				'warning_watch' => 10,
 				'warning_mute' => 60,
 			);
-			if ($modSettings['postmod_active'])
-				$vars['warning_moderate'] = 35;
+			if ($modSettings['postmod_active']) {
+							$vars['warning_moderate'] = 35;
+			}
 
 			foreach ($vars as $var => $value)
 			{
 				$config_vars[] = array('int', $var);
 				$_POST[$var] = $value;
 			}
-		}
-		else
+		} else
 		{
 			$_POST['warning_watch'] = min($_POST['warning_watch'], 100);
 			$_POST['warning_moderate'] = $modSettings['postmod_active'] ? min($_POST['warning_moderate'], 100) : 0;
@@ -595,8 +608,9 @@ 
 
 	call_integration_hook('integrate_spam_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// You need to be an admin to edit settings!
 	isAllowedTo('admin_forum');
@@ -630,8 +644,9 @@ 
 
 	if (empty($context['qa_by_lang'][strtr($language, array('-utf8' => ''))]) && !empty($context['question_answers']))
 	{
-		if (empty($context['settings_insert_above']))
-			$context['settings_insert_above'] = '';
+		if (empty($context['settings_insert_above'])) {
+					$context['settings_insert_above'] = '';
+		}
 
 		$context['settings_insert_above'] .= '<div class="noticebox">' . sprintf($txt['question_not_defined'], $context['languages'][$language]['name']) . '</div>';
 	}
@@ -674,8 +689,9 @@ 
 		$_POST['pm_spam_settings'] = (int) $_POST['max_pm_recipients'] . ',' . (int) $_POST['pm_posts_verification'] . ',' . (int) $_POST['pm_posts_per_hour'];
 
 		// Hack in guest requiring verification!
-		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha']))
-			$_POST['posts_require_captcha'] = -1;
+		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha'])) {
+					$_POST['posts_require_captcha'] = -1;
+		}
 
 		$save_vars = $config_vars;
 		unset($save_vars['pm1'], $save_vars['pm2'], $save_vars['pm3'], $save_vars['guest_verify']);
@@ -692,14 +708,16 @@ 
 		foreach ($context['qa_languages'] as $lang_id => $dummy)
 		{
 			// If we had some questions for this language before, but don't now, delete everything from that language.
-			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id]))
-				$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
+			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id])) {
+							$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
+			}
 
 			// Now step through and see if any existing questions no longer exist.
-			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)
 					if (empty($_POST['question'][$lang_id][$q_id]))
 						$changes['delete'][] = $q_id;
+			}
 
 			// Now let's see if there are new questions or ones that need updating.
 			if (isset($_POST['question'][$lang_id]))
@@ -708,14 +726,16 @@ 
 				{
 					// Ignore junky ids.
 					$q_id = (int) $q_id;
-					if ($q_id <= 0)
-						continue;
+					if ($q_id <= 0) {
+											continue;
+					}
 
 					// Check the question isn't empty (because they want to delete it?)
 					if (empty($question) || trim($question) == '')
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					$question = $smcFunc['htmlspecialchars'](trim($question));
@@ -723,19 +743,22 @@ 
 					// Get the answers. Firstly check there actually might be some.
 					if (!isset($_POST['answer'][$lang_id][$q_id]) || !is_array($_POST['answer'][$lang_id][$q_id]))
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					// Now get them and check that they might be viable.
 					$answers = array();
-					foreach ($_POST['answer'][$lang_id][$q_id] as $answer)
-						if (!empty($answer) && trim($answer) !== '')
+					foreach ($_POST['answer'][$lang_id][$q_id] as $answer) {
+											if (!empty($answer) && trim($answer) !== '')
 							$answers[] = $smcFunc['htmlspecialchars'](trim($answer));
+					}
 					if (empty($answers))
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					$answers = json_encode($answers);
@@ -745,16 +768,17 @@ 
 					{
 						// New question. Now, we don't want to randomly consume ids, so we'll set those, rather than trusting the browser's supplied ids.
 						$changes['insert'][] = array($lang_id, $question, $answers);
-					}
-					else
+					} else
 					{
 						// It's an existing question. Let's see what's changed, if anything.
-						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers'])
-							$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
+						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers']) {
+													$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
+						}
 					}
 
-					if (!isset($qs_per_lang[$lang_id]))
-						$qs_per_lang[$lang_id] = 0;
+					if (!isset($qs_per_lang[$lang_id])) {
+											$qs_per_lang[$lang_id] = 0;
+					}
 					$qs_per_lang[$lang_id]++;
 				}
 			}
@@ -804,8 +828,9 @@ 
 
 		// Lastly, the count of messages needs to be no more than the lowest number of questions for any one language.
 		$count_questions = empty($qs_per_lang) ? 0 : min($qs_per_lang);
-		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions)
-			$_POST['qa_verification_number'] = $count_questions;
+		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions) {
+					$_POST['qa_verification_number'] = $count_questions;
+		}
 
 		call_integration_hook('integrate_save_spam_settings', array(&$save_vars));
 
@@ -820,24 +845,27 @@ 
 
 	$character_range = array_merge(range('A', 'H'), array('K', 'M', 'N', 'P', 'R'), range('T', 'Y'));
 	$_SESSION['visual_verification_code'] = '';
-	for ($i = 0; $i < 6; $i++)
-		$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
+	for ($i = 0; $i < 6; $i++) {
+			$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
+	}
 
 	// Some javascript for CAPTCHA.
 	$context['settings_post_javascript'] = '';
-	if ($context['use_graphic_library'])
-		$context['settings_post_javascript'] .= '
+	if ($context['use_graphic_library']) {
+			$context['settings_post_javascript'] .= '
 		function refreshImages()
 		{
 			var imageType = document.getElementById(\'visual_verification_type\').value;
 			document.getElementById(\'verification_image\').src = \'' . $context['verification_image_href'] . ';type=\' + imageType;
 		}';
+	}
 
 	// Show the image itself, or text saying we can't.
-	if ($context['use_graphic_library'])
-		$config_vars['vv']['postinput'] = '<br><img src="' . $context['verification_image_href'] . ';type=' . (empty($modSettings['visual_verification_type']) ? 0 : $modSettings['visual_verification_type']) . '" alt="' . $txt['setting_image_verification_sample'] . '" id="verification_image"><br>';
-	else
-		$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
+	if ($context['use_graphic_library']) {
+			$config_vars['vv']['postinput'] = '<br><img src="' . $context['verification_image_href'] . ';type=' . (empty($modSettings['visual_verification_type']) ? 0 : $modSettings['visual_verification_type']) . '" alt="' . $txt['setting_image_verification_sample'] . '" id="verification_image"><br>';
+	} else {
+			$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
+	}
 
 	// Hack for PM spam settings.
 	list ($modSettings['max_pm_recipients'], $modSettings['pm_posts_verification'], $modSettings['pm_posts_per_hour']) = explode(',', $modSettings['pm_spam_settings']);
@@ -847,9 +875,10 @@ 
 	$modSettings['posts_require_captcha'] = !isset($modSettings['posts_require_captcha']) || $modSettings['posts_require_captcha'] == -1 ? 0 : $modSettings['posts_require_captcha'];
 
 	// Some minor javascript for the guest post setting.
-	if ($modSettings['posts_require_captcha'])
-		$context['settings_post_javascript'] .= '
+	if ($modSettings['posts_require_captcha']) {
+			$context['settings_post_javascript'] .= '
 		document.getElementById(\'guests_require_captcha\').disabled = true;';
+	}
 
 	// And everything else.
 	$context['post_url'] = $scripturl . '?action=admin;area=antispam;save';
@@ -896,8 +925,9 @@ 
 
 	call_integration_hook('integrate_signature_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template.
 	$context['page_title'] = $txt['signature_settings'];
@@ -952,8 +982,9 @@ 
 				$sig = strtr($row['signature'], array('<br>' => "\n"));
 
 				// Max characters...
-				if (!empty($sig_limits[1]))
-					$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
+				if (!empty($sig_limits[1])) {
+									$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
+				}
 				// Max lines...
 				if (!empty($sig_limits[2]))
 				{
@@ -963,8 +994,9 @@ 
 						if ($sig[$i] == "\n")
 						{
 							$count++;
-							if ($count >= $sig_limits[2])
-								$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+							if ($count >= $sig_limits[2]) {
+															$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+							}
 						}
 					}
 				}
@@ -975,17 +1007,19 @@ 
 					{
 						$limit_broke = 0;
 						// Attempt to allow all sizes of abuse, so to speak.
-						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7])
-							$limit_broke = $sig_limits[7] . 'px';
-						elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75))
-							$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
-						elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16))
-							$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
-						elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18)
-							$limit_broke = 'large';
-
-						if ($limit_broke)
-							$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7]) {
+													$limit_broke = $sig_limits[7] . 'px';
+						} elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75)) {
+													$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+						} elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16)) {
+													$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
+						} elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18) {
+													$limit_broke = 'large';
+						}
+
+						if ($limit_broke) {
+													$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+						}
 					}
 				}
 
@@ -1041,32 +1075,34 @@ 
 											$img_offset = false;
 										}
 									}
+								} else {
+																	$replaces[$image] = '';
 								}
-								else
-									$replaces[$image] = '';
 
 								continue;
 							}
 
 							// Does it have predefined restraints? Width first.
-							if ($matches[6][$key])
-								$matches[2][$key] = $matches[6][$key];
+							if ($matches[6][$key]) {
+															$matches[2][$key] = $matches[6][$key];
+							}
 							if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
 							{
 								$width = $sig_limits[5];
 								$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
+							} elseif ($matches[2][$key]) {
+															$width = $matches[2][$key];
 							}
-							elseif ($matches[2][$key])
-								$width = $matches[2][$key];
 							// ... and height.
 							if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
 							{
 								$height = $sig_limits[6];
-								if ($width != -1)
-									$width = $width * ($height / $matches[4][$key]);
+								if ($width != -1) {
+																	$width = $width * ($height / $matches[4][$key]);
+								}
+							} elseif ($matches[4][$key]) {
+															$height = $matches[4][$key];
 							}
-							elseif ($matches[4][$key])
-								$height = $matches[4][$key];
 
 							// If the dimensions are still not fixed - we need to check the actual image.
 							if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
@@ -1084,12 +1120,13 @@ 
 									if ($sizes[1] > $sig_limits[6] && $sig_limits[6])
 									{
 										$height = $sig_limits[6];
-										if ($width == -1)
-											$width = $sizes[0];
+										if ($width == -1) {
+																					$width = $sizes[0];
+										}
 										$width = $width * ($height / $sizes[1]);
+									} elseif ($width != -1) {
+																			$height = $sizes[1];
 									}
-									elseif ($width != -1)
-										$height = $sizes[1];
 								}
 							}
 
@@ -1102,8 +1139,9 @@ 
 							// Record that we got one.
 							$image_count_holder[$image] = isset($image_count_holder[$image]) ? $image_count_holder[$image] + 1 : 1;
 						}
-						if (!empty($replaces))
-							$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+						if (!empty($replaces)) {
+													$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+						}
 					}
 				}
 				// Try to fix disabled tags.
@@ -1115,18 +1153,20 @@ 
 
 				$sig = strtr($sig, array("\n" => '<br>'));
 				call_integration_hook('integrate_apply_signature_settings', array(&$sig, $sig_limits, $disabledTags));
-				if ($sig != $row['signature'])
-					$changes[$row['id_member']] = $sig;
+				if ($sig != $row['signature']) {
+									$changes[$row['id_member']] = $sig;
+				}
+			}
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							$done = true;
 			}
-			if ($smcFunc['db_num_rows']($request) == 0)
-				$done = true;
 			$smcFunc['db_free_result']($request);
 
 			// Do we need to delete what we have?
 			if (!empty($changes))
 			{
-				foreach ($changes as $id => $sig)
-					$smcFunc['db_query']('', '
+				foreach ($changes as $id => $sig) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}members
 						SET signature = {string:signature}
 						WHERE id_member = {int:id_member}',
@@ -1135,11 +1175,13 @@ 
 							'signature' => $sig,
 						)
 					);
+				}
 			}
 
 			$_GET['step'] += 50;
-			if (!$done)
-				pauseSignatureApplySettings();
+			if (!$done) {
+							pauseSignatureApplySettings();
+			}
 		}
 		$settings_applied = true;
 	}
@@ -1157,8 +1199,9 @@ 
 	);
 
 	// Temporarily make each setting a modSetting!
-	foreach ($context['signature_settings'] as $key => $value)
-		$modSettings['signature_' . $key] = $value;
+	foreach ($context['signature_settings'] as $key => $value) {
+			$modSettings['signature_' . $key] = $value;
+	}
 
 	// Make sure we check the right tags!
 	$modSettings['bbc_disabled_signature_bbc'] = $disabledTags;
@@ -1170,23 +1213,26 @@ 
 
 		// Clean up the tag stuff!
 		$bbcTags = array();
-		foreach (parse_bbc(false) as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach (parse_bbc(false) as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
-		if (!isset($_POST['signature_bbc_enabledTags']))
-			$_POST['signature_bbc_enabledTags'] = array();
-		elseif (!is_array($_POST['signature_bbc_enabledTags']))
-			$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
+		if (!isset($_POST['signature_bbc_enabledTags'])) {
+					$_POST['signature_bbc_enabledTags'] = array();
+		} elseif (!is_array($_POST['signature_bbc_enabledTags'])) {
+					$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
+		}
 
 		$sig_limits = array();
 		foreach ($context['signature_settings'] as $key => $value)
 		{
-			if ($key == 'allow_smileys')
-				continue;
-			elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys']))
-				$sig_limits[] = -1;
-			else
-				$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
+			if ($key == 'allow_smileys') {
+							continue;
+			} elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys'])) {
+							$sig_limits[] = -1;
+			} else {
+							$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
+			}
 		}
 
 		call_integration_hook('integrate_save_signature_settings', array(&$sig_limits, &$bbcTags));
@@ -1219,12 +1265,14 @@ 
 
 	// Try get more time...
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Have we exhausted all the time we allowed?
-	if (time() - array_sum(explode(' ', $sig_start)) < 3)
-		return;
+	if (time() - array_sum(explode(' ', $sig_start)) < 3) {
+			return;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=featuresettings;sa=sig;apply;step=' . $_GET['step'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -1270,9 +1318,10 @@ 
 		$disable_fields = array_flip($standard_fields);
 		if (!empty($_POST['active']))
 		{
-			foreach ($_POST['active'] as $value)
-				if (isset($disable_fields[$value]))
+			foreach ($_POST['active'] as $value) {
+							if (isset($disable_fields[$value]))
 					unset($disable_fields[$value]);
+			}
 		}
 		// What we have left!
 		$changes['disabled_profile_fields'] = empty($disable_fields) ? '' : implode(',', array_keys($disable_fields));
@@ -1281,16 +1330,18 @@ 
 		$reg_fields = array();
 		if (!empty($_POST['reg']))
 		{
-			foreach ($_POST['reg'] as $value)
-				if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
+			foreach ($_POST['reg'] as $value) {
+							if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
 					$reg_fields[] = $value;
+			}
 		}
 		// What we have left!
 		$changes['registration_fields'] = empty($reg_fields) ? '' : implode(',', $reg_fields);
 
 		$_SESSION['adm-save'] = true;
-		if (!empty($changes))
-			updateSettings($changes);
+		if (!empty($changes)) {
+					updateSettings($changes);
+		}
 	}
 
 	createToken('admin-scp');
@@ -1393,11 +1444,13 @@ 
 					{
 						$return = '<p class="centertext bold_text">'. $rowData['field_order'] .'<br />';
 
-						if ($rowData['field_order'] > 1)
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+						if ($rowData['field_order'] > 1) {
+													$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+						}
 
-						if ($rowData['field_order'] < $context['custFieldsMaxOrder'])
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+						if ($rowData['field_order'] < $context['custFieldsMaxOrder']) {
+													$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+						}
 
 						$return .= '</p>';
 
@@ -1535,16 +1588,16 @@ 
 		$disabled_fields = isset($modSettings['disabled_profile_fields']) ? explode(',', $modSettings['disabled_profile_fields']) : array();
 		$registration_fields = isset($modSettings['registration_fields']) ? explode(',', $modSettings['registration_fields']) : array();
 
-		foreach ($standard_fields as $field)
-			$list[] = array(
+		foreach ($standard_fields as $field) {
+					$list[] = array(
 				'id' => $field,
 				'label' => isset($txt['standard_profile_field_' . $field]) ? $txt['standard_profile_field_' . $field] : (isset($txt[$field]) ? $txt[$field] : $field),
 				'disabled' => in_array($field, $disabled_fields),
 				'on_register' => in_array($field, $registration_fields) && !in_array($field, $fields_no_registration),
 				'can_show_register' => !in_array($field, $fields_no_registration),
 			);
-	}
-	else
+		}
+	} else
 	{
 		// Load all the fields.
 		$request = $smcFunc['db_query']('', '
@@ -1558,8 +1611,9 @@ 
 				'items_per_page' => $items_per_page,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$list[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$list[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1625,9 +1679,9 @@ 
 		$context['field'] = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['field_type'] == 'textarea')
-				@list ($rows, $cols) = @explode(',', $row['default_value']);
-			else
+			if ($row['field_type'] == 'textarea') {
+							@list ($rows, $cols) = @explode(',', $row['default_value']);
+			} else
 			{
 				$rows = 3;
 				$cols = 30;
@@ -1663,8 +1717,8 @@ 
 	}
 
 	// Setup the default values as needed.
-	if (empty($context['field']))
-		$context['field'] = array(
+	if (empty($context['field'])) {
+			$context['field'] = array(
 			'name' => '',
 			'col_name' => '???',
 			'desc' => '',
@@ -1689,6 +1743,7 @@ 
 			'enclose' => '',
 			'placement' => 0,
 		);
+	}
 
 	// Are we moving it?
 	if (isset($_GET['move']) && in_array($smcFunc['htmlspecialchars']($_GET['move']), $move_to))
@@ -1697,8 +1752,10 @@ 
 		$new_order = ($_GET['move'] == 'up' ? ($context['field']['order'] - 1) : ($context['field']['order'] + 1));
 
 		// Is this a valid position?
-		if ($new_order <= 0 || $new_order > $order_count)
-			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
+		if ($new_order <= 0 || $new_order > $order_count) {
+					redirectexit('action=admin;area=featuresettings;sa=profile');
+		}
+		// @todo implement an error handler
 
 		// All good, proceed.
 		$smcFunc['db_query']('','
@@ -1729,12 +1786,14 @@ 
 		validateToken('admin-ecp');
 
 		// Everyone needs a name - even the (bracket) unknown...
-		if (trim($_POST['field_name']) == '')
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
+		if (trim($_POST['field_name']) == '') {
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
+		}
 
 		// Regex you say?  Do a very basic test to see if the pattern is valid
-		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false)
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
+		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false) {
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
+		}
 
 		$_POST['field_name'] = $smcFunc['htmlspecialchars']($_POST['field_name']);
 		$_POST['field_desc'] = $smcFunc['htmlspecialchars']($_POST['field_desc']);
@@ -1751,8 +1810,9 @@ 
 
 		// Some masking stuff...
 		$mask = isset($_POST['mask']) ? $_POST['mask'] : '';
-		if ($mask == 'regex' && isset($_POST['regex']))
-			$mask .= $_POST['regex'];
+		if ($mask == 'regex' && isset($_POST['regex'])) {
+					$mask .= $_POST['regex'];
+		}
 
 		$field_length = isset($_POST['max_length']) ? (int) $_POST['max_length'] : 255;
 		$enclose = isset($_POST['enclose']) ? $_POST['enclose'] : '';
@@ -1771,8 +1831,9 @@ 
 				$v = strtr($v, array(',' => ''));
 
 				// Nada, zip, etc...
-				if (trim($v) == '')
-					continue;
+				if (trim($v) == '') {
+									continue;
+				}
 
 				// Otherwise, save it boy.
 				$field_options .= $v . ',';
@@ -1780,15 +1841,17 @@ 
 				$newOptions[$k] = $v;
 
 				// Is it default?
-				if (isset($_POST['default_select']) && $_POST['default_select'] == $k)
-					$default = $v;
+				if (isset($_POST['default_select']) && $_POST['default_select'] == $k) {
+									$default = $v;
+				}
 			}
 			$field_options = substr($field_options, 0, -1);
 		}
 
 		// Text area has default has dimensions
-		if ($_POST['field_type'] == 'textarea')
-			$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
+		if ($_POST['field_type'] == 'textarea') {
+					$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
+		}
 
 		// Come up with the unique name?
 		if (empty($context['fid']))
@@ -1797,32 +1860,36 @@ 
 			preg_match('~([\w\d_-]+)~', $col_name, $matches);
 
 			// If there is nothing to the name, then let's start out own - for foreign languages etc.
-			if (isset($matches[1]))
-				$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
-			else
-				$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
+			if (isset($matches[1])) {
+							$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
+			} else {
+							$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
+			}
 
 			// Make sure this is unique.
 			$current_fields = array();
 			$request = $smcFunc['db_query']('', '
 				SELECT id_field, col_name
 				FROM {db_prefix}custom_fields');
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$current_fields[$row['id_field']] = $row['col_name'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$current_fields[$row['id_field']] = $row['col_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$unique = false;
 			for ($i = 0; !$unique && $i < 9; $i ++)
 			{
-				if (!in_array($col_name, $current_fields))
-					$unique = true;
-				else
-					$col_name = $initial_col_name . $i;
+				if (!in_array($col_name, $current_fields)) {
+									$unique = true;
+				} else {
+									$col_name = $initial_col_name . $i;
+				}
 			}
 
 			// Still not a unique column name? Leave it up to the user, then.
-			if (!$unique)
-				fatal_lang_error('custom_option_not_unique');
+			if (!$unique) {
+							fatal_lang_error('custom_option_not_unique');
+			}
 		}
 		// Work out what to do with the user data otherwise...
 		else
@@ -1850,8 +1917,9 @@ 
 				// Work out what's changed!
 				foreach ($context['field']['options'] as $k => $option)
 				{
-					if (trim($option) == '')
-						continue;
+					if (trim($option) == '') {
+											continue;
+					}
 
 					// Still exists?
 					if (in_array($option, $newOptions))
@@ -1865,8 +1933,8 @@ 
 				foreach ($optionChanges as $k => $option)
 				{
 					// Just been renamed?
-					if (!in_array($k, $takenKeys) && !empty($newOptions[$k]))
-						$smcFunc['db_query']('', '
+					if (!in_array($k, $takenKeys) && !empty($newOptions[$k])) {
+											$smcFunc['db_query']('', '
 							UPDATE {db_prefix}themes
 							SET value = {string:new_value}
 							WHERE variable = {string:current_column}
@@ -1879,6 +1947,7 @@ 
 								'old_value' => $option,
 							)
 						);
+					}
 				}
 			}
 			// @todo Maybe we should adjust based on new text length limits?
@@ -1921,8 +1990,8 @@ 
 			);
 
 			// Just clean up any old selects - these are a pain!
-			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions))
-				$smcFunc['db_query']('', '
+			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
 					WHERE variable = {string:current_column}
 						AND value NOT IN ({array_string:new_option_values})
@@ -1933,8 +2002,8 @@ 
 						'current_column' => $context['field']['col_name'],
 					)
 				);
-		}
-		else
+			}
+		} else
 		{
 			// Gotta figure it out the order.
 			$new_order = $order_count > 1 ? ($order_count + 1) : 1;
@@ -2108,11 +2177,13 @@ 
 	call_integration_hook('integrate_prune_settings', array(&$config_vars, &$prune_toggle, false));
 
 	$prune_toggle_dt = array();
-	foreach ($prune_toggle as $item)
-		$prune_toggle_dt[] = 'setting_' . $item;
+	foreach ($prune_toggle as $item) {
+			$prune_toggle_dt[] = 'setting_' . $item;
+	}
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	addInlineJavaScript('
 	function togglePruned()
@@ -2150,15 +2221,16 @@ 
 			$vals = array();
 			foreach ($config_vars as $index => $dummy)
 			{
-				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle))
-					continue;
+				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle)) {
+									continue;
+				}
 
 				$vals[] = empty($_POST[$dummy[1]]) || $_POST[$dummy[1]] < 0 ? 0 : (int) $_POST[$dummy[1]];
 			}
 			$_POST['pruningOptions'] = implode(',', $vals);
+		} else {
+					$_POST['pruningOptions'] = '';
 		}
-		else
-			$_POST['pruningOptions'] = '';
 
 		saveDBSettings($savevar);
 		$_SESSION['adm-save'] = true;
@@ -2170,10 +2242,11 @@ 
 	$context['sub_template'] = 'show_settings';
 
 	// Get the actual values
-	if (!empty($modSettings['pruningOptions']))
-		@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
-	else
-		$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+	if (!empty($modSettings['pruningOptions'])) {
+			@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+	} else {
+			$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+	}
 
 	prepareDBSettingContext($config_vars);
 }
@@ -2195,8 +2268,9 @@ 
 	// Make it even easier to add new settings.
 	call_integration_hook('integrate_general_mod_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=modsettings;save;sa=general';
 	$context['settings_title'] = $txt['mods_cat_modifications_misc'];

Sources/Class-CacheAPI.php

Braces +13 added lines, -9 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Interface cache_api_interface
@@ -186,8 +187,9 @@ 
 	{
 		global $cache_enable;
 
-		if ($test)
-			return true;
+		if ($test) {
+					return true;
+		}
 		return !empty($cache_enable);
 	}
 
@@ -206,10 +208,11 @@ 
 		global $boardurl, $cachedir;
 
 		// Set the default if no prefix was specified.
-		if (empty($prefix))
-			$this->prefix = md5($boardurl . filemtime($cachedir . '/' . 'index.php')) . '-SMF-';
-		else
-			$this->prefix = $prefix;
+		if (empty($prefix)) {
+					$this->prefix = md5($boardurl . filemtime($cachedir . '/' . 'index.php')) . '-SMF-';
+		} else {
+					$this->prefix = $prefix;
+		}
 
 		return true;
 	}
@@ -272,8 +275,9 @@ 
 
 		// Invalidate cache, to be sure!
 		// ... as long as index.php can be modified, anyway.
-		if (is_writable($cachedir . '/' . 'index.php'))
-			@touch($cachedir . '/' . 'index.php');
+		if (is_writable($cachedir . '/' . 'index.php')) {
+					@touch($cachedir . '/' . 'index.php');
+		}
 
 		return true;
 	}

Sources/Register.php

Braces +168 added lines, -122 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Begin the registration process.
@@ -29,19 +30,23 @@ 
 	global $language, $scripturl, $smcFunc, $sourcedir, $cur_profile;
 
 	// Is this an incoming AJAX check?
-	if (isset($_GET['sa']) && $_GET['sa'] == 'usernamecheck')
-		return RegisterCheckUsername();
+	if (isset($_GET['sa']) && $_GET['sa'] == 'usernamecheck') {
+			return RegisterCheckUsername();
+	}
 
 	// Check if the administrator has it disabled.
-	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == '3')
-		fatal_lang_error('registration_disabled', false);
+	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == '3') {
+			fatal_lang_error('registration_disabled', false);
+	}
 
 	// If this user is an admin - redirect them to the admin registration page.
-	if (allowedTo('moderate_forum') && !$user_info['is_guest'])
-		redirectexit('action=admin;area=regcenter;sa=register');
+	if (allowedTo('moderate_forum') && !$user_info['is_guest']) {
+			redirectexit('action=admin;area=regcenter;sa=register');
+	}
 	// You are not a guest, so you are a member - and members don't get to register twice!
-	elseif (empty($user_info['is_guest']))
-		redirectexit();
+	elseif (empty($user_info['is_guest'])) {
+			redirectexit();
+	}
 
 	loadLanguage('Login');
 	loadTemplate('Register');
@@ -82,16 +87,18 @@ 
 		}
 	}
 	// Make sure they don't squeeze through without agreeing.
-	elseif ($current_step > 1 && $context['require_agreement'] && !$context['registration_passed_agreement'])
-		$current_step = 1;
+	elseif ($current_step > 1 && $context['require_agreement'] && !$context['registration_passed_agreement']) {
+			$current_step = 1;
+	}
 
 	// Show the user the right form.
 	$context['sub_template'] = $current_step == 1 ? 'registration_agreement' : 'registration_form';
 	$context['page_title'] = $current_step == 1 ? $txt['registration_agreement'] : $txt['registration_form'];
 
 	// Kinda need this.
-	if ($context['sub_template'] == 'registration_form')
-		loadJavaScriptFile('register.js', array('defer' => false), 'smf_register');
+	if ($context['sub_template'] == 'registration_form') {
+			loadJavaScriptFile('register.js', array('defer' => false), 'smf_register');
+	}
 
 	// Add the register chain to the link tree.
 	$context['linktree'][] = array(
@@ -100,24 +107,26 @@ 
 	);
 
 	// Prepare the time gate! Do it like so, in case later steps want to reset the limit for any reason, but make sure the time is the current one.
-	if (!isset($_SESSION['register']))
-		$_SESSION['register'] = array(
+	if (!isset($_SESSION['register'])) {
+			$_SESSION['register'] = array(
 			'timenow' => time(),
 			'limit' => 10, // minimum number of seconds required on this page for registration
 		);
-	else
-		$_SESSION['register']['timenow'] = time();
+	} else {
+			$_SESSION['register']['timenow'] = time();
+	}
 
 	// If you have to agree to the agreement, it needs to be fetched from the file.
 	if ($context['require_agreement'])
 	{
 		// Have we got a localized one?
-		if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt'))
-			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
-		elseif (file_exists($boarddir . '/agreement.txt'))
-			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
-		else
-			$context['agreement'] = '';
+		if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt')) {
+					$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
+		} elseif (file_exists($boarddir . '/agreement.txt')) {
+					$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
+		} else {
+					$context['agreement'] = '';
+		}
 
 		// Nothing to show, lets disable registration and inform the admin of this error
 		if (empty($context['agreement']))
@@ -133,8 +142,9 @@ 
 		$selectedLanguage = empty($_SESSION['language']) ? $language : $_SESSION['language'];
 
 		// Do we have any languages?
-		if (empty($context['languages']))
-			getLanguages();
+		if (empty($context['languages'])) {
+					getLanguages();
+		}
 
 		// Try to find our selected language.
 		foreach ($context['languages'] as $key => $lang)
@@ -142,8 +152,9 @@ 
 			$context['languages'][$key]['name'] = strtr($lang['name'], array('-utf8' => ''));
 
 			// Found it!
-			if ($selectedLanguage == $lang['filename'])
-				$context['languages'][$key]['selected'] = true;
+			if ($selectedLanguage == $lang['filename']) {
+							$context['languages'][$key]['selected'] = true;
+			}
 		}
 	}
 
@@ -167,9 +178,10 @@ 
 		$reg_fields = explode(',', $modSettings['registration_fields']);
 
 		// We might have had some submissions on this front - go check.
-		foreach ($reg_fields as $field)
-			if (isset($_POST[$field]))
+		foreach ($reg_fields as $field) {
+					if (isset($_POST[$field]))
 				$cur_profile[$field] = $smcFunc['htmlspecialchars']($_POST[$field]);
+		}
 
 		// Load all the fields in question.
 		setupProfileContext($reg_fields);
@@ -186,8 +198,9 @@ 
 		$context['visual_verification_id'] = $verificationOptions['id'];
 	}
 	// Otherwise we have nothing to show.
-	else
-		$context['visual_verification'] = false;
+	else {
+			$context['visual_verification'] = false;
+	}
 
 
 	$context += array(
@@ -198,8 +211,9 @@ 
 
 	// Were there any errors?
 	$context['registration_errors'] = array();
-	if (!empty($reg_errors))
-		$context['registration_errors'] = $reg_errors;
+	if (!empty($reg_errors)) {
+			$context['registration_errors'] = $reg_errors;
+	}
 
 	createToken('register');
 }
@@ -216,27 +230,32 @@ 
 	validateToken('register');
 
 	// Check to ensure we're forcing SSL for authentication
-	if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
-		fatal_lang_error('register_ssl_required');
+	if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) {
+			fatal_lang_error('register_ssl_required');
+	}
 
 	// Start collecting together any errors.
 	$reg_errors = array();
 
 	// You can't register if it's disabled.
-	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3)
-		fatal_lang_error('registration_disabled', false);
+	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3) {
+			fatal_lang_error('registration_disabled', false);
+	}
 
 	// Well, if you don't agree, you can't register.
-	if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed']))
-		redirectexit();
+	if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed'])) {
+			redirectexit();
+	}
 
 	// Make sure they came from *somewhere*, have a session.
-	if (!isset($_SESSION['old_url']))
-		redirectexit('action=signup');
+	if (!isset($_SESSION['old_url'])) {
+			redirectexit('action=signup');
+	}
 
 	// If we don't require an agreement, we need a extra check for coppa.
-	if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge']))
-		$_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']);
+	if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge'])) {
+			$_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']);
+	}
 	// Are they under age, and under age users are banned?
 	if (!empty($modSettings['coppaAge']) && empty($modSettings['coppaType']) && empty($_SESSION['skip_coppa']))
 	{
@@ -245,8 +264,9 @@ 
 	}
 
 	// Check the time gate for miscreants. First make sure they came from somewhere that actually set it up.
-	if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit']))
-		redirectexit('action=signup');
+	if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit'])) {
+			redirectexit('action=signup');
+	}
 	// Failing that, check the time on it.
 	if (time() - $_SESSION['register']['timenow'] < $_SESSION['register']['limit'])
 	{
@@ -266,15 +286,17 @@ 
 		if (is_array($context['visual_verification']))
 		{
 			loadLanguage('Errors');
-			foreach ($context['visual_verification'] as $error)
-				$reg_errors[] = $txt['error_' . $error];
+			foreach ($context['visual_verification'] as $error) {
+							$reg_errors[] = $txt['error_' . $error];
+			}
 		}
 	}
 
 	foreach ($_POST as $key => $value)
 	{
-		if (!is_array($_POST[$key]))
-			$_POST[$key] = htmltrim__recursive(str_replace(array("\n", "\r"), '', $_POST[$key]));
+		if (!is_array($_POST[$key])) {
+					$_POST[$key] = htmltrim__recursive(str_replace(array("\n", "\r"), '', $_POST[$key]));
+		}
 	}
 
 	// Collect all extra registration fields someone might have filled in.
@@ -304,12 +326,14 @@ 
 		$reg_fields = explode(',', $modSettings['registration_fields']);
 
 		// Website is a little different
-		if (in_array('website', $reg_fields))
-			$possible_strings += array('website_url', 'website_title');
+		if (in_array('website', $reg_fields)) {
+					$possible_strings += array('website_url', 'website_title');
+		}
 	}
 
-	if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '')
-		$_POST['secret_answer'] = md5($_POST['secret_answer']);
+	if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '') {
+			$_POST['secret_answer'] = md5($_POST['secret_answer']);
+	}
 
 	// Needed for isReservedName() and registerMember().
 	require_once($sourcedir . '/Subs-Members.php');
@@ -318,32 +342,37 @@ 
 	if (isset($_POST['real_name']) && (allowedTo('profile_displayed_name') || allowedTo('moderate_forum')))
 	{
 		$_POST['real_name'] = trim(preg_replace('~[\t\n\r \x0B\0' . ($context['utf8'] ? '\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}' : '\x00-\x08\x0B\x0C\x0E-\x19\xA0') . ']+~' . ($context['utf8'] ? 'u' : ''), ' ', $_POST['real_name']));
-		if (trim($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60)
-			$possible_strings[] = 'real_name';
+		if (trim($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60) {
+					$possible_strings[] = 'real_name';
+		}
 	}
 
 	// Handle a string as a birthdate...
-	if (isset($_POST['birthdate']) && $_POST['birthdate'] != '')
-		$_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate']));
+	if (isset($_POST['birthdate']) && $_POST['birthdate'] != '') {
+			$_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate']));
+	}
 	// Or birthdate parts...
-	elseif (!empty($_POST['bday1']) && !empty($_POST['bday2']))
-		$_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']);
+	elseif (!empty($_POST['bday1']) && !empty($_POST['bday2'])) {
+			$_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']);
+	}
 
 	// Validate the passed language file.
 	if (isset($_POST['lngfile']) && !empty($modSettings['userLanguage']))
 	{
 		// Do we have any languages?
-		if (empty($context['languages']))
-			getLanguages();
+		if (empty($context['languages'])) {
+					getLanguages();
+		}
 
 		// Did we find it?
-		if (isset($context['languages'][$_POST['lngfile']]))
-			$_SESSION['language'] = $_POST['lngfile'];
-		else
+		if (isset($context['languages'][$_POST['lngfile']])) {
+					$_SESSION['language'] = $_POST['lngfile'];
+		} else {
+					unset($_POST['lngfile']);
+		}
+	} else {
 			unset($_POST['lngfile']);
 	}
-	else
-		unset($_POST['lngfile']);
 
 	// Set the options needed for registration.
 	$regOptions = array(
@@ -363,22 +392,27 @@ 
 	);
 
 	// Include the additional options that might have been filled in.
-	foreach ($possible_strings as $var)
-		if (isset($_POST[$var]))
+	foreach ($possible_strings as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = $smcFunc['htmlspecialchars']($_POST[$var], ENT_QUOTES);
-	foreach ($possible_ints as $var)
-		if (isset($_POST[$var]))
+	}
+	foreach ($possible_ints as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = (int) $_POST[$var];
-	foreach ($possible_floats as $var)
-		if (isset($_POST[$var]))
+	}
+	foreach ($possible_floats as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = (float) $_POST[$var];
-	foreach ($possible_bools as $var)
-		if (isset($_POST[$var]))
+	}
+	foreach ($possible_bools as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = empty($_POST[$var]) ? 0 : 1;
+	}
 
 	// Registration options are always default options...
-	if (isset($_POST['default_options']))
-		$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
+	if (isset($_POST['default_options'])) {
+			$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
+	}
 	$regOptions['theme_vars'] = isset($_POST['options']) && is_array($_POST['options']) ? $_POST['options'] : array();
 
 	// Make sure they are clean, dammit!
@@ -398,12 +432,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Don't allow overriding of the theme variables.
-		if (isset($regOptions['theme_vars'][$row['col_name']]))
-			unset($regOptions['theme_vars'][$row['col_name']]);
+		if (isset($regOptions['theme_vars'][$row['col_name']])) {
+					unset($regOptions['theme_vars'][$row['col_name']]);
+		}
 
 		// Not actually showing it then?
-		if (!$row['show_reg'])
-			continue;
+		if (!$row['show_reg']) {
+					continue;
+		}
 
 		// Prepare the value!
 		$value = isset($_POST['customfield'][$row['col_name']]) ? trim($_POST['customfield'][$row['col_name']]) : '';
@@ -412,24 +448,27 @@ 
 		if (!in_array($row['field_type'], array('check', 'select', 'radio')))
 		{
 			// Is it too long?
-			if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value))
-				$custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length']));
+			if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value)) {
+							$custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length']));
+			}
 
 			// Any masks to apply?
 			if ($row['field_type'] == 'text' && !empty($row['mask']) && $row['mask'] != 'none')
 			{
-				if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255))
-					$custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name']));
-				elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value))
-					$custom_field_errors[] = array('custom_field_not_number', array($row['field_name']));
-				elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0)
-					$custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name']));
+				if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255)) {
+									$custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name']));
+				} elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value)) {
+									$custom_field_errors[] = array('custom_field_not_number', array($row['field_name']));
+				} elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0) {
+									$custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name']));
+				}
 			}
 		}
 
 		// Is this required but not there?
-		if (trim($value) == '' && $row['show_reg'] > 1)
-			$custom_field_errors[] = array('custom_field_empty', array($row['field_name']));
+		if (trim($value) == '' && $row['show_reg'] > 1) {
+					$custom_field_errors[] = array('custom_field_empty', array($row['field_name']));
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -437,8 +476,9 @@ 
 	if (!empty($custom_field_errors))
 	{
 		loadLanguage('Errors');
-		foreach ($custom_field_errors as $error)
-			$reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]);
+		foreach ($custom_field_errors as $error) {
+					$reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]);
+		}
 	}
 
 	// Lets check for other errors before trying to register the member.
@@ -483,8 +523,9 @@ 
 	}
 
 	// If COPPA has been selected then things get complicated, setup the template.
-	if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa']))
-		redirectexit('action=coppa;member=' . $memberID);
+	if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa'])) {
+			redirectexit('action=coppa;member=' . $memberID);
+	}
 	// Basic template variable setup.
 	elseif (!empty($modSettings['registration_method']))
 	{
@@ -496,8 +537,7 @@ 
 			'sub_template' => 'after',
 			'description' => $modSettings['registration_method'] == 2 ? $txt['approval_after_registration'] : $txt['activate_after_registration']
 		);
-	}
-	else
+	} else
 	{
 		call_integration_hook('integrate_activate', array($regOptions['username']));
 
@@ -517,16 +557,18 @@ 
 	global $context, $txt, $modSettings, $scripturl, $sourcedir, $smcFunc, $language, $user_info;
 
 	// Logged in users should not bother to activate their accounts
-	if (!empty($user_info['id']))
-		redirectexit();
+	if (!empty($user_info['id'])) {
+			redirectexit();
+	}
 
 	loadLanguage('Login');
 	loadTemplate('Login');
 
 	if (empty($_REQUEST['u']) && empty($_POST['user']))
 	{
-		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3')
-			fatal_lang_error('no_access', false);
+		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3') {
+					fatal_lang_error('no_access', false);
+		}
 
 		$context['member_id'] = 0;
 		$context['sub_template'] = 'resend';
@@ -566,11 +608,13 @@ 
 	// Change their email address? (they probably tried a fake one first :P.)
 	if (isset($_POST['new_email'], $_REQUEST['passwd']) && hash_password($row['member_name'], $_REQUEST['passwd']) == $row['passwd'] && ($row['is_activated'] == 0 || $row['is_activated'] == 2))
 	{
-		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3)
-			fatal_lang_error('no_access', false);
+		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3) {
+					fatal_lang_error('no_access', false);
+		}
 
-		if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL))
-			fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false);
+		if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL)) {
+					fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false);
+		}
 
 		// Make sure their email isn't banned.
 		isBannedEmail($_POST['new_email'], 'cannot_register', $txt['ban_register_prohibited']);
@@ -586,8 +630,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) != 0)
-			fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email'])));
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email'])));
+		}
 		$smcFunc['db_free_result']($request);
 
 		updateMemberData($row['id_member'], array('email_address' => $_POST['new_email']));
@@ -625,9 +670,9 @@ 
 	// Quit if this code is not right.
 	if (empty($_REQUEST['code']) || $row['validation_code'] != $_REQUEST['code'])
 	{
-		if (!empty($row['is_activated']))
-			fatal_lang_error('already_activated', false);
-		elseif ($row['validation_code'] == '')
+		if (!empty($row['is_activated'])) {
+					fatal_lang_error('already_activated', false);
+		} elseif ($row['validation_code'] == '')
 		{
 			loadLanguage('Profile');
 			fatal_error(sprintf($txt['registration_not_approved'], $scripturl . '?action=activate;user=' . $row['member_name']), false);
@@ -677,8 +722,9 @@ 
 	loadTemplate('Register');
 
 	// No User ID??
-	if (!isset($_GET['member']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['member'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Get the user details...
 	$request = $smcFunc['db_query']('', '
@@ -691,8 +737,9 @@ 
 			'is_coppa' => 5,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_access', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_access', false);
+	}
 	list ($username) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -730,8 +777,7 @@ 
 			echo $data;
 			obExit(false);
 		}
-	}
-	else
+	} else
 	{
 		$context += array(
 			'page_title' => $txt['coppa_title'],
@@ -784,8 +830,9 @@ 
 	{
 		require_once($sourcedir . '/Subs-Graphics.php');
 
-		if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code))
-			header('HTTP/1.1 400 Bad Request');
+		if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code)) {
+					header('HTTP/1.1 400 Bad Request');
+		}
 
 		// Otherwise just show a pre-defined letter.
 		elseif (isset($_REQUEST['letter']))
@@ -803,14 +850,13 @@ 
 			header('Content-Type: image/gif');
 			die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
 		}
-	}
-
-	elseif ($_REQUEST['format'] === '.wav')
+	} elseif ($_REQUEST['format'] === '.wav')
 	{
 		require_once($sourcedir . '/Subs-Sound.php');
 
-		if (!createWaveFile($code))
-			header('HTTP/1.1 400 Bad Request');
+		if (!createWaveFile($code)) {
+					header('HTTP/1.1 400 Bad Request');
+		}
 	}
 
 	// We all die one day...

Sources/ManagePermissions.php

Braces +312 added lines, -223 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Dispatches to the right function based on the given subaction.
@@ -176,8 +177,9 @@ 
 		// If it's inherited, just add it as a child.
 		if ($row['id_parent'] != -2)
 		{
-			if (isset($context['groups'][$row['id_parent']]))
-				$context['groups'][$row['id_parent']]['children'][$row['id_group']] = $row['group_name'];
+			if (isset($context['groups'][$row['id_parent']])) {
+							$context['groups'][$row['id_parent']]['children'][$row['id_group']] = $row['group_name'];
+			}
 			continue;
 		}
 
@@ -202,10 +204,11 @@ 
 			'access' => false,
 		);
 
-		if ($row['min_posts'] == -1)
-			$normalGroups[$row['id_group']] = $row['id_group'];
-		else
-			$postGroups[$row['id_group']] = $row['id_group'];
+		if ($row['min_posts'] == -1) {
+					$normalGroups[$row['id_group']] = $row['id_group'];
+		} else {
+					$postGroups[$row['id_group']] = $row['id_group'];
+		}
 	}
 	$smcFunc['db_free_result']($query);
 
@@ -221,8 +224,9 @@ 
 				'post_group_list' => $postGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -238,8 +242,9 @@ 
 				'normal_group_list' => $normalGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 
 		// This one is slower, but it's okay... careful not to count twice!
@@ -256,15 +261,17 @@ 
 				'blank_string' => '',
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
 	foreach ($context['groups'] as $id => $data)
 	{
-		if ($data['href'] != '')
-			$context['groups'][$id]['link'] = '<a href="' . $data['href'] . '">' . $data['num_members'] . '</a>';
+		if ($data['href'] != '') {
+					$context['groups'][$id]['link'] = '<a href="' . $data['href'] . '">' . $data['num_members'] . '</a>';
+		}
 	}
 
 	if (empty($_REQUEST['pid']))
@@ -278,9 +285,10 @@ 
 				'hidden_permissions' => !empty($context['hidden_permissions']) ? $context['hidden_permissions'] : array(),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
 				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] = $row['num_permissions'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Get the "default" profile permissions too.
@@ -297,17 +305,18 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
-				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1)) {
+							$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		$_REQUEST['pid'] = (int) $_REQUEST['pid'];
 
-		if (!isset($context['profiles'][$_REQUEST['pid']]))
-			fatal_lang_error('no_access', false);
+		if (!isset($context['profiles'][$_REQUEST['pid']])) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// Change the selected tab to better reflect that this really is a board profile.
 		$context[$context['admin_menu_name']]['current_subsection'] = 'profiles';
@@ -323,8 +332,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
-				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1)) {
+							$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -366,8 +376,8 @@ 
 
 		if (!empty($changes))
 		{
-			foreach ($changes as $profile => $boards)
-				$smcFunc['db_query']('', '
+			foreach ($changes as $profile => $boards) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET id_profile = {int:current_profile}
 					WHERE id_board IN ({array_int:board_list})',
@@ -376,6 +386,7 @@ 
 						'current_profile' => $profile,
 					)
 				);
+			}
 		}
 
 		$context['edit_all'] = false;
@@ -400,8 +411,9 @@ 
 		);
 		foreach ($boardList[$catid] as $boardid)
 		{
-			if (!isset($context['profiles'][$boards[$boardid]['profile']]))
-				$boards[$boardid]['profile'] = 1;
+			if (!isset($context['profiles'][$boards[$boardid]['profile']])) {
+							$boards[$boardid]['profile'] = 1;
+			}
 
 			$context['categories'][$catid]['boards'][$boardid] = array(
 				'id' => &$boards[$boardid]['id'],
@@ -433,64 +445,74 @@ 
 	loadIllegalGuestPermissions();
 
 	// Make sure only one of the quick options was selected.
-	if ((!empty($_POST['predefined']) && ((isset($_POST['copy_from']) && $_POST['copy_from'] != 'empty') || !empty($_POST['permissions']))) || (!empty($_POST['copy_from']) && $_POST['copy_from'] != 'empty' && !empty($_POST['permissions'])))
-		fatal_lang_error('permissions_only_one_option', false);
+	if ((!empty($_POST['predefined']) && ((isset($_POST['copy_from']) && $_POST['copy_from'] != 'empty') || !empty($_POST['permissions']))) || (!empty($_POST['copy_from']) && $_POST['copy_from'] != 'empty' && !empty($_POST['permissions']))) {
+			fatal_lang_error('permissions_only_one_option', false);
+	}
 
-	if (empty($_POST['group']) || !is_array($_POST['group']))
-		$_POST['group'] = array();
+	if (empty($_POST['group']) || !is_array($_POST['group'])) {
+			$_POST['group'] = array();
+	}
 
 	// Only accept numeric values for selected membergroups.
-	foreach ($_POST['group'] as $id => $group_id)
-		$_POST['group'][$id] = (int) $group_id;
+	foreach ($_POST['group'] as $id => $group_id) {
+			$_POST['group'][$id] = (int) $group_id;
+	}
 	$_POST['group'] = array_unique($_POST['group']);
 
-	if (empty($_REQUEST['pid']))
-		$_REQUEST['pid'] = 0;
-	else
-		$_REQUEST['pid'] = (int) $_REQUEST['pid'];
+	if (empty($_REQUEST['pid'])) {
+			$_REQUEST['pid'] = 0;
+	} else {
+			$_REQUEST['pid'] = (int) $_REQUEST['pid'];
+	}
 
 	// Fix up the old global to the new default!
 	$bid = max(1, $_REQUEST['pid']);
 
 	// No modifying the predefined profiles.
-	if ($_REQUEST['pid'] > 1 && $_REQUEST['pid'] < 5)
-		fatal_lang_error('no_access', false);
+	if ($_REQUEST['pid'] > 1 && $_REQUEST['pid'] < 5) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Clear out any cached authority.
 	updateSettings(array('settings_updated' => time()));
 
 	// No groups where selected.
-	if (empty($_POST['group']))
-		redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+	if (empty($_POST['group'])) {
+			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+	}
 
 	// Set a predefined permission profile.
 	if (!empty($_POST['predefined']))
 	{
 		// Make sure it's a predefined permission set we expect.
-		if (!in_array($_POST['predefined'], array('restrict', 'standard', 'moderator', 'maintenance')))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!in_array($_POST['predefined'], array('restrict', 'standard', 'moderator', 'maintenance'))) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		foreach ($_POST['group'] as $group_id)
 		{
-			if (!empty($_REQUEST['pid']))
-				setPermissionLevel($_POST['predefined'], $group_id, $_REQUEST['pid']);
-			else
-				setPermissionLevel($_POST['predefined'], $group_id);
+			if (!empty($_REQUEST['pid'])) {
+							setPermissionLevel($_POST['predefined'], $group_id, $_REQUEST['pid']);
+			} else {
+							setPermissionLevel($_POST['predefined'], $group_id);
+			}
 		}
 	}
 	// Set a permission profile based on the permissions of a selected group.
 	elseif ($_POST['copy_from'] != 'empty')
 	{
 		// Just checking the input.
-		if (!is_numeric($_POST['copy_from']))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!is_numeric($_POST['copy_from'])) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		// Make sure the group we're copying to is never included.
 		$_POST['group'] = array_diff($_POST['group'], array($_POST['copy_from']));
 
 		// No groups left? Too bad.
-		if (empty($_POST['group']))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (empty($_POST['group'])) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		if (empty($_REQUEST['pid']))
 		{
@@ -504,22 +526,26 @@ 
 				)
 			);
 			$target_perm = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$target_perm[$row['permission']] = $row['add_deny'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$target_perm[$row['permission']] = $row['add_deny'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$inserts = array();
-			foreach ($_POST['group'] as $group_id)
-				foreach ($target_perm as $perm => $add_deny)
+			foreach ($_POST['group'] as $group_id) {
+							foreach ($target_perm as $perm => $add_deny)
 				{
 					// No dodgy permissions please!
 					if (!empty($context['illegal_permissions']) && in_array($perm, $context['illegal_permissions']))
 						continue;
-					if ($group_id == -1 && in_array($perm, $context['non_guest_permissions']))
-						continue;
+			}
+					if ($group_id == -1 && in_array($perm, $context['non_guest_permissions'])) {
+											continue;
+					}
 
-					if ($group_id != 1 && $group_id != 3)
-						$inserts[] = array($perm, $group_id, $add_deny);
+					if ($group_id != 1 && $group_id != 3) {
+											$inserts[] = array($perm, $group_id, $add_deny);
+					}
 				}
 
 			// Delete the previous permissions...
@@ -559,17 +585,19 @@ 
 			)
 		);
 		$target_perm = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$target_perm[$row['permission']] = $row['add_deny'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$target_perm[$row['permission']] = $row['add_deny'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$inserts = array();
-		foreach ($_POST['group'] as $group_id)
-			foreach ($target_perm as $perm => $add_deny)
+		foreach ($_POST['group'] as $group_id) {
+					foreach ($target_perm as $perm => $add_deny)
 			{
 				// Are these for guests?
 				if ($group_id == -1 && in_array($perm, $context['non_guest_permissions']))
 					continue;
+		}
 
 				$inserts[] = array($perm, $group_id, $bid, $add_deny);
 			}
@@ -607,13 +635,14 @@ 
 		list ($permissionType, $permission) = explode('/', $_POST['permissions']);
 
 		// Check whether our input is within expected range.
-		if (!in_array($_POST['add_remove'], array('add', 'clear', 'deny')) || !in_array($permissionType, array('membergroup', 'board')))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!in_array($_POST['add_remove'], array('add', 'clear', 'deny')) || !in_array($permissionType, array('membergroup', 'board'))) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		if ($_POST['add_remove'] == 'clear')
 		{
-			if ($permissionType == 'membergroup')
-				$smcFunc['db_query']('', '
+			if ($permissionType == 'membergroup') {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}permissions
 					WHERE id_group IN ({array_int:current_group_list})
 						AND permission = {string:current_permission}
@@ -624,8 +653,8 @@ 
 						'illegal_permissions' => !empty($context['illegal_permissions']) ? $context['illegal_permissions'] : array(),
 					)
 				);
-			else
-				$smcFunc['db_query']('', '
+			} else {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}board_permissions
 					WHERE id_group IN ({array_int:current_group_list})
 						AND id_profile = {int:current_profile}
@@ -636,6 +665,7 @@ 
 						'current_permission' => $permission,
 					)
 				);
+			}
 		}
 		// Add a permission (either 'set' or 'deny').
 		else
@@ -644,32 +674,36 @@ 
 			$permChange = array();
 			foreach ($_POST['group'] as $groupID)
 			{
-				if ($groupID == -1 && in_array($permission, $context['non_guest_permissions']))
-					continue;
+				if ($groupID == -1 && in_array($permission, $context['non_guest_permissions'])) {
+									continue;
+				}
 
-				if ($permissionType == 'membergroup' && $groupID != 1 && $groupID != 3 && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions'])))
-					$permChange[] = array($permission, $groupID, $add_deny);
-				elseif ($permissionType != 'membergroup')
-					$permChange[] = array($permission, $groupID, $bid, $add_deny);
+				if ($permissionType == 'membergroup' && $groupID != 1 && $groupID != 3 && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions']))) {
+									$permChange[] = array($permission, $groupID, $add_deny);
+				} elseif ($permissionType != 'membergroup') {
+									$permChange[] = array($permission, $groupID, $bid, $add_deny);
+				}
 			}
 
 			if (!empty($permChange))
 			{
-				if ($permissionType == 'membergroup')
-					$smcFunc['db_insert']('replace',
+				if ($permissionType == 'membergroup') {
+									$smcFunc['db_insert']('replace',
 						'{db_prefix}permissions',
 						array('permission' => 'string', 'id_group' => 'int', 'add_deny' => 'int'),
 						$permChange,
 						array('permission', 'id_group')
 					);
+				}
 				// Board permissions go into the other table.
-				else
-					$smcFunc['db_insert']('replace',
+				else {
+									$smcFunc['db_insert']('replace',
 						'{db_prefix}board_permissions',
 						array('permission' => 'string', 'id_group' => 'int', 'id_profile' => 'int', 'add_deny' => 'int'),
 						$permChange,
 						array('permission', 'id_group', 'id_profile')
 					);
+				}
 			}
 		}
 
@@ -687,14 +721,16 @@ 
 {
 	global $context, $txt, $smcFunc, $modSettings;
 
-	if (!isset($_GET['group']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['group'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$context['group']['id'] = (int) $_GET['group'];
 
 	// It's not likely you'd end up here with this setting disabled.
-	if ($_GET['group'] == 1)
-		redirectexit('action=admin;area=permissions');
+	if ($_GET['group'] == 1) {
+			redirectexit('action=admin;area=permissions');
+	}
 
 	loadAllPermissions();
 	loadPermissionProfiles();
@@ -715,13 +751,14 @@ 
 		$smcFunc['db_free_result']($result);
 
 		// Cannot edit an inherited group!
-		if ($parent != -2)
-			fatal_lang_error('cannot_edit_permissions_inherited');
+		if ($parent != -2) {
+					fatal_lang_error('cannot_edit_permissions_inherited');
+		}
+	} elseif ($context['group']['id'] == -1) {
+			$context['group']['name'] = $txt['membergroups_guests'];
+	} else {
+			$context['group']['name'] = $txt['membergroups_members'];
 	}
-	elseif ($context['group']['id'] == -1)
-		$context['group']['name'] = $txt['membergroups_guests'];
-	else
-		$context['group']['name'] = $txt['membergroups_members'];
 
 	$context['profile']['id'] = empty($_GET['pid']) ? 0 : (int) $_GET['pid'];
 
@@ -767,8 +804,9 @@ 
 				'current_group' => $_GET['group'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$permissions['membergroup'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$permissions['membergroup'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+		}
 		$smcFunc['db_free_result']($result);
 	}
 
@@ -783,8 +821,9 @@ 
 			'current_profile' => $context['permission_type'] == 'membergroup' ? 1 : $context['profile']['id'],
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$permissions['board'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$permissions['board'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	}
 	$smcFunc['db_free_result']($result);
 
 	// Loop through each permission and set whether it's checked.
@@ -803,9 +842,9 @@ 
 					{
 						$curPerm['any']['select'] = in_array($perm['id'] . '_any', $permissions[$permissionType]['allowed']) ? 'on' : (in_array($perm['id'] . '_any', $permissions[$permissionType]['denied']) ? 'deny' : 'off');
 						$curPerm['own']['select'] = in_array($perm['id'] . '_own', $permissions[$permissionType]['allowed']) ? 'on' : (in_array($perm['id'] . '_own', $permissions[$permissionType]['denied']) ? 'deny' : 'off');
+					} else {
+											$curPerm['select'] = in_array($perm['id'], $permissions[$permissionType]['denied']) ? 'deny' : (in_array($perm['id'], $permissions[$permissionType]['allowed']) ? 'on' : 'off');
 					}
-					else
-						$curPerm['select'] = in_array($perm['id'], $permissions[$permissionType]['denied']) ? 'deny' : (in_array($perm['id'], $permissions[$permissionType]['allowed']) ? 'on' : 'off');
 
 						// Keep the last value if it's hidden.
 						if ($perm['hidden'] || $permissionArray['hidden'])
@@ -822,13 +861,13 @@ 
 									$perm['any']['id'],
 									$curPerm['any']['select'] == 'deny' && !empty($modSettings['permission_enable_deny']) ? 'deny' : $curPerm['any']['select'],
 								);
-							}
-							else
-								$context['hidden_perms'][] = array(
+							} else {
+															$context['hidden_perms'][] = array(
 									$permissionType,
 									$perm['id'],
 									$curPerm['select'] == 'deny' && !empty($modSettings['permission_enable_deny']) ? 'deny' : $curPerm['select'],
 								);
+							}
 						}
 				}
 			}
@@ -856,13 +895,14 @@ 
 	$_GET['pid'] = (int) $_GET['pid'];
 
 	// Cannot modify predefined profiles.
-	if ($_GET['pid'] > 1 && $_GET['pid'] < 5)
-		fatal_lang_error('no_access', false);
+	if ($_GET['pid'] > 1 && $_GET['pid'] < 5) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Verify this isn't inherited.
-	if ($_GET['group'] == -1 || $_GET['group'] == 0)
-		$parent = -2;
-	else
+	if ($_GET['group'] == -1 || $_GET['group'] == 0) {
+			$parent = -2;
+	} else
 	{
 		$result = $smcFunc['db_query']('', '
 			SELECT id_parent
@@ -877,8 +917,9 @@ 
 		$smcFunc['db_free_result']($result);
 	}
 
-	if ($parent != -2)
-		fatal_lang_error('cannot_edit_permissions_inherited');
+	if ($parent != -2) {
+			fatal_lang_error('cannot_edit_permissions_inherited');
+	}
 
 	$givePerms = array('membergroup' => array(), 'board' => array());
 
@@ -896,12 +937,13 @@ 
 		{
 			if (is_array($perm_array))
 			{
-				foreach ($perm_array as $permission => $value)
-					if ($value == 'on' || $value == 'deny')
+				foreach ($perm_array as $permission => $value) {
+									if ($value == 'on' || $value == 'deny')
 					{
 						// Don't allow people to escalate themselves!
 						if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions']))
 							continue;
+				}
 
 						$givePerms[$perm_type][] = array($_GET['group'], $permission, $value == 'deny' ? 0 : 1);
 					}
@@ -946,8 +988,9 @@ 
 	);
 	if (!empty($givePerms['board']))
 	{
-		foreach ($givePerms['board'] as $k => $v)
-			$givePerms['board'][$k][] = $profileid;
+		foreach ($givePerms['board'] as $k => $v) {
+					$givePerms['board'][$k][] = $profileid;
+		}
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}board_permissions',
 			array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int', 'id_profile' => 'int'),
@@ -988,8 +1031,9 @@ 
 
 	call_integration_hook('integrate_modify_permission_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['page_title'] = $txt['permission_settings_title'];
 	$context['sub_template'] = 'show_settings';
@@ -1040,8 +1084,9 @@ 
 					'min_posts' => -1,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$post_groups[] = $row['id_group'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$post_groups[] = $row['id_group'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			// Remove'em.
@@ -1250,16 +1295,19 @@ 
 	// Make sure we're not granting someone too many permissions!
 	foreach ($groupLevels['global'][$level] as $k => $permission)
 	{
-		if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions']))
-			unset($groupLevels['global'][$level][$k]);
+		if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions'])) {
+					unset($groupLevels['global'][$level][$k]);
+		}
 
-		if ($group == -1 && in_array($permission, $context['non_guest_permissions']))
-			unset($groupLevels['global'][$level][$k]);
+		if ($group == -1 && in_array($permission, $context['non_guest_permissions'])) {
+					unset($groupLevels['global'][$level][$k]);
+		}
 	}
-	if ($group == -1)
-		foreach ($groupLevels['board'][$level] as $k => $permission)
+	if ($group == -1) {
+			foreach ($groupLevels['board'][$level] as $k => $permission)
 			if (in_array($permission, $context['non_guest_permissions']))
 				unset($groupLevels['board'][$level][$k]);
+	}
 
 	// Reset all cached permissions.
 	updateSettings(array('settings_updated' => time()));
@@ -1269,8 +1317,9 @@ 
 	{
 		$group = (int) $group;
 
-		if (empty($groupLevels['global'][$level]))
-			return;
+		if (empty($groupLevels['global'][$level])) {
+					return;
+		}
 
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}permissions
@@ -1292,8 +1341,9 @@ 
 		);
 
 		$groupInserts = array();
-		foreach ($groupLevels['global'][$level] as $permission)
-			$groupInserts[] = array($group, $permission);
+		foreach ($groupLevels['global'][$level] as $permission) {
+					$groupInserts[] = array($group, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}permissions',
@@ -1303,8 +1353,9 @@ 
 		);
 
 		$boardInserts = array();
-		foreach ($groupLevels['board'][$level] as $permission)
-			$boardInserts[] = array(1, $group, $permission);
+		foreach ($groupLevels['board'][$level] as $permission) {
+					$boardInserts[] = array(1, $group, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}board_permissions',
@@ -1335,8 +1386,9 @@ 
 		if (!empty($groupLevels['board'][$level]))
 		{
 			$boardInserts = array();
-			foreach ($groupLevels['board'][$level] as $permission)
-				$boardInserts[] = array($profile, $group, $permission);
+			foreach ($groupLevels['board'][$level] as $permission) {
+							$boardInserts[] = array($profile, $group, $permission);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1359,8 +1411,9 @@ 
 			)
 		);
 
-		if (empty($boardLevels[$level]))
-			return;
+		if (empty($boardLevels[$level])) {
+					return;
+		}
 
 		// Get all the groups...
 		$query = $smcFunc['db_query']('', '
@@ -1378,8 +1431,9 @@ 
 			$group = $row[0];
 
 			$boardInserts = array();
-			foreach ($boardLevels[$level] as $permission)
-				$boardInserts[] = array($profile, $group, $permission);
+			foreach ($boardLevels[$level] as $permission) {
+							$boardInserts[] = array($profile, $group, $permission);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1392,8 +1446,9 @@ 
 
 		// Add permissions for ungrouped members.
 		$boardInserts = array();
-		foreach ($boardLevels[$level] as $permission)
-			$boardInserts[] = array($profile, 0, $permission);
+		foreach ($boardLevels[$level] as $permission) {
+					$boardInserts[] = array($profile, 0, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1403,9 +1458,10 @@ 
 			);
 	}
 	// $profile and $group are both null!
-	else
-		fatal_lang_error('no_access', false);
-}
+	else {
+			fatal_lang_error('no_access', false);
+	}
+	}
 
 /**
  * Load permissions into $context['permissions'].
@@ -1607,15 +1663,17 @@ 
 		foreach ($permissionList as $permission => $permissionArray)
 		{
 			// If this is a guest permission we don't do it if it's the guest group.
-			if (isset($context['group']['id']) && $context['group']['id'] == -1 && in_array($permission, $context['non_guest_permissions']))
-				continue;
+			if (isset($context['group']['id']) && $context['group']['id'] == -1 && in_array($permission, $context['non_guest_permissions'])) {
+							continue;
+			}
 
 			// What groups will this permission be in?
 			$own_group = $permissionArray[1];
 
 			// First, Do these groups actually exist - if not add them.
-			if (!isset($permissionGroups[$permissionType][$own_group]))
-				$permissionGroups[$permissionType][$own_group] = true;
+			if (!isset($permissionGroups[$permissionType][$own_group])) {
+							$permissionGroups[$permissionType][$own_group] = true;
+			}
 
 			// What column should this be located into?
 			$position = !in_array($own_group, $leftPermissionGroups) ? 1 : 0;
@@ -1623,8 +1681,8 @@ 
 			// If the groups have not yet been created be sure to create them.
 			$bothGroups = array('own' => $own_group);
 
-			foreach ($bothGroups as $group)
-				if (!isset($context['permissions'][$permissionType]['columns'][$position][$group]))
+			foreach ($bothGroups as $group) {
+							if (!isset($context['permissions'][$permissionType]['columns'][$position][$group]))
 					$context['permissions'][$permissionType]['columns'][$position][$group] = array(
 						'type' => $permissionType,
 						'id' => $group,
@@ -1634,6 +1692,7 @@ 
 						'hidden' => false,
 						'permissions' => array()
 					);
+			}
 
 			$context['permissions'][$permissionType]['columns'][$position][$own_group]['permissions'][$permission] = array(
 				'id' => $permission,
@@ -1658,27 +1717,30 @@ 
 				{
 					$context['hidden_permissions'][] = $permission . '_own';
 					$context['hidden_permissions'][] = $permission . '_any';
+				} else {
+									$context['hidden_permissions'][] = $permission;
 				}
-				else
-					$context['hidden_permissions'][] = $permission;
 			}
 		}
 		ksort($context['permissions'][$permissionType]['columns']);
 
 		// Check we don't leave any empty groups - and mark hidden ones as such.
-		foreach ($context['permissions'][$permissionType]['columns'] as $column => $groups)
-			foreach ($groups as $id => $group)
+		foreach ($context['permissions'][$permissionType]['columns'] as $column => $groups) {
+					foreach ($groups as $id => $group)
 			{
 				if (empty($group['permissions']))
 					unset($context['permissions'][$permissionType]['columns'][$column][$id]);
+		}
 				else
 				{
 					$foundNonHidden = false;
-					foreach ($group['permissions'] as $permission)
-						if (empty($permission['hidden']))
+					foreach ($group['permissions'] as $permission) {
+											if (empty($permission['hidden']))
 							$foundNonHidden = true;
-					if (!$foundNonHidden)
-						$context['permissions'][$permissionType]['columns'][$column][$id]['hidden'] = true;
+					}
+					if (!$foundNonHidden) {
+											$context['permissions'][$permissionType]['columns'][$column][$id]['hidden'] = true;
+					}
 				}
 			}
 	}
@@ -1705,12 +1767,13 @@ 
 	$context['can_change_permissions'] = allowedTo('manage_permissions');
 
 	// Nothing to initialize here.
-	if (!$context['can_change_permissions'])
-		return;
+	if (!$context['can_change_permissions']) {
+			return;
+	}
 
 	// Load the permission settings for guests
-	foreach ($permissions as $permission)
-		$context[$permission] = array(
+	foreach ($permissions as $permission) {
+			$context[$permission] = array(
 			-1 => array(
 				'id' => -1,
 				'name' => $txt['membergroups_guests'],
@@ -1724,6 +1787,7 @@ 
 				'status' => 'off',
 			),
 		);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_group, CASE WHEN add_deny = {int:denied} THEN {string:deny} ELSE {string:on} END AS status, permission
@@ -1737,8 +1801,9 @@ 
 			'on' => 'on',
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context[$row['permission']][$row['id_group']]['status'] = $row['status'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context[$row['permission']][$row['id_group']]['status'] = $row['status'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -1759,14 +1824,15 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Initialize each permission as being 'off' until proven otherwise.
-		foreach ($permissions as $permission)
-			if (!isset($context[$permission][$row['id_group']]))
+		foreach ($permissions as $permission) {
+					if (!isset($context[$permission][$row['id_group']]))
 				$context[$permission][$row['id_group']] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name'],
 					'is_postgroup' => $row['min_posts'] != -1,
 					'status' => 'off',
 				);
+		}
 
 		$context[$row['permission']][$row['id_group']]['status'] = empty($row['status']) ? 'deny' : ($row['status'] == 1 ? 'on' : 'off');
 	}
@@ -1780,8 +1846,9 @@ 
 	{
 		foreach ($permissions as $permission)
 		{
-			if (isset($context[$permission][$group]))
-				unset($context[$permission][$group]);
+			if (isset($context[$permission][$group])) {
+							unset($context[$permission][$group]);
+			}
 		}
 	}
 
@@ -1789,8 +1856,9 @@ 
 	$non_guest_perms = array_intersect(str_replace(array('_any', '_own'), '', $permissions), $context['non_guest_permissions']);
 	foreach ($non_guest_perms as $permission)
 	{
-		if (isset($context[$permission][-1]))
-			unset($context[$permission][-1]);
+		if (isset($context[$permission][-1])) {
+					unset($context[$permission][-1]);
+		}
 	}
 
 	// Create the token for the separate inline permission verification.
@@ -1825,8 +1893,9 @@ 
 	global $context, $smcFunc;
 
 	// No permissions? Not a great deal to do here.
-	if (!allowedTo('manage_permissions'))
-		return;
+	if (!allowedTo('manage_permissions')) {
+			return;
+	}
 
 	// Almighty session check, verify our ways.
 	checkSession();
@@ -1838,13 +1907,15 @@ 
 	$insertRows = array();
 	foreach ($permissions as $permission)
 	{
-		if (!isset($_POST[$permission]))
-			continue;
+		if (!isset($_POST[$permission])) {
+					continue;
+		}
 
 		foreach ($_POST[$permission] as $id_group => $value)
 		{
-			if (in_array($value, array('on', 'deny')) && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions'])))
-				$insertRows[] = array((int) $id_group, $permission, $value == 'on' ? 1 : 0);
+			if (in_array($value, array('on', 'deny')) && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions']))) {
+							$insertRows[] = array((int) $id_group, $permission, $value == 'on' ? 1 : 0);
+			}
 		}
 	}
 
@@ -1860,13 +1931,14 @@ 
 	);
 
 	// ...and replace them with new ones.
-	if (!empty($insertRows))
-		$smcFunc['db_insert']('insert',
+	if (!empty($insertRows)) {
+			$smcFunc['db_insert']('insert',
 			'{db_prefix}permissions',
 			array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 			$insertRows,
 			array('id_group', 'permission')
 		);
+	}
 
 	// Do a full child update.
 	updateChildPermissions(array(), -1);
@@ -1893,10 +1965,11 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Format the label nicely.
-		if (isset($txt['permissions_profile_' . $row['profile_name']]))
-			$name = $txt['permissions_profile_' . $row['profile_name']];
-		else
-			$name = $row['profile_name'];
+		if (isset($txt['permissions_profile_' . $row['profile_name']])) {
+					$name = $txt['permissions_profile_' . $row['profile_name']];
+		} else {
+					$name = $row['profile_name'];
+		}
 
 		$context['profiles'][$row['id_profile']] = array(
 			'id' => $row['id_profile'],
@@ -1951,17 +2024,19 @@ 
 			)
 		);
 		$inserts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$inserts[] = array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$inserts[] = array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($inserts))
-			$smcFunc['db_insert']('insert',
+		if (!empty($inserts)) {
+					$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
 				array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 				$inserts,
 				array('id_profile', 'id_group', 'permission')
 			);
+		}
 	}
 	// Renaming?
 	elseif (isset($_POST['rename']))
@@ -1970,16 +2045,16 @@ 
 		validateToken('admin-mpp');
 
 		// Just showing the boxes?
-		if (!isset($_POST['rename_profile']))
-			$context['show_rename_boxes'] = true;
-		else
+		if (!isset($_POST['rename_profile'])) {
+					$context['show_rename_boxes'] = true;
+		} else
 		{
 			foreach ($_POST['rename_profile'] as $id => $value)
 			{
 				$value = $smcFunc['htmlspecialchars']($value);
 
-				if (trim($value) != '' && $id > 4)
-					$smcFunc['db_query']('', '
+				if (trim($value) != '' && $id > 4) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}permission_profiles
 						SET profile_name = {string:profile_name}
 						WHERE id_profile = {int:current_profile}',
@@ -1988,6 +2063,7 @@ 
 							'profile_name' => $value,
 						)
 					);
+				}
 			}
 		}
 	}
@@ -1998,9 +2074,10 @@ 
 		validateToken('admin-mpp');
 
 		$profiles = array();
-		foreach ($_POST['delete_profile'] as $profile)
-			if ($profile > 4)
+		foreach ($_POST['delete_profile'] as $profile) {
+					if ($profile > 4)
 				$profiles[] = (int) $profile;
+		}
 
 		// Verify it's not in use...
 		$request = $smcFunc['db_query']('', '
@@ -2012,8 +2089,9 @@ 
 				'profile_list' => $profiles,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					fatal_lang_error('no_access', false);
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Oh well, delete.
@@ -2037,10 +2115,11 @@ 
 		array(
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (isset($context['profiles'][$row['id_profile']]))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (isset($context['profiles'][$row['id_profile']]))
 		{
 			$context['profiles'][$row['id_profile']]['in_use'] = true;
+	}
 			$context['profiles'][$row['id_profile']]['boards'] = $row['board_count'];
 			$context['profiles'][$row['id_profile']]['boards_text'] = $row['board_count'] > 1 ? sprintf($txt['permissions_profile_used_by_many'], $row['board_count']) : $txt['permissions_profile_used_by_' . ($row['board_count'] ? 'one' : 'none')];
 		}
@@ -2052,8 +2131,9 @@ 
 	{
 		// Can't delete special ones.
 		$context['profiles'][$id]['can_edit'] = isset($txt['permissions_profile_' . $profile['unformatted_name']]) ? false : true;
-		if ($context['profiles'][$id]['can_edit'])
-			$context['can_edit_something'] = true;
+		if ($context['profiles'][$id]['can_edit']) {
+					$context['can_edit_something'] = true;
+		}
 
 		// You can only delete it if you can edit it AND it's not in use.
 		$context['profiles'][$id]['can_delete'] = $context['profiles'][$id]['can_edit'] && empty($profile['in_use']) ? true : false;
@@ -2074,8 +2154,9 @@ 
 	global $smcFunc;
 
 	// All the parent groups to sort out.
-	if (!is_array($parents))
-		$parents = array($parents);
+	if (!is_array($parents)) {
+			$parents = array($parents);
+	}
 
 	// Find all the children of this group.
 	$request = $smcFunc['db_query']('', '
@@ -2102,8 +2183,9 @@ 
 	$parents = array_unique($parents);
 
 	// Not a sausage, or a child?
-	if (empty($children))
-		return false;
+	if (empty($children)) {
+			return false;
+	}
 
 	// First off, are we doing general permissions?
 	if ($profile < 1 || $profile === null)
@@ -2118,9 +2200,10 @@ 
 			)
 		);
 		$permissions = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			foreach ($children[$row['id_group']] as $child)
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					foreach ($children[$row['id_group']] as $child)
 				$permissions[] = array($child, $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
 		$smcFunc['db_query']('', '
@@ -2160,9 +2243,10 @@ 
 			)
 		);
 		$permissions = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			foreach ($children[$row['id_group']] as $child)
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					foreach ($children[$row['id_group']] as $child)
 				$permissions[] = array($child, $row['id_profile'], $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
 		$smcFunc['db_query']('', '
@@ -2196,12 +2280,15 @@ 
 	global $context;
 
 	$context['illegal_permissions'] = array();
-	if (!allowedTo('admin_forum'))
-		$context['illegal_permissions'][] = 'admin_forum';
-	if (!allowedTo('manage_membergroups'))
-		$context['illegal_permissions'][] = 'manage_membergroups';
-	if (!allowedTo('manage_permissions'))
-		$context['illegal_permissions'][] = 'manage_permissions';
+	if (!allowedTo('admin_forum')) {
+			$context['illegal_permissions'][] = 'admin_forum';
+	}
+	if (!allowedTo('manage_membergroups')) {
+			$context['illegal_permissions'][] = 'manage_membergroups';
+	}
+	if (!allowedTo('manage_permissions')) {
+			$context['illegal_permissions'][] = 'manage_permissions';
+	}
 
 	call_integration_hook('integrate_load_illegal_permissions');
 }
@@ -2350,16 +2437,17 @@ 
 				'attachment' => 'disallow',
 				'children' => array(),
 			);
+		} elseif (isset($context['profile_groups'][$row['id_parent']])) {
+					$context['profile_groups'][$row['id_parent']]['children'][] = $row['group_name'];
 		}
-		elseif (isset($context['profile_groups'][$row['id_parent']]))
-			$context['profile_groups'][$row['id_parent']]['children'][] = $row['group_name'];
 	}
 	$smcFunc['db_free_result']($request);
 
 	// What are the permissions we are querying?
 	$all_permissions = array();
-	foreach ($mappings as $perm_set)
-		$all_permissions = array_merge($all_permissions, $perm_set);
+	foreach ($mappings as $perm_set) {
+			$all_permissions = array_merge($all_permissions, $perm_set);
+	}
 
 	// If we're saving the changes then do just that - save them.
 	if (!empty($_POST['save_changes']) && ($context['current_profile'] == 1 || $context['current_profile'] > 4))
@@ -2374,8 +2462,7 @@ 
 			{
 				// Turning it on. This seems easy enough.
 				updateSettings(array('postmod_active' => 1));
-			}
-			else
+			} else
 			{
 				// Turning it off. Not so straightforward. We have to turn off warnings to moderation level, and make everything approved.
 				updateSettings(array(
@@ -2386,8 +2473,7 @@ 
 				require_once($sourcedir . '/PostModeration.php');
 				approveAllData();
 			}
-		}
-		elseif ($modSettings['postmod_active'])
+		} elseif ($modSettings['postmod_active'])
 		{
 			// We're not saving a new setting - and if it's still enabled we have more work to do.
 
@@ -2417,21 +2503,22 @@ 
 							// Give them both sets for fun.
 							$new_permissions[] = array($context['current_profile'], $group['id'], $data[0], 1);
 							$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
+						} elseif ($_POST[$index][$group['id']] == 'moderate') {
+													$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
 						}
-						elseif ($_POST[$index][$group['id']] == 'moderate')
-							$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
 					}
 				}
 			}
 
 			// Insert new permissions.
-			if (!empty($new_permissions))
-				$smcFunc['db_insert']('',
+			if (!empty($new_permissions)) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}board_permissions',
 					array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$new_permissions,
 					array('id_profile', 'id_group', 'permission')
 				);
+			}
 		}
 	}
 
@@ -2460,11 +2547,13 @@ 
 					if ($row['add_deny'])
 					{
 						// Full allowance?
-						if ($index == 0)
-							$context['profile_groups'][$row['id_group']][$key] = 'allow';
+						if ($index == 0) {
+													$context['profile_groups'][$row['id_group']][$key] = 'allow';
+						}
 						// Otherwise only bother with moderate if not on allow.
-						elseif ($context['profile_groups'][$row['id_group']][$key] != 'allow')
-							$context['profile_groups'][$row['id_group']][$key] = 'moderate';
+						elseif ($context['profile_groups'][$row['id_group']][$key] != 'allow') {
+													$context['profile_groups'][$row['id_group']][$key] = 'moderate';
+						}
 					}
 				}
 			}