albertlast / SMF2.1

Sources/tasks/MemberReport-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 class MemberReport_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Braces +9 added lines, -6 removed lines

@@ -46,9 +46,10 @@ 
 
 		foreach ($prefs as $member => $pref_option)
 		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['member_report'] & $bitvalue)
+			foreach ($alert_bits as $type => $bitvalue) {
+							if ($pref_option['member_report'] & $bitvalue)
 					$notifies[$type][] = $member;
+			}
 		}
 
 		// Firstly, anyone who wants alerts.
@@ -109,8 +110,9 @@ 
 			);
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($row['lngfile']))
-					$row['lngfile'] = $language;
+				if (empty($row['lngfile'])) {
+									$row['lngfile'] = $language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -129,8 +131,9 @@ 
 				$emaildata = loadEmailTemplate('report_member_profile', $replacements, empty($modSettings['userLanguage']) ? $language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
-					sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'ureport' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				foreach ($recipients as $id_member => $email_address) {
+									sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'ureport' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				}
 			}
 		}
 

Sources/tasks/Birthday-Notify.php

Braces +6 added lines, -4 removed lines

@@ -51,8 +51,9 @@ 
 		$birthdays = array();
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
-			if (!isset($birthdays[$row['lngfile']]))
-				$birthdays[$row['lngfile']] = array();
+			if (!isset($birthdays[$row['lngfile']])) {
+							$birthdays[$row['lngfile']] = array();
+			}
 			$birthdays[$row['lngfile']][$row['id_member']] = array(
 				'name' => $row['real_name'],
 				'email' => $row['email_address']
@@ -117,8 +118,8 @@ 
 			AddMailQueue(true);
 
 			// Insert the alerts if any
-			if (!empty($alert_rows))
-				$smcFunc['db_insert']('',
+			if (!empty($alert_rows)) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}user_alerts',
 					array(
 						'alert_time' => 'int', 'id_member' => 'int', 'content_type' => 'string',
@@ -127,6 +128,7 @@ 
 					$alert_rows,
 					array()
 				);
+			}
 		}
 
 		return true;

Indentation +4 added lines, -4 removed lines

@@ -18,10 +18,10 @@
  */
 class Birthday_Notify_Background extends SMF_BackgroundTask
 {
-    /**
-     * This executes the task. It loads up the birthdays, figures out the greeting, etc.
-     * @return bool Always returns true
-     */
+	/**
+	 * This executes the task. It loads up the birthdays, figures out the greeting, etc.
+	 * @return bool Always returns true
+	 */
 	public function execute()
  	{
 		global $txt, $smcFunc, $txtBirthdayEmails, $modSettings, $sourcedir;

Sources/tasks/MsgReportReply-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 class MsgReportReply_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Braces +21 added lines, -14 removed lines

@@ -40,8 +40,9 @@ 
 				'last_comment' => $this->_details['comment_id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$possible_members[] = $row[0];
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$possible_members[] = $row[0];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Presumably, there are some people?
@@ -50,8 +51,9 @@ 
 			$possible_members = array_flip(array_flip($possible_members));
 			$possible_members = array_diff($possible_members, array($this->_details['sender_id']));
 		}
-		if (empty($possible_members))
-			return true;
+		if (empty($possible_members)) {
+					return true;
+		}
 
 		// We need to know who can moderate this board - and therefore who can see this report.
 		// First up, people who have moderate_board in the board this topic was in.
@@ -67,8 +69,9 @@ 
 				'current_board' => $this->_details['board_id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Thirdly, anyone assigned to be a moderator of this group as a group->board moderator.
@@ -85,8 +88,9 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// So now we have two lists: the people who replied to a report in the past,
@@ -108,8 +112,9 @@ 
 		{
 			foreach ($alert_bits as $type => $bitvalue)
 			{
-				if ($pref_option['msg_report_reply'] & $bitvalue)
-					$notifies[$type][] = $member;
+				if ($pref_option['msg_report_reply'] & $bitvalue) {
+									$notifies[$type][] = $member;
+				}
 			}
 		}
 
@@ -170,8 +175,9 @@ 
 			);
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($row['lngfile']))
-					$row['lngfile'] = $language;
+				if (empty($row['lngfile'])) {
+									$row['lngfile'] = $language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -203,8 +209,9 @@ 
 				$emaildata = loadEmailTemplate('reply_to_moderator', $replacements, empty($modSettings['userLanguage']) ? $language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
-					sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'rptrpy' . $this->_details['comment_id'], $emaildata['is_html'], 3);
+				foreach ($recipients as $id_member => $email_address) {
+									sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'rptrpy' . $this->_details['comment_id'], $emaildata['is_html'], 3);
+				}
 			}
 		}
 

Sources/tasks/ApproveReply-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 class ApproveReply_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Braces +3 added lines, -2 removed lines

@@ -96,14 +96,15 @@
 		}
 
 		// Insert the alerts if any
-		if (!empty($alert_rows))
-			$smcFunc['db_insert']('',
+		if (!empty($alert_rows)) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}user_alerts',
 				array('alert_time' => 'int', 'id_member' => 'int', 'id_member_started' => 'int', 'member_name' => 'string',
 					'content_type' => 'string', 'content_id' => 'int', 'content_action' => 'string', 'is_read' => 'int', 'extra' => 'string'),
 				$alert_rows,
 				array()
 			);
+		}
 
 		return true;
 	}

Sources/tasks/MsgReport-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 class MsgReport_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Braces +15 added lines, -10 removed lines

@@ -40,8 +40,9 @@ 
 				'current_board' => $this->_details['board_id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Thirdly, anyone assigned to be a moderator of this group as a group->board moderator.
@@ -58,8 +59,9 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// And now weed out the duplicates.
@@ -81,9 +83,10 @@ 
 
 		foreach ($prefs as $member => $pref_option)
 		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['msg_report'] & $bitvalue)
+			foreach ($alert_bits as $type => $bitvalue) {
+							if ($pref_option['msg_report'] & $bitvalue)
 					$notifies[$type][] = $member;
+			}
 		}
 
 		// Firstly, anyone who wants alerts.
@@ -143,8 +146,9 @@ 
 			);
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($row['lngfile']))
-					$row['lngfile'] = $language;
+				if (empty($row['lngfile'])) {
+									$row['lngfile'] = $language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -177,8 +181,9 @@ 
 				$emaildata = loadEmailTemplate('report_to_moderator', $replacements, empty($modSettings['userLanguage']) ? $language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
-					sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'report' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				foreach ($recipients as $id_member => $email_address) {
+									sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'report' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				}
 			}
 		}
 

Sources/tasks/Buddy-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 class Buddy_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the info, sets the alerts and loads up the email queue.
+	 * This executes the task - loads up the info, sets the alerts and loads up the email queue.
 	 * @return bool Always returns true
 	 */
 	public function execute()

Sources/tasks/GroupReq-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 class GroupReq_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts any alerts as needed.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts any alerts as needed.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Braces +9 added lines, -6 removed lines

@@ -37,8 +37,9 @@ 
 			)
 		);
 		$moderators = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$moderators[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$moderators[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		require_once($sourcedir . '/Subs-Members.php');
@@ -59,11 +60,13 @@ 
 			{
 				if (!empty($prefs[$mod]['request_group']))
 				{
-					if ($prefs[$mod]['request_group'] & 0x01)
-						$data['alert'][] = $mod;
+					if ($prefs[$mod]['request_group'] & 0x01) {
+											$data['alert'][] = $mod;
+					}
 
-					if ($prefs[$mod]['request_group'] & 0x02)
-						$data['email'][] = $mod;
+					if ($prefs[$mod]['request_group'] & 0x02) {
+											$data['email'][] = $mod;
+					}
 				}
 			}
 

Sources/tasks/GroupAct-Notify.php

Indentation +4 added lines, -4 removed lines

@@ -19,10 +19,10 @@
  */
 class GroupAct_Notify_Background extends SMF_BackgroundTask
 {
-    /**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
-     * @return bool Always returns true
-     */
+	/**
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
+	 * @return bool Always returns true
+	 */
 	public function execute()
 	{
 		global $sourcedir, $smcFunc, $language, $modSettings;

Braces +6 added lines, -4 removed lines

@@ -132,8 +132,9 @@ 
 						'GROUPNAME' => $user['group_name'],
 					);
 
-					if (!empty($custom_reason))
-						$replacements['REASON'] = $custom_reason;
+					if (!empty($custom_reason)) {
+											$replacements['REASON'] = $custom_reason;
+					}
 
 					$emaildata = loadEmailTemplate($email_template_name, $replacements, $user['language']);
 
@@ -142,8 +143,8 @@ 
 			}
 
 			// Insert the alerts if any
-			if (!empty($alert_rows))
-				$smcFunc['db_insert']('',
+			if (!empty($alert_rows)) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}user_alerts',
 					array(
 						'alert_time' => 'int', 'id_member' => 'int', 'content_type' => 'string',
@@ -152,6 +153,7 @@ 
 					$alert_rows,
 					array()
 				);
+			}
 		}
 
 		return true;

Sources/ManageSettings.php

Spacing +15 added lines, -15 removed lines

@@ -1323,7 +1323,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']) : '';
@@ -1339,7 +1339,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						$isChecked = $rowData['on_register'] && !$rowData['disabled'] ? ' checked' : '';
 						$isDisabled = $rowData['can_show_register'] ? '' : ' disabled';
@@ -1386,15 +1386,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>';
 
@@ -1412,7 +1412,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']);
 					},
@@ -1428,7 +1428,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;
@@ -1446,7 +1446,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'];
 					},
@@ -1463,7 +1463,7 @@ 
 					'value' => $txt['custom_profile_placement'],
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						global $txt, $context;
 
@@ -1698,7 +1698,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}',
@@ -1707,7 +1707,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}',
@@ -1809,7 +1809,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;
@@ -1982,7 +1982,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}',
@@ -2246,7 +2246,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 4
  */
 
-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.
@@ -206,16 +207,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']))
@@ -223,8 +226,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');
 
@@ -269,8 +273,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');
@@ -287,13 +292,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']));
 
@@ -337,8 +344,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']))
@@ -379,8 +387,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']))
@@ -418,8 +427,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']))
@@ -463,8 +473,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']),
@@ -473,15 +483,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');
@@ -506,16 +519,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;
@@ -603,8 +616,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');
@@ -638,8 +652,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>';
 	}
@@ -682,8 +697,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']);
@@ -700,14 +716,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]))
@@ -716,14 +734,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));
@@ -731,19 +751,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 = $smcFunc['json_encode']($answers);
@@ -753,16 +776,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]++;
 				}
 			}
@@ -812,8 +836,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));
 
@@ -828,24 +853,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']);
@@ -855,9 +883,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';
@@ -904,8 +933,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'];
@@ -960,8 +990,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]))
 				{
@@ -971,8 +1002,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" => ' '));
+							}
 						}
 					}
 				}
@@ -983,17 +1015,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);
+						}
 					}
 				}
 
@@ -1049,32 +1083,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]))
@@ -1092,12 +1128,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];
 								}
 							}
 
@@ -1110,8 +1147,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.
@@ -1123,18 +1161,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}',
@@ -1143,11 +1183,13 @@ 
 							'signature' => $sig,
 						)
 					);
+				}
 			}
 
 			$_GET['step'] += 50;
-			if (!$done)
-				pauseSignatureApplySettings();
+			if (!$done) {
+							pauseSignatureApplySettings();
+			}
 		}
 		$settings_applied = true;
 	}
@@ -1165,8 +1207,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;
@@ -1178,23 +1221,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));
@@ -1227,12 +1273,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'];
@@ -1278,9 +1326,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));
@@ -1289,16 +1338,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');
@@ -1401,11 +1452,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>';
 
@@ -1543,16 +1596,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']('', '
@@ -1566,8 +1619,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);
 	}
 
@@ -1633,9 +1687,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;
@@ -1671,8 +1725,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' => '',
@@ -1697,6 +1751,7 @@ 
 			'enclose' => '',
 			'placement' => 0,
 		);
+	}
 
 	// Are we moving it?
 	if (isset($_GET['move']) && in_array($smcFunc['htmlspecialchars']($_GET['move']), $move_to))
@@ -1705,8 +1760,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']('','
@@ -1737,12 +1794,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']);
@@ -1759,8 +1818,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'] : '';
@@ -1779,8 +1839,9 @@ 
 				$v = strtr($v, array(',' => ''));
 
 				// Nada, zip, etc...
-				if (trim($v) == '')
-					continue;
+				if (trim($v) == '') {
+									continue;
+				}
 
 				// Otherwise, save it boy.
 				$field_options .= $v . ',';
@@ -1788,15 +1849,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']))
@@ -1805,32 +1868,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
@@ -1858,8 +1925,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))
@@ -1873,8 +1941,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}
@@ -1887,6 +1955,7 @@ 
 								'old_value' => $option,
 							)
 						);
+					}
 				}
 			}
 			// @todo Maybe we should adjust based on new text length limits?
@@ -1929,8 +1998,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})
@@ -1941,8 +2010,8 @@ 
 						'current_column' => $context['field']['col_name'],
 					)
 				);
-		}
-		else
+			}
+		} else
 		{
 			// Gotta figure it out the order.
 			$new_order = $order_count > 1 ? ($order_count + 1) : 1;
@@ -2116,11 +2185,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()
@@ -2158,15 +2229,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;
@@ -2178,10 +2250,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);
 }
@@ -2203,8 +2276,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'];