SimpleMachines / SMF2.1

Sources/Profile-Actions.php

Braces +117 added lines, -86 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Activate an account.
@@ -48,8 +49,9 @@ 
 		logAction('approve_member', array('member' => $memID), 'admin');
 
 		// If we are doing approval, update the stats for the member just in case.
-		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15)))
-			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15))) {
+					updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		}
 
 		// Make sure we update the stats too.
 		updateStats('member', false);
@@ -76,8 +78,9 @@ 
 	$issueErrors = array();
 
 	// Doesn't hurt to be overly cautious.
-	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning'))
-		fatal_lang_error('no_access', false);
+	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Get the base (errors related) stuff done.
 	loadLanguage('Errors');
@@ -135,16 +138,18 @@ 
 
 		// This cannot be empty!
 		$_POST['warn_reason'] = isset($_POST['warn_reason']) ? trim($_POST['warn_reason']) : '';
-		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner'])
-			$issueErrors[] = 'warning_no_reason';
+		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner']) {
+					$issueErrors[] = 'warning_no_reason';
+		}
 		$_POST['warn_reason'] = $smcFunc['htmlspecialchars']($_POST['warn_reason']);
 
 		$_POST['warning_level'] = (int) $_POST['warning_level'];
 		$_POST['warning_level'] = max(0, min(100, $_POST['warning_level']));
-		if ($_POST['warning_level'] < $context['min_allowed'])
-			$_POST['warning_level'] = $context['min_allowed'];
-		elseif ($_POST['warning_level'] > $context['max_allowed'])
-			$_POST['warning_level'] = $context['max_allowed'];
+		if ($_POST['warning_level'] < $context['min_allowed']) {
+					$_POST['warning_level'] = $context['min_allowed'];
+		} elseif ($_POST['warning_level'] > $context['max_allowed']) {
+					$_POST['warning_level'] = $context['max_allowed'];
+		}
 
 		// Do we actually have to issue them with a PM?
 		$id_notice = 0;
@@ -152,8 +157,9 @@ 
 		{
 			$_POST['warn_sub'] = trim($_POST['warn_sub']);
 			$_POST['warn_body'] = trim($_POST['warn_body']);
-			if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-				$issueErrors[] = 'warning_notify_blank';
+			if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+							$issueErrors[] = 'warning_notify_blank';
+			}
 			// Send the PM?
 			else
 			{
@@ -190,8 +196,8 @@ 
 		if (empty($issueErrors))
 		{
 			// Log what we've done!
-			if (!$context['user']['is_owner'])
-				$smcFunc['db_insert']('',
+			if (!$context['user']['is_owner']) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}log_comments',
 					array(
 						'id_member' => 'int', 'member_name' => 'string', 'comment_type' => 'string', 'id_recipient' => 'int', 'recipient_name' => 'string-255',
@@ -203,14 +209,14 @@ 
 					),
 					array('id_comment')
 				);
+			}
 
 			// Make the change.
 			updateMemberData($memID, array('warning' => $_POST['warning_level']));
 
 			// Leave a lovely message.
 			$context['profile_updated'] = $context['user']['is_owner'] ? $txt['profile_updated_own'] : $txt['profile_warning_success'];
-		}
-		else
+		} else
 		{
 			// Try to remember some bits.
 			$context['warning_data'] = array(
@@ -229,8 +235,9 @@ 
 	{
 		$warning_body = !empty($_POST['warn_body']) ? trim(censorText($_POST['warn_body'])) : '';
 		$context['preview_subject'] = !empty($_POST['warn_sub']) ? trim($smcFunc['htmlspecialchars']($_POST['warn_sub'])) : '';
-		if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-			$issueErrors[] = 'warning_notify_blank';
+		if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+					$issueErrors[] = 'warning_notify_blank';
+		}
 
 		if (!empty($_POST['warn_body']))
 		{
@@ -254,8 +261,9 @@ 
 	{
 		// Fill in the suite of errors.
 		$context['post_errors'] = array();
-		foreach ($issueErrors as $error)
-			$context['post_errors'][] = $txt[$error];
+		foreach ($issueErrors as $error) {
+					$context['post_errors'][] = $txt[$error];
+		}
 	}
 
 
@@ -272,9 +280,10 @@ 
 		$modSettings['warning_mute'] => $txt['profile_warning_effect_mute'],
 	);
 	$context['current_level'] = 0;
-	foreach ($context['level_effects'] as $limit => $dummy)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['level_effects'] as $limit => $dummy) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_level'] = $limit;
+	}
 
 	$listOptions = array(
 		'id' => 'view_warnings',
@@ -337,11 +346,12 @@ 
 							' . $warning['reason'] . '
 						</div>';
 
-						if (!empty($warning['id_notice']))
-							$ret .= '
+						if (!empty($warning['id_notice'])) {
+													$ret .= '
 						<div class="floatright">
 							<a href="' . $scripturl . '?action=moderate;area=notice;nid=' . $warning['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" rel="noopener" title="' . $txt['profile_warning_previous_notice'] . '"><span class="generic_icons filter centericon"></span></a>
 						</div>';
+						}
 
 						return $ret;
 					},
@@ -413,8 +423,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// If we're not warning for a message skip any that are.
-		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false)
-			continue;
+		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false) {
+					continue;
+		}
 
 		$context['notification_templates'][] = array(
 			'title' => $row['template_title'],
@@ -424,16 +435,18 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Setup the "default" templates.
-	foreach (array('spamming', 'offence', 'insulting') as $type)
-		$context['notification_templates'][] = array(
+	foreach (array('spamming', 'offence', 'insulting') as $type) {
+			$context['notification_templates'][] = array(
 			'title' => $txt['profile_warning_notify_title_' . $type],
 			'body' => sprintf($txt['profile_warning_notify_template_outline' . (!empty($context['warning_for_message']) ? '_post' : '')], $txt['profile_warning_notify_for_' . $type]),
 		);
+	}
 
 	// Replace all the common variables in the templates.
-	foreach ($context['notification_templates'] as $k => $name)
-		$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
-}
+	foreach ($context['notification_templates'] as $k => $name) {
+			$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
+	}
+	}
 
 /**
  * Get the number of warnings a user has. Callback for $listOptions['get_count'] in issueWarning()
@@ -517,10 +530,11 @@ 
 {
 	global $txt, $context, $modSettings, $cur_profile;
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	// Permissions for removing stuff...
 	$context['can_delete_posts'] = !$context['user']['is_owner'] && allowedTo('moderate_forum');
@@ -547,10 +561,11 @@ 
 
 	// @todo Add a way to delete pms as well?
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	checkSession();
 
@@ -576,8 +591,9 @@ 
 		list ($another) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (empty($another))
-			fatal_lang_error('at_least_one_admin', 'critical');
+		if (empty($another)) {
+					fatal_lang_error('at_least_one_admin', 'critical');
+		}
 	}
 
 	// This file is needed for the deleteMembers function.
@@ -656,8 +672,9 @@ 
 					)
 				);
 				$topicIDs = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$topicIDs[] = $row['id_topic'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$topicIDs[] = $row['id_topic'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Actually remove the topics. Ignore recycling if we want to perma-delete things...
@@ -680,8 +697,9 @@ 
 			// This could take a while... but ya know it's gonna be worth it in the end.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (function_exists('apache_reset_timeout'))
-					@apache_reset_timeout();
+				if (function_exists('apache_reset_timeout')) {
+									@apache_reset_timeout();
+				}
 
 				removeMessage($row['id_msg']);
 			}
@@ -689,8 +707,9 @@ 
 		}
 
 		// Only delete this poor members account if they are actually being booted out of camp.
-		if (isset($_POST['deleteAccount']))
-			deleteMembers($memID);
+		if (isset($_POST['deleteAccount'])) {
+					deleteMembers($memID);
+		}
 	}
 	// Do they need approval to delete?
 	elseif (!empty($modSettings['approveAccountDeletion']) && !allowedTo('moderate_forum'))
@@ -741,18 +760,18 @@ 
 		{
 			foreach ($costs as $duration => $cost)
 			{
-				if ($cost != 0)
-					$cost_array[$duration] = $cost;
+				if ($cost != 0) {
+									$cost_array[$duration] = $cost;
+				}
 			}
-		}
-		else
+		} else
 		{
 			$cost_array['fixed'] = $costs['fixed'];
 		}
 
-		if (empty($cost_array))
-			unset($context['subscriptions'][$id]);
-		else
+		if (empty($cost_array)) {
+					unset($context['subscriptions'][$id]);
+		} else
 		{
 			$context['subscriptions'][$id]['member'] = 0;
 			$context['subscriptions'][$id]['subscribed'] = false;
@@ -765,13 +784,15 @@ 
 	foreach ($gateways as $id => $gateway)
 	{
 		$gateways[$id] = new $gateway['display_class']();
-		if (!$gateways[$id]->gatewayEnabled())
-			unset($gateways[$id]);
+		if (!$gateways[$id]->gatewayEnabled()) {
+					unset($gateways[$id]);
+		}
 	}
 
 	// No gateways yet?
-	if (empty($gateways))
-		fatal_error($txt['paid_admin_not_setup_gateway']);
+	if (empty($gateways)) {
+			fatal_error($txt['paid_admin_not_setup_gateway']);
+	}
 
 	// Get the current subscriptions.
 	$request = $smcFunc['db_query']('', '
@@ -786,8 +807,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// The subscription must exist!
-		if (!isset($context['subscriptions'][$row['id_subscribe']]))
-			continue;
+		if (!isset($context['subscriptions'][$row['id_subscribe']])) {
+					continue;
+		}
 
 		$context['current'][$row['id_subscribe']] = array(
 			'id' => $row['id_sublog'],
@@ -801,8 +823,9 @@ 
 			'status_text' => $row['status'] == 0 ? ($row['payments_pending'] ? $txt['paid_pending'] : $txt['paid_finished']) : $txt['paid_active'],
 		);
 
-		if ($row['status'] == 1)
-			$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		if ($row['status'] == 1) {
+					$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -853,21 +876,25 @@ 
 	if (isset($_GET['confirm']) && isset($_POST['sub_id']) && is_array($_POST['sub_id']))
 	{
 		// Hopefully just one.
-		foreach ($_POST['sub_id'] as $k => $v)
-			$ID_SUB = (int) $k;
+		foreach ($_POST['sub_id'] as $k => $v) {
+					$ID_SUB = (int) $k;
+		}
 
-		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0)
-			fatal_lang_error('paid_sub_not_active');
+		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0) {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Simplify...
 		$context['sub'] = $context['subscriptions'][$ID_SUB];
 		$period = 'xx';
-		if ($context['sub']['flexible'])
-			$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		if ($context['sub']['flexible']) {
+					$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		}
 
 		// Check we have a valid cost.
-		if ($context['sub']['flexible'] && $period == 'xx')
-			fatal_lang_error('paid_sub_not_active');
+		if ($context['sub']['flexible'] && $period == 'xx') {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Sort out the cost/currency.
 		$context['currency'] = $modSettings['paid_currency_code'];
@@ -880,8 +907,7 @@ 
 			$context['cost'] = sprintf($modSettings['paid_currency_symbol'], $context['value']) . '/' . $txt[$_POST['cur'][$ID_SUB]];
 			// The period value for paypal.
 			$context['paypal_period'] = strtoupper(substr($_POST['cur'][$ID_SUB], 0, 1));
-		}
-		else
+		} else
 		{
 			// Real cost...
 			$context['value'] = $context['sub']['costs']['fixed'];
@@ -898,13 +924,15 @@ 
 		foreach ($gateways as $id => $gateway)
 		{
 			$fields = $gateways[$id]->fetchGatewayFields($context['sub']['id'] . '+' . $memID, $context['sub'], $context['value'], $period, $scripturl . '?action=profile;u=' . $memID . ';area=subscriptions;sub_id=' . $context['sub']['id'] . ';done');
-			if (!empty($fields['form']))
-				$context['gateways'][] = $fields;
+			if (!empty($fields['form'])) {
+							$context['gateways'][] = $fields;
+			}
 		}
 
 		// Bugger?!
-		if (empty($context['gateways']))
-			fatal_error($txt['paid_admin_not_setup_gateway']);
+		if (empty($context['gateways'])) {
+					fatal_error($txt['paid_admin_not_setup_gateway']);
+		}
 
 		// Now we are going to assume they want to take this out ;)
 		$new_data = array($context['sub']['id'], $context['value'], $period, 'prepay');
@@ -912,16 +940,19 @@ 
 		{
 			// What are the details like?
 			$current_pending = array();
-			if ($context['current'][$context['sub']['id']]['pending_details'] != '')
-				$current_pending = $smcFunc['json_decode']($context['current'][$context['sub']['id']]['pending_details'], true);
+			if ($context['current'][$context['sub']['id']]['pending_details'] != '') {
+							$current_pending = $smcFunc['json_decode']($context['current'][$context['sub']['id']]['pending_details'], true);
+			}
 			// Don't get silly.
-			if (count($current_pending) > 9)
-				$current_pending = array();
+			if (count($current_pending) > 9) {
+							$current_pending = array();
+			}
 			$pending_count = 0;
 			// Only record real pending payments as will otherwise confuse the admin!
-			foreach ($current_pending as $pending)
-				if ($pending[3] == 'payback')
+			foreach ($current_pending as $pending) {
+							if ($pending[3] == 'payback')
 					$pending_count++;
+			}
 
 			if (!in_array($new_data, $current_pending))
 			{
@@ -966,9 +997,9 @@ 
 
 		// Quit.
 		return;
+	} else {
+			$context['sub_template'] = 'user_subscription';
+	}
 	}
-	else
-		$context['sub_template'] = 'user_subscription';
-}
 
 ?>
\ No newline at end of file

Sources/ModerationCenter.php

Braces +136 added lines, -100 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point for the moderation center.
@@ -26,8 +27,9 @@ 
 	global $smcFunc, $txt, $context, $scripturl, $modSettings, $user_info, $sourcedir, $options;
 
 	// Don't run this twice... and don't conflict with the admin bar.
-	if (isset($context['admin_area']))
-		return;
+	if (isset($context['admin_area'])) {
+			return;
+	}
 
 	$context['can_moderate_boards'] = $user_info['mod_cache']['bq'] != '0=1';
 	$context['can_moderate_groups'] = $user_info['mod_cache']['gq'] != '0=1';
@@ -35,8 +37,9 @@ 
 	$context['can_moderate_users'] = allowedTo('moderate_forum');
 
 	// Everyone using this area must be allowed here!
-	if (!$context['can_moderate_boards'] && !$context['can_moderate_groups'] && !$context['can_moderate_approvals'] && !$context['can_moderate_users'])
-		isAllowedTo('access_mod_center');
+	if (!$context['can_moderate_boards'] && !$context['can_moderate_groups'] && !$context['can_moderate_approvals'] && !$context['can_moderate_users']) {
+			isAllowedTo('access_mod_center');
+	}
 
 	// We're gonna want a menu of some kind.
 	require_once($sourcedir . '/Subs-Menu.php');
@@ -195,8 +198,9 @@ 
 	unset($moderation_areas);
 
 	// We got something - didn't we? DIDN'T WE!
-	if ($mod_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($mod_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Retain the ID information in case required by a subaction.
 	$context['moderation_menu_id'] = $context['max_menu_id'];
@@ -219,22 +223,25 @@ 
 		'url' => $scripturl . '?action=moderate',
 		'name' => $txt['moderation_center'],
 	);
-	if (isset($mod_include_data['current_area']) && $mod_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($mod_include_data['current_area']) && $mod_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=moderate;area=' . $mod_include_data['current_area'],
 			'name' => $mod_include_data['label'],
 		);
-	if (!empty($mod_include_data['current_subsection']) && $mod_include_data['subsections'][$mod_include_data['current_subsection']][0] != $mod_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($mod_include_data['current_subsection']) && $mod_include_data['subsections'][$mod_include_data['current_subsection']][0] != $mod_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=moderate;area=' . $mod_include_data['current_area'] . ';sa=' . $mod_include_data['current_subsection'],
 			'name' => $mod_include_data['subsections'][$mod_include_data['current_subsection']][0],
 		);
+	}
 
 	// Now - finally - the bit before the encore - the main performance of course!
 	if (!$dont_call)
 	{
-		if (isset($mod_include_data['file']))
-			require_once($sourcedir . '/' . $mod_include_data['file']);
+		if (isset($mod_include_data['file'])) {
+					require_once($sourcedir . '/' . $mod_include_data['file']);
+		}
 
 		call_helper($mod_include_data['function']);
 	}
@@ -259,8 +266,9 @@ 
 	// Load what blocks the user actually can see...
 	$valid_blocks = array();
 
-	if ($context['can_moderate_groups'])
-		$valid_blocks['g'] = 'GroupRequests';
+	if ($context['can_moderate_groups']) {
+			$valid_blocks['g'] = 'GroupRequests';
+	}
 	if ($context['can_moderate_boards'])
 	{
 		$valid_blocks['r'] = 'ReportedPosts';
@@ -269,8 +277,9 @@ 
 	if ($context['can_moderate_users'])
 	{
 		// This falls under the category of moderating users as well...
-		if (!$context['can_moderate_boards'])
-			$valid_blocks['w'] = 'WatchedUsers';
+		if (!$context['can_moderate_boards']) {
+					$valid_blocks['w'] = 'WatchedUsers';
+		}
 
 		$valid_blocks['rm'] = 'ReportedMembers';
 	}
@@ -281,8 +290,9 @@ 
 	foreach ($valid_blocks as $k => $block)
 	{
 		$block = 'ModBlock' . $block;
-		if (function_exists($block))
-			$context['mod_blocks'][] = $block();
+		if (function_exists($block)) {
+					$context['mod_blocks'][] = $block();
+		}
 	}
 
 	$context['admin_prefs'] = !empty($options['admin_preferences']) ? $smcFunc['json_decode']($options['admin_preferences'], true) : array();
@@ -309,8 +319,9 @@ 
 			)
 		);
 		$watched_users = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$watched_users[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$watched_users[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		cache_put_data('recent_user_watches', $watched_users, 240);
@@ -402,8 +413,9 @@ 
 			$note_owner = $smcFunc['db_num_rows']($get_owner);
 			$smcFunc['db_free_result']($get_owner);
 
-			if (empty($note_owner))
-				fatal_lang_error('mc_notes_delete_own', false);
+			if (empty($note_owner)) {
+							fatal_lang_error('mc_notes_delete_own', false);
+			}
 		}
 
 		// Lets delete it.
@@ -460,12 +472,14 @@ 
 			)
 		);
 		$moderator_notes = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$moderator_notes[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$moderator_notes[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
-		if ($offset == 0)
-			cache_put_data('moderator_notes', $moderator_notes, 240);
+		if ($offset == 0) {
+					cache_put_data('moderator_notes', $moderator_notes, 240);
+		}
 	}
 
 	// Lets construct a page index.
@@ -504,8 +518,9 @@ 
 	// Got the info already?
 	$cachekey = md5($smcFunc['json_encode']($user_info['mod_cache']['bq']));
 	$context['reported_posts'] = array();
-	if ($user_info['mod_cache']['bq'] == '0=1')
-		return 'reported_posts_block';
+	if ($user_info['mod_cache']['bq'] == '0=1') {
+			return 'reported_posts_block';
+	}
 
 	if (($reported_posts = cache_get_data('reported_posts_' . $cachekey, 90)) === null)
 	{
@@ -529,8 +544,9 @@ 
 			)
 		);
 		$reported_posts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$reported_posts[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$reported_posts[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Cache it.
@@ -568,8 +584,9 @@ 
 
 	$context['group_requests'] = array();
 	// Make sure they can even moderate someone!
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		return 'group_requests_block';
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			return 'group_requests_block';
+	}
 
 	// What requests are outstanding?
 	$request = $smcFunc['db_query']('', '
@@ -618,8 +635,9 @@ 
 	// Got the info already?
 	$cachekey = md5($smcFunc['json_encode']((int) allowedTo('moderate_forum')));
 	$context['reported_users'] = array();
-	if (!allowedTo('moderate_forum'))
-		return 'reported_users_block';
+	if (!allowedTo('moderate_forum')) {
+			return 'reported_users_block';
+	}
 
 	if (($reported_users = cache_get_data('reported_users_' . $cachekey, 90)) === null)
 	{
@@ -642,8 +660,9 @@ 
 			)
 		);
 		$reported_users = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$reported_users[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$reported_users[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Cache it.
@@ -742,15 +761,15 @@ 
 		// Time to update.
 		updateSettings(array('last_mod_report_action' => time()));
 		recountOpenReports('members');
-	}
-	elseif (isset($_POST['close']) && isset($_POST['close_selected']))
+	} elseif (isset($_POST['close']) && isset($_POST['close_selected']))
 	{
 		checkSession();
 
 		// All the ones to update...
 		$toClose = array();
-		foreach ($_POST['close'] as $rid)
-			$toClose[] = (int) $rid;
+		foreach ($_POST['close'] as $rid) {
+					$toClose[] = (int) $rid;
+		}
 
 		if (!empty($toClose))
 		{
@@ -903,8 +922,9 @@ 
 	global $context, $user_info;
 
 	// You need to be allowed to moderate groups...
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		isAllowedTo('manage_membergroups');
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Load the group templates.
 	loadTemplate('ModerationCenter');
@@ -915,8 +935,9 @@ 
 		'view' => 'ViewGroups',
 	);
 
-	if (!isset($_GET['sa']) || !isset($subActions[$_GET['sa']]))
-		$_GET['sa'] = 'view';
+	if (!isset($_GET['sa']) || !isset($subActions[$_GET['sa']])) {
+			$_GET['sa'] = 'view';
+	}
 	$context['sub_action'] = $_GET['sa'];
 
 	// Call the relevant function.
@@ -946,8 +967,9 @@ 
 			'id_notice' => $id_notice,
 		)
 	);
-	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 ($context['notice_body'], $context['notice_subject']) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -984,18 +1006,20 @@ 
 		checkSession(!is_array($_REQUEST['delete']) ? 'get' : 'post');
 
 		$toDelete = array();
-		if (!is_array($_REQUEST['delete']))
-			$toDelete[] = (int) $_REQUEST['delete'];
-		else
-			foreach ($_REQUEST['delete'] as $did)
+		if (!is_array($_REQUEST['delete'])) {
+					$toDelete[] = (int) $_REQUEST['delete'];
+		} else {
+					foreach ($_REQUEST['delete'] as $did)
 				$toDelete[] = (int) $did;
+		}
 
 		if (!empty($toDelete))
 		{
 			require_once($sourcedir . '/RemoveTopic.php');
 			// If they don't have permission we'll let it error - either way no chance of a security slip here!
-			foreach ($toDelete as $did)
-				removeMessage($did);
+			foreach ($toDelete as $did) {
+							removeMessage($did);
+			}
 		}
 	}
 
@@ -1004,20 +1028,21 @@ 
 	{
 		$approve_query = '';
 		$delete_boards = array();
-	}
-	else
+	} else
 	{
 		// Still obey permissions!
 		$approve_boards = boardsAllowedTo('approve_posts');
 		$delete_boards = boardsAllowedTo('delete_any');
 
-		if ($approve_boards == array(0))
-			$approve_query = '';
-		elseif (!empty($approve_boards))
-			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+		if ($approve_boards == array(0)) {
+					$approve_query = '';
+		} elseif (!empty($approve_boards)) {
+					$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+		}
 		// Nada, zip, etc...
-		else
-			$approve_query = ' AND 1=0';
+		else {
+					$approve_query = ' AND 1=0';
+		}
 	}
 
 	require_once($sourcedir . '/Subs-List.php');
@@ -1116,10 +1141,11 @@ 
 				'data' => array(
 					'function' => function($member) use ($scripturl)
 					{
-						if ($member['last_post_id'])
-							return '<a href="' . $scripturl . '?msg=' . $member['last_post_id'] . '">' . $member['last_post'] . '</a>';
-						else
-							return $member['last_post'];
+						if ($member['last_post_id']) {
+													return '<a href="' . $scripturl . '?msg=' . $member['last_post_id'] . '">' . $member['last_post'] . '</a>';
+						} else {
+													return $member['last_post'];
+						}
 					},
 				),
 			),
@@ -1247,8 +1273,9 @@ 
 			)
 		);
 		$latest_posts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$latest_posts[$row['id_member']] = $row['last_post_id'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$latest_posts[$row['id_member']] = $row['last_post_id'];
+		}
 
 		if (!empty($latest_posts))
 		{
@@ -1439,15 +1466,17 @@ 
 	// Setup the direction stuff...
 	$context['order'] = isset($_REQUEST['sort']) && isset($sort_types[$_REQUEST['sort']]) ? $_REQUEST['sort'] : 'member';
 
-	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search']))
-		$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
-	else
-		$search_params_string = $search_params['string'];
+	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search'])) {
+			$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
+	} else {
+			$search_params_string = $search_params['string'];
+	}
 
-	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
-		$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
-	else
-		$search_params_type = $search_params['type'];
+	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']])) {
+			$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
+	} else {
+			$search_params_type = $search_params['type'];
+	}
 
 	$search_params = array(
 		'string' => $search_params_string,
@@ -1530,9 +1559,10 @@ 
 								' . $rowData['reason'] . '
 							</div>';
 
-						if (!empty($rowData['id_notice']))
-							$output .= '
+						if (!empty($rowData['id_notice'])) {
+													$output .= '
 								&nbsp;<a href="' . $scripturl . '?action=moderate;area=notice;nid=' . $rowData['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" rel="noopener" title="' . $txt['profile_warning_previous_notice'] . '"><span class="generic_icons filter centericon"></span></a>';
+						}
 						return $output;
 					},
 				),
@@ -1650,9 +1680,9 @@ 
 	global $smcFunc, $modSettings, $context, $txt, $scripturl, $sourcedir, $user_info;
 
 	// Submitting a new one?
-	if (isset($_POST['add']))
-		return ModifyWarningTemplate();
-	elseif (isset($_POST['delete']) && !empty($_POST['deltpl']))
+	if (isset($_POST['add'])) {
+			return ModifyWarningTemplate();
+	} elseif (isset($_POST['delete']) && !empty($_POST['deltpl']))
 	{
 		checkSession();
 		validateToken('mod-wt');
@@ -1671,8 +1701,9 @@ 
 				'current_member' => $user_info['id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			logAction('delete_warn_template', array('template' => $row['recipient_name']));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					logAction('delete_warn_template', array('template' => $row['recipient_name']));
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Do the deletes.
@@ -1963,16 +1994,18 @@ 
 				);
 
 				// If it wasn't visible and now is they've effectively added it.
-				if ($context['template_data']['personal'] && !$recipient_id)
-					logAction('add_warn_template', array('template' => $_POST['template_title']));
+				if ($context['template_data']['personal'] && !$recipient_id) {
+									logAction('add_warn_template', array('template' => $_POST['template_title']));
+				}
 				// Conversely if they made it personal it's a delete.
-				elseif (!$context['template_data']['personal'] && $recipient_id)
-					logAction('delete_warn_template', array('template' => $_POST['template_title']));
+				elseif (!$context['template_data']['personal'] && $recipient_id) {
+									logAction('delete_warn_template', array('template' => $_POST['template_title']));
+				}
 				// Otherwise just an edit.
-				else
-					logAction('modify_warn_template', array('template' => $_POST['template_title']));
-			}
-			else
+				else {
+									logAction('modify_warn_template', array('template' => $_POST['template_title']));
+				}
+			} else
 			{
 				$smcFunc['db_insert']('',
 					'{db_prefix}log_comments',
@@ -1992,17 +2025,18 @@ 
 
 			// Get out of town...
 			redirectexit('action=moderate;area=warnings;sa=templates');
-		}
-		else
+		} else
 		{
 			$context['warning_errors'] = array();
 			$context['template_data']['title'] = !empty($_POST['template_title']) ? $_POST['template_title'] : '';
 			$context['template_data']['body'] = !empty($_POST['template_body']) ? $_POST['template_body'] : $txt['mc_warning_template_body_default'];
 			$context['template_data']['personal'] = !empty($_POST['make_personal']);
-			if (empty($_POST['template_title']))
-				$context['warning_errors'][] = $txt['mc_warning_template_error_no_title'];
-			if (empty($_POST['template_body']))
-				$context['warning_errors'][] = $txt['mc_warning_template_error_no_body'];
+			if (empty($_POST['template_title'])) {
+							$context['warning_errors'][] = $txt['mc_warning_template_error_no_title'];
+			}
+			if (empty($_POST['template_body'])) {
+							$context['warning_errors'][] = $txt['mc_warning_template_error_no_body'];
+			}
 		}
 	}
 
@@ -2047,8 +2081,9 @@ 
 		// Now check other options!
 		$pref_binary = 0;
 
-		if ($context['can_moderate_approvals'] && !empty($_POST['mod_notify_approval']))
-			$pref_binary |= 4;
+		if ($context['can_moderate_approvals'] && !empty($_POST['mod_notify_approval'])) {
+					$pref_binary |= 4;
+		}
 
 		// Put it all together.
 		$mod_prefs = '0||' . $pref_binary;
@@ -2072,9 +2107,10 @@ 
 	unset($_SESSION['moderate_time']);
 
 	// Clean any moderator tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-mod') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-mod') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Themes/default/Help.template.php

Braces +21 added lines, -16 removed lines

@@ -86,11 +86,12 @@ 
 					<span class="smalltext"><em>', $txt['find_wildcards'], '</em></span><br>';
 
 	// Only offer to search for buddies if we have some!
-	if (!empty($context['show_buddies']))
-		echo '
+	if (!empty($context['show_buddies'])) {
+			echo '
 					<span class="smalltext">
 						<label for="buddies"><input type="checkbox" name="buddies" id="buddies"', !empty($context['buddy_search']) ? ' checked' : '', '> ', $txt['find_buddies'], '</label>
 					</span><br>';
+	}
 
 	echo '
 					<div class="padding righttext">
@@ -105,20 +106,21 @@ 
 					<h3 class="catbg">', $txt['find_results'], '</h3>
 				</div>';
 
-	if (empty($context['results']))
-		echo '
+	if (empty($context['results'])) {
+			echo '
 				<p class="error">', $txt['find_no_results'], '</p>';
-	else
+	} else
 	{
 		echo '
 				<ul class="padding">';
 
-		foreach ($context['results'] as $result)
-			echo '
+		foreach ($context['results'] as $result) {
+					echo '
 					<li class="windowbg">
 						<a href="', $result['href'], '" target="_blank" rel="noopener"> <span class="generic_icons profile_sm"></span>
 						<a href="javascript:void(0);" onclick="addMember(this.innerHTML); return false;">', $result['name'], '</a>
 					</li>';
+		}
 
 		echo '
 				</ul>
@@ -134,11 +136,12 @@ 
 			<input type="hidden" name="quote" value="', $context['quote_results'] ? '1' : '0', '">
 		</form>';
 
-	if (empty($context['results']))
-		echo '
+	if (empty($context['results'])) {
+			echo '
 		<script>
 			document.getElementById("search").focus();
 		</script>';
+	}
 
 	echo '
 	</body>
@@ -162,9 +165,10 @@ 
 					<p>', $txt['manual_introduction'], '</p>
 					<ul>';
 
-	foreach ($context['manual_sections'] as $section_id => $wiki_id)
-		echo '
+	foreach ($context['manual_sections'] as $section_id => $wiki_id) {
+			echo '
 						<li><a href="', $context['wiki_url'], '/', $context['wiki_prefix'], $wiki_id, ($txt['lang_dictionary'] != 'en' ? '/' . $txt['lang_dictionary'] : ''), '" target="_blank" rel="noopener">', $txt['manual_section_' . $section_id . '_title'], '</a> - ', $txt['manual_section_' . $section_id . '_desc'], '</li>';
+	}
 
 	echo '
 					</ul>
@@ -180,8 +184,8 @@ 
 {
 	global $txt, $context, $modSettings;
 
-	if (!empty($modSettings['requireAgreement']))
-		echo '
+	if (!empty($modSettings['requireAgreement'])) {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg">
 					', $txt['terms_and_rules'], ' - ', $context['forum_name_html_safe'], '
@@ -190,11 +194,12 @@ 
 			<div class="roundframe">
 				', $context['agreement'], '
 			</div>';
-	else
-		echo '
+	} else {
+			echo '
 			<div class="noticebox">
 				', $txt['agreement_disabled'], '
 			</div>';
-}
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/DbPackages-postgresql.php

Braces +122 added lines, -95 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the file functions to the $smcFunc array.
@@ -53,8 +54,9 @@ 
 		'messages', 'moderator_groups', 'moderators', 'package_servers', 'permission_profiles', 'permissions', 'personal_messages',
 		'pm_labeled_messages', 'pm_labels', 'pm_recipients', 'pm_rules', 'poll_choices', 'polls', 'scheduled_tasks', 'sessions', 'settings', 'smileys',
 		'spiders', 'subscriptions', 'themes', 'topics', 'user_alerts', 'user_alerts_prefs', 'user_drafts', 'user_likes');
-	foreach ($reservedTables as $k => $table_name)
-		$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	foreach ($reservedTables as $k => $table_name) {
+			$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	}
 
 	// We in turn may need the extra stuff.
 	db_extend('extra');
@@ -107,8 +109,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// First - no way do we touch SMF tables.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Log that we'll want to remove this on uninstall.
 	$db_package_log[] = array('remove_table', $table_name);
@@ -118,9 +121,9 @@ 
 	if (in_array($full_table_name, $tables))
 	{
 		// This is a sad day... drop the table? If not, return false (error) by default.
-		if ($if_exists == 'overwrite')
-			$smcFunc['db_drop_table']($table_name);
-		else if ($if_exists == 'update')
+		if ($if_exists == 'overwrite') {
+					$smcFunc['db_drop_table']($table_name);
+		} else if ($if_exists == 'update')
 		{
 			$smcFunc['db_drop_table']($table_name.'_old');
 			$smcFunc['db_transaction']('begin');
@@ -132,47 +135,51 @@ 
 				)
 			);
 			$old_table_exists = true;
+		} else {
+					return $if_exists == 'ignore';
 		}
-		else
-			return $if_exists == 'ignore';
 	}
 
 	// If we've got this far - good news - no table exists. We can build our own!
-	if (!$db_trans)
-		$smcFunc['db_transaction']('begin');
+	if (!$db_trans) {
+			$smcFunc['db_transaction']('begin');
+	}
 	$table_query = 'CREATE TABLE ' . $table_name . "\n" . '(';
 	foreach ($columns as $column)
 	{
 		// If we have an auto increment do it!
 		if (!empty($column['auto']))
 		{
-			if (!$old_table_exists)
-				$smcFunc['db_query']('', '
+			if (!$old_table_exists) {
+							$smcFunc['db_query']('', '
 					DROP SEQUENCE IF EXISTS ' . $table_name . '_seq',
 					array(
 						'security_override' => true,
 					)
 				);
+			}
 
-			if (!$old_table_exists)
-				$smcFunc['db_query']('', '
+			if (!$old_table_exists) {
+							$smcFunc['db_query']('', '
 					CREATE SEQUENCE ' . $table_name . '_seq',
 					array(
 						'security_override' => true,
 					)
 				);
+			}
 			$default = 'default nextval(\'' . $table_name . '_seq\')';
+		} elseif (isset($column['default']) && $column['default'] !== null) {
+					$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
+		} else {
+					$default = '';
 		}
-		elseif (isset($column['default']) && $column['default'] !== null)
-			$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
-		else
-			$default = '';
 
 		// Sort out the size...
 		$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
 		list ($type, $size) = $smcFunc['db_calculate_type']($column['type'], $column['size']);
-		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		if ($size !== null) {
+					$type = $type . '(' . $size . ')';
+		}
 
 		// Now just put it together!
 		$table_query .= "\n\t\"" . $column['name'] . '" ' . $type . ' ' . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default . ',';
@@ -185,19 +192,21 @@ 
 		$columns = implode(',', $index['columns']);
 
 		// Primary goes in the table...
-		if (isset($index['type']) && $index['type'] == 'primary')
-			$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
-		else
+		if (isset($index['type']) && $index['type'] == 'primary') {
+					$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
+		} else
 		{
-			if (empty($index['name']))
-				$index['name'] = implode('_', $index['columns']);
+			if (empty($index['name'])) {
+							$index['name'] = implode('_', $index['columns']);
+			}
 			$index_queries[] = 'CREATE ' . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $table_name . '_' . $index['name'] . ' ON ' . $table_name . ' (' . $columns . ')';
 		}
 	}
 
 	// No trailing commas!
-	if (substr($table_query, -1) == ',')
-		$table_query = substr($table_query, 0, -1);
+	if (substr($table_query, -1) == ',') {
+			$table_query = substr($table_query, 0, -1);
+	}
 
 	$table_query .= ')';
 
@@ -242,18 +251,20 @@ 
 	}
 
 	// And the indexes...
-	foreach ($index_queries as $query)
-		$smcFunc['db_query']('', $query,
+	foreach ($index_queries as $query) {
+			$smcFunc['db_query']('', $query,
 		array(
 			'security_override' => true,
 		)
 	);
+	}
 
 	// Go, go power rangers!
 	$smcFunc['db_transaction']('commit');
 
-	if ($old_table_exists)
-		$smcFunc['db_drop_table']($table_name . '_old');
+	if ($old_table_exists) {
+			$smcFunc['db_drop_table']($table_name . '_old');
+	}
 
 	return true;
 }
@@ -278,8 +289,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// God no - dropping one of these = bad.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Does it exist?
 	if (in_array($full_table_name, $smcFunc['db_list_tables']()))
@@ -337,21 +349,24 @@ 
 
 	// Does it exist - if so don't add it again!
 	$columns = $smcFunc['db_list_columns']($table_name, false);
-	foreach ($columns as $column)
-		if ($column == $column_info['name'])
+	foreach ($columns as $column) {
+			if ($column == $column_info['name'])
 		{
 			// If we're going to overwrite then use change column.
 			if ($if_exists == 'update')
 				return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-			else
-				return false;
+	}
+			else {
+							return false;
+			}
 		}
 
 	// Get the specifics...
 	$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 	list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	// Now add the thing!
 	$query = '
@@ -366,11 +381,12 @@ 
 	// If there's more attributes they need to be done via a change on PostgreSQL.
 	unset($column_info['type'], $column_info['size']);
 
-	if (count($column_info) != 1)
-		return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-	else
-		return true;
-}
+	if (count($column_info) != 1) {
+			return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
+	} else {
+			return true;
+	}
+	}
 
 /**
  * Removes a column.
@@ -389,8 +405,8 @@ 
 
 	// Does it exist?
 	$columns = $smcFunc['db_list_columns']($table_name, true);
-	foreach ($columns as $column)
-		if ($column['name'] == $column_name)
+	foreach ($columns as $column) {
+			if ($column['name'] == $column_name)
 		{
 			// If there is an auto we need remove it!
 			if ($column['auto'])
@@ -400,6 +416,7 @@ 
 						'security_override' => true,
 					)
 				);
+	}
 
 			$smcFunc['db_query']('', '
 				ALTER TABLE ' . $table_name . '
@@ -433,13 +450,15 @@ 
 	// Check it does exist!
 	$columns = $smcFunc['db_list_columns']($table_name, true);
 	$old_info = null;
-	foreach ($columns as $column)
-		if ($column['name'] == $old_column)
+	foreach ($columns as $column) {
+			if ($column['name'] == $old_column)
 			$old_info = $column;
+	}
 
 	// Nothing?
-	if ($old_info == null)
-		return false;
+	if ($old_info == null) {
+			return false;
+	}
 
 	// Now we check each bit individually and ALTER as required.
 	if (isset($column_info['name']) && $column_info['name'] != $old_column)
@@ -496,8 +515,9 @@ 
 	{
 		$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 		list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
-		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		if ($size !== null) {
+					$type = $type . '(' . $size . ')';
+		}
 
 		// The alter is a pain.
 		$smcFunc['db_transaction']('begin');
@@ -598,21 +618,23 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// No columns = no index.
-	if (empty($index_info['columns']))
-		return false;
+	if (empty($index_info['columns'])) {
+			return false;
+	}
 	$columns = implode(',', $index_info['columns']);
 
 	// No name - make it up!
 	if (empty($index_info['name']))
 	{
 		// No need for primary.
-		if (isset($index_info['type']) && $index_info['type'] == 'primary')
-			$index_info['name'] = '';
-		else
-			$index_info['name'] = $table_name . implode('_', $index_info['columns']);
+		if (isset($index_info['type']) && $index_info['type'] == 'primary') {
+					$index_info['name'] = '';
+		} else {
+					$index_info['name'] = $table_name . implode('_', $index_info['columns']);
+		}
+	} else {
+			$index_info['name'] = $table_name . $index_info['name'];
 	}
-	else
-		$index_info['name'] = $table_name . $index_info['name'];
 
 	// Log that we are going to want to remove this!
 	$db_package_log[] = array('remove_index', $table_name, $index_info['name']);
@@ -625,10 +647,11 @@ 
 		if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary'))
 		{
 			// If we want to overwrite simply remove the current one then continue.
-			if ($if_exists != 'update' || $index['type'] == 'primary')
-				return false;
-			else
-				$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			if ($if_exists != 'update' || $index['type'] == 'primary') {
+							return false;
+			} else {
+							$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			}
 		}
 	}
 
@@ -642,8 +665,7 @@ 
 				'security_override' => true,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			CREATE ' . (isset($index_info['type']) && $index_info['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $index_info['name'] . ' ON ' . $table_name . ' (' . $columns . ')',
@@ -671,8 +693,9 @@ 
 
 	// Better exist!
 	$indexes = $smcFunc['db_list_indexes']($table_name, true);
-	if ($index_name != 'primary')
-		$index_name = $table_name . '_' . $index_name;
+	if ($index_name != 'primary') {
+			$index_name = $table_name . '_' . $index_name;
+	}
 
 	foreach ($indexes as $index)
 	{
@@ -736,8 +759,7 @@ 
 			'datetime' => 'timestamp without time zone',
 			'timestamp' => 'timestamp without time zone',
 		);
-	}
-	else
+	} else
 	{
 		$types = array(
 			'character varying' => 'varchar',
@@ -753,14 +775,16 @@ 
 	// Got it? Change it!
 	if (isset($types[$type_name]))
 	{
-		if ($type_name == 'tinytext')
-			$type_size = 255;
+		if ($type_name == 'tinytext') {
+					$type_size = 255;
+		}
 		$type_name = $types[$type_name];
 	}
 
 	// Only char fields got size
-	if (strpos($type_name, 'char') === false)
-			$type_size = null;
+	if (strpos($type_name, 'char') === false) {
+				$type_size = null;
+	}
 
 
 	return array($type_name, $type_size);
@@ -816,8 +840,7 @@ 
 		if (!$detail)
 		{
 			$columns[] = $row['column_name'];
-		}
-		else
+		} else
 		{
 			$auto = false;
 			// What is the default?
@@ -825,11 +848,11 @@ 
 			{
 				$default = null;
 				$auto = true;
+			} elseif (trim($row['column_default']) != '') {
+							$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
+			} else {
+							$default = null;
 			}
-			elseif (trim($row['column_default']) != '')
-				$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
-			else
-				$default = null;
 
 			// Make the type generic.
 			list ($type, $size) = $smcFunc['db_calculate_type']($row['data_type'], $row['character_maximum_length'], true);
@@ -880,26 +903,30 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// Try get the columns that make it up.
-		if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-			continue;
+		if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0) {
+					continue;
+		}
 
 		$columns = explode(',', $matches[1]);
 
-		if (empty($columns))
-			continue;
+		if (empty($columns)) {
+					continue;
+		}
 
-		foreach ($columns as $k => $v)
-			$columns[$k] = trim($v);
+		foreach ($columns as $k => $v) {
+					$columns[$k] = trim($v);
+		}
 
 		// Fix up the name to be consistent cross databases
-		if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1)
-			$row['name'] = 'PRIMARY';
-		else
-			$row['name'] = str_replace($table_name . '_', '', $row['name']);
+		if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1) {
+					$row['name'] = 'PRIMARY';
+		} else {
+					$row['name'] = str_replace($table_name . '_', '', $row['name']);
+		}
 
-		if (!$detail)
-			$indexes[] = $row['name'];
-		else
+		if (!$detail) {
+					$indexes[] = $row['name'];
+		} else
 		{
 			$indexes[$row['name']] = array(
 				'name' => $row['name'],

Smileys/alienine/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Packages/index.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 	header('location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
+else {
 	exit;
+}
 
 ?>
\ No newline at end of file

cron.php

Braces +36 added lines, -28 removed lines

@@ -41,37 +41,43 @@ 
 define('TIME_START', microtime(true));
 
 // Just being safe...
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable]);
+}
 
 // Get the forum's settings for database and file paths.
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 // Don't do john didley if the forum's been shut down competely.
-if ($maintenance == 2)
+if ($maintenance == 2) {
 	die($mmessage);
+}
 
 // Fix for using the current directory as a path.
-if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.')
+if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') {
 	$sourcedir = dirname(__FILE__) . substr($sourcedir, 1);
+}
 
 // Have we already turned this off? If so, exist gracefully.
-if (file_exists($cachedir . '/cron.lock'))
+if (file_exists($cachedir . '/cron.lock')) {
 	obExit_cron();
+}
 
 // Before we go any further, if this is not a CLI request, we need to do some checking.
 if (!FROM_CLI)
 {
 	// We will clean up $_GET shortly. But we want to this ASAP.
 	$ts = isset($_GET['ts']) ? (int) $_GET['ts'] : 0;
-	if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20)
-		obExit_cron();
-}
+	if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20) {
+			obExit_cron();
+	}
+	}
 
 // Load the most important includes. In general, a background should be loading its own dependencies.
 require_once($sourcedir . '/Errors.php');
@@ -123,8 +129,9 @@ 
 	global $smcFunc;
 
 	// Check we haven't run over our time limit.
-	if (microtime(true) - TIME_START > MAX_CRON_TIME)
-		return false;
+	if (microtime(true) - TIME_START > MAX_CRON_TIME) {
+			return false;
+	}
 
 	// Try to find a task. Specifically, try to find one that hasn't been claimed previously, or failing that,
 	// a task that was claimed but failed for whatever reason and failed long enough ago. We should not care
@@ -159,14 +166,12 @@ 
 			// Update the time and go back.
 			$row['claimed_time'] = time();
 			return $row;
-		}
-		else
+		} else
 		{
 			// Uh oh, we just missed it. Try to claim another one, and let it fall through if there aren't any.
 			return fetch_task();
 		}
-	}
-	else
+	} else
 	{
 		// No dice. Clean up and go home.
 		$smcFunc['db_free_result']($request);
@@ -187,8 +192,9 @@ 
 	if (!empty($task_details['task_file']))
 	{
 		$include = strtr(trim($task_details['task_file']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-		if (file_exists($include))
-			require_once($include);
+		if (file_exists($include)) {
+					require_once($include);
+		}
 	}
 
 	if (empty($task_details['task_class']))
@@ -204,8 +210,7 @@ 
 		$details = empty($task_details['task_data']) ? array() : $smcFunc['json_decode']($task_details['task_data'], true);
 		$bgtask = new $task_details['task_class']($details);
 		return $bgtask->execute();
-	}
-	else
+	} else
 	{
 		log_error('Invalid background task specified: (class: ' . $task_details['task_class'] . ', ' . (empty($task_details['task_file']) ? ' no file' : ' to load ' . $task_details['task_file']) . ')');
 		return true; // So we clear it from the queue.
@@ -224,8 +229,9 @@ 
 	$scripturl = $boardurl . '/index.php';
 
 	// These keys shouldn't be set...ever.
-	if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
-		die('Invalid request variable.');
+	if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
+			die('Invalid request variable.');
+	}
 
 	// Save some memory.. (since we don't use these anyway.)
 	unset($GLOBALS['HTTP_POST_VARS'], $GLOBALS['HTTP_POST_VARS']);
@@ -246,26 +252,28 @@ 
 	global $modSettings;
 
 	// Ignore errors if we're ignoring them or they are strict notices from PHP 5
-	if (error_reporting() == 0)
-		return;
+	if (error_reporting() == 0) {
+			return;
+	}
 
 	$error_type = 'cron';
 
 	log_error($error_level . ': ' . $error_string, $error_type, $file, $line);
 
 	// If this is an E_ERROR or E_USER_ERROR.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR)
-		die('No direct access...');
-}
+	if ($error_level % 255 == E_ERROR) {
+			die('No direct access...');
+	}
+	}
 
 /**
  * The exit function
  */
 function obExit_cron()
 {
-	if (FROM_CLI)
-		die(0);
-	else
+	if (FROM_CLI) {
+			die(0);
+	} else
 	{
 		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");

Sources/Subscriptions-PayPal.php

Braces +83 added lines, -61 removed lines

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

Sources/News.php

Braces +226 added lines, -185 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Outputs xml data representing recent information or a profile.
@@ -37,8 +38,9 @@ 
 	global $query_this_board, $smcFunc, $forum_version, $settings;
 
 	// If it's not enabled, die.
-	if (empty($modSettings['xmlnews_enable']))
-		obExit(false);
+	if (empty($modSettings['xmlnews_enable'])) {
+			obExit(false);
+	}
 
 	loadLanguage('Stats');
 
@@ -64,8 +66,9 @@ 
 	if (!empty($_REQUEST['c']) && empty($board))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		if (count($_REQUEST['c']) == 1)
 		{
@@ -101,18 +104,20 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		}
 
 		// Try to limit the number of messages we look through.
-		if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($_REQUEST['boards']))
+		if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board, b.num_posts, b.name
@@ -128,29 +133,32 @@ 
 
 		// Either the board specified doesn't exist or you have no access.
 		$num_boards = $smcFunc['db_num_rows']($request);
-		if ($num_boards == 0)
-			fatal_lang_error('no_board');
+		if ($num_boards == 0) {
+					fatal_lang_error('no_board');
+		}
 
 		$total_posts = 0;
 		$boards = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($num_boards == 1)
-				$feed_meta['title'] = ' - ' . strip_tags($row['name']);
+			if ($num_boards == 1) {
+							$feed_meta['title'] = ' - ' . strip_tags($row['name']);
+			}
 
 			$boards[] = $row['id_board'];
 			$total_posts += $row['num_posts'];
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		}
 
 		// The more boards, the more we're going to look through...
-		if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($board))
+		if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($board))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT num_posts
@@ -170,10 +178,10 @@ 
 		$query_this_board = 'b.id_board = ' . $board;
 
 		// Try to look through just a few messages, if at all possible.
-		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
-	}
-	else
+		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
+		}
+	} else
 	{
 		$query_this_board = '{query_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
 			AND b.id_board != ' . $modSettings['recycle_board'] : '');
@@ -196,30 +204,35 @@ 
 	// Easy adding of sub actions
  	call_integration_hook('integrate_xmlfeeds', array(&$subActions));
 
-	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']]))
-		$_GET['sa'] = 'recent';
+	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']])) {
+			$_GET['sa'] = 'recent';
+	}
 
 	// We only want some information, not all of it.
 	$cachekey = array($xml_format, $_GET['action'], $_GET['limit'], $_GET['sa']);
-	foreach (array('board', 'boards', 'c') as $var)
-		if (isset($_REQUEST[$var]))
+	foreach (array('board', 'boards', 'c') as $var) {
+			if (isset($_REQUEST[$var]))
 			$cachekey[] = $_REQUEST[$var];
+	}
 	$cachekey = md5($smcFunc['json_encode']($cachekey) . (!empty($query_this_board) ? $query_this_board : ''));
 	$cache_t = microtime();
 
 	// Get the associative array representing the xml.
-	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3))
-		$xml_data = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3)) {
+			$xml_data = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	}
 	if (empty($xml_data))
 	{
 		$call = call_helper($subActions[$_GET['sa']][0], true);
 
-		if (!empty($call))
-			$xml_data = call_user_func($call, $xml_format);
+		if (!empty($call)) {
+					$xml_data = call_user_func($call, $xml_format);
+		}
 
 		if (!empty($modSettings['cache_enable']) && (($user_info['is_guest'] && $modSettings['cache_enable'] >= 3)
-		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2))))
-			cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml_data, 240);
+		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2)))) {
+					cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml_data, 240);
+		}
 	}
 
 	$feed_meta['title'] = $smcFunc['htmlspecialchars'](strip_tags($context['forum_name'])) . (isset($feed_meta['title']) ? $feed_meta['title'] : '');
@@ -259,43 +272,49 @@ 
 	call_integration_hook('integrate_xml_data', array(&$xml_data, &$feed_meta, &$namespaces, &$extraFeedTags, &$forceCdataKeys, &$nsKeys, $xml_format, $_GET['sa']));
 
 	// These can't be empty
-	foreach (array('title', 'desc', 'source') as $mkey)
-		$feed_meta[$mkey] = !empty($feed_meta[$mkey]) ? $feed_meta[$mkey] : $orig_feed_meta[$mkey];
+	foreach (array('title', 'desc', 'source') as $mkey) {
+			$feed_meta[$mkey] = !empty($feed_meta[$mkey]) ? $feed_meta[$mkey] : $orig_feed_meta[$mkey];
+	}
 
 	// Sanitize basic feed metadata values
-	foreach ($feed_meta as $mkey => $mvalue)
-		$feed_meta[$mkey] = cdata_parse(strip_tags(fix_possible_url($feed_meta[$mkey])));
+	foreach ($feed_meta as $mkey => $mvalue) {
+			$feed_meta[$mkey] = cdata_parse(strip_tags(fix_possible_url($feed_meta[$mkey])));
+	}
 
 	$ns_string = '';
 	if (!empty($namespaces[$xml_format]))
 	{
-		foreach ($namespaces[$xml_format] as $nsprefix => $nsurl)
-			$ns_string .= ' xmlns' . ($nsprefix !== '' ? ':' : '') . $nsprefix . '="' . $nsurl . '"';
+		foreach ($namespaces[$xml_format] as $nsprefix => $nsurl) {
+					$ns_string .= ' xmlns' . ($nsprefix !== '' ? ':' : '') . $nsprefix . '="' . $nsurl . '"';
+		}
 	}
 
 	$extraFeedTags_string = '';
 	if (!empty($extraFeedTags[$xml_format]))
 	{
 		$indent = "\t" . ($xml_format !== 'atom' ? "\t" : '');
-		foreach ($extraFeedTags[$xml_format] as $extraTag)
-			$extraFeedTags_string .= "\n" . $indent . $extraTag;
+		foreach ($extraFeedTags[$xml_format] as $extraTag) {
+					$extraFeedTags_string .= "\n" . $indent . $extraTag;
+		}
 	}
 
 	// This is an xml file....
 	ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			ob_start();
+	}
 
-	if ($xml_format == 'smf' || isset($_REQUEST['debug']))
-		header('content-type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rss' || $xml_format == 'rss2')
-		header('content-type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'atom')
-		header('content-type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rdf')
-		header('content-type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	if ($xml_format == 'smf' || isset($_REQUEST['debug'])) {
+			header('content-type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rss' || $xml_format == 'rss2') {
+			header('content-type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'atom') {
+			header('content-type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rdf') {
+			header('content-type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	}
 
 	// First, output the xml header.
 	echo '<?xml version="1.0" encoding="', $context['character_set'], '"?' . '>';
@@ -303,10 +322,11 @@ 
 	// Are we outputting an rss feed or one with more information?
 	if ($xml_format == 'rss' || $xml_format == 'rss2')
 	{
-		if ($xml_format == 'rss2')
-			foreach ($_REQUEST as $var => $val)
+		if ($xml_format == 'rss2') {
+					foreach ($_REQUEST as $var => $val)
 				if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
 					$url_parts[] = $var . '=' . (is_array($val) ? implode(',', $val) : $val);
+		}
 
 		// Start with an RSS 2.0 header.
 		echo '
@@ -327,9 +347,10 @@ 
 		<language>' . $feed_meta['language'] . '</language>' : '';
 
 		// RSS2 calls for this.
-		if ($xml_format == 'rss2')
-			echo '
+		if ($xml_format == 'rss2') {
+					echo '
 		<atom:link rel="self" type="application/rss+xml" href="', $scripturl, !empty($url_parts) ? '?' . implode(';', $url_parts) : '', '" />';
+		}
 
 		echo $extraFeedTags_string;
 
@@ -340,12 +361,12 @@ 
 		echo '
 	</channel>
 </rss>';
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
-		foreach ($_REQUEST as $var => $val)
-			if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
+		foreach ($_REQUEST as $var => $val) {
+					if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
 				$url_parts[] = $var . '=' . (is_array($val) ? implode(',', $val) : $val);
+		}
 
 		echo '
 <feed', $ns_string, !empty($feed_meta['language']) ? ' xml:lang="' . $feed_meta['language'] . '"' : '', '>
@@ -371,8 +392,7 @@ 
 
 		echo '
 </feed>';
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		echo '
 <rdf:RDF', $ns_string, '>
@@ -437,13 +457,15 @@ 
 {
 	global $modSettings, $context, $scripturl;
 
-	if (substr($val, 0, strlen($scripturl)) != $scripturl)
-		return $val;
+	if (substr($val, 0, strlen($scripturl)) != $scripturl) {
+			return $val;
+	}
 
 	call_integration_hook('integrate_fix_url', array(&$val));
 
-	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd']))
-		return $val;
+	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd'])) {
+			return $val;
+	}
 
 	$val = preg_replace_callback('~\b' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+)(#[^"]*)?$~', function($m) use ($scripturl)
 		{
@@ -466,8 +488,9 @@ 
 	global $smcFunc;
 
 	// Do we even need to do this?
-	if (strpbrk($data, '<>&') == false && $force !== true)
-		return $data;
+	if (strpbrk($data, '<>&') == false && $force !== true) {
+			return $data;
+	}
 
 	$cdata = '<![CDATA[';
 
@@ -477,49 +500,55 @@ 
 			$smcFunc['strpos']($data, '&', $pos),
 			$smcFunc['strpos']($data, ']', $pos),
 		);
-		if ($ns != '')
-			$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		if ($ns != '') {
+					$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		}
 		foreach ($positions as $k => $dummy)
 		{
-			if ($dummy === false)
-				unset($positions[$k]);
+			if ($dummy === false) {
+							unset($positions[$k]);
+			}
 		}
 
 		$old = $pos;
 		$pos = empty($positions) ? $n : min($positions);
 
-		if ($pos - $old > 0)
-			$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
-		if ($pos >= $n)
-			break;
+		if ($pos - $old > 0) {
+					$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
+		}
+		if ($pos >= $n) {
+					break;
+		}
 
 		if ($smcFunc['substr']($data, $pos, 1) == '<')
 		{
 			$pos2 = $smcFunc['strpos']($data, '>', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '/')
-				$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
-			else
-				$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '/') {
+							$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
+			} else {
+							$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			}
 			$pos = $pos2 + 1;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == ']')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == ']')
 		{
 			$cdata .= ']]>&#093;<![CDATA[';
 			$pos++;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == '&')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == '&')
 		{
 			$pos2 = $smcFunc['strpos']($data, ';', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
 			$ent = $smcFunc['substr']($data, $pos + 1, $pos2 - $pos - 1);
 
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '#')
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
-			elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot')))
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '#') {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			} elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot'))) {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			}
 
 			$pos = $pos2 + 1;
 		}
@@ -559,8 +588,9 @@ 
 		'gender',
 		'blurb',
 	);
-	if ($xml_format != 'atom')
-		$keysToCdata[] = 'category';
+	if ($xml_format != 'atom') {
+			$keysToCdata[] = 'category';
+	}
 
 	if (!empty($forceCdataKeys))
 	{
@@ -577,8 +607,9 @@ 
 		$attrs = isset($element['attributes']) ? $element['attributes'] : null;
 
 		// Skip it, it's been set to null.
-		if ($key === null || ($val === null && $attrs === null))
-			continue;
+		if ($key === null || ($val === null && $attrs === null)) {
+					continue;
+		}
 
 		$forceCdata = in_array($key, $forceCdataKeys);
 		$ns = !empty($nsKeys[$key]) ? $nsKeys[$key] : '';
@@ -591,16 +622,16 @@ 
 
 		if (!empty($attrs))
 		{
-			foreach ($attrs as $attr_key => $attr_value)
-				echo ' ', $attr_key, '="', fix_possible_url($attr_value), '"';
+			foreach ($attrs as $attr_key => $attr_value) {
+							echo ' ', $attr_key, '="', fix_possible_url($attr_value), '"';
+			}
 		}
 
 		// If it's empty, simply output an empty element.
 		if (empty($val))
 		{
 			echo ' />';
-		}
-		else
+		} else
 		{
 			echo '>';
 
@@ -612,11 +643,13 @@ 
 				echo "\n", str_repeat("\t", $i);
 			}
 			// A string with returns in it.... show this as a multiline element.
-			elseif (strpos($val, "\n") !== false)
-				echo "\n", in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val), "\n", str_repeat("\t", $i);
+			elseif (strpos($val, "\n") !== false) {
+							echo "\n", in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val), "\n", str_repeat("\t", $i);
+			}
 			// A simple string.
-			else
-				echo in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val);
+			else {
+							echo in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val);
+			}
 
 			// Ending tag.
 			echo '</', $key, '>';
@@ -636,8 +669,9 @@ 
 {
 	global $scripturl, $smcFunc;
 
-	if (!allowedTo('view_mlist'))
-		return array();
+	if (!allowedTo('view_mlist')) {
+			return array();
+	}
 
 	// Find the most recent members.
 	$request = $smcFunc['db_query']('', '
@@ -656,8 +690,8 @@ 
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['date_registered']) . ':member=' . $row['id_member'];
 
 		// Make the data look rss-ish.
-		if ($xml_format == 'rss' || $xml_format == 'rss2')
-			$data[] = array(
+		if ($xml_format == 'rss' || $xml_format == 'rss2') {
+					$data[] = array(
 				'tag' => 'item',
 				'content' => array(
 					array(
@@ -685,8 +719,8 @@ 
 					),
 				),
 			);
-		elseif ($xml_format == 'rdf')
-			$data[] = array(
+		} elseif ($xml_format == 'rdf') {
+					$data[] = array(
 				'tag' => 'item',
 				'attributes' => array('rdf:about' => $scripturl . '?action=profile;u=' . $row['id_member']),
 				'content' => array(
@@ -704,8 +738,8 @@ 
 					),
 				),
 			);
-		elseif ($xml_format == 'atom')
-			$data[] = array(
+		} elseif ($xml_format == 'atom') {
+					$data[] = array(
 				'tag' => 'entry',
 				'content' => array(
 					array(
@@ -734,9 +768,10 @@ 
 					),
 				),
 			);
+		}
 		// More logical format for the data, but harder to apply.
-		else
-			$data[] = array(
+		else {
+					$data[] = array(
 				'tag' => 'member',
 				'content' => array(
 					array(
@@ -757,6 +792,7 @@ 
 					),
 				),
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -817,22 +853,24 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			}
 			$context['optimize_msg']['highest'] = 'm.id_msg <= t.id_last_msg';
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$data = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -859,8 +897,9 @@ 
 			while ($attach = $smcFunc['db_fetch_assoc']($attach_request))
 			{
 				// Include approved attachments only
-				if ($attach['approved'])
-					$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				if ($attach['approved']) {
+									$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				}
 			}
 			$smcFunc['db_free_result']($attach_request);
 
@@ -868,16 +907,17 @@ 
 			if (!empty($loaded_attachments))
 			{
 				uasort($loaded_attachments, function($a, $b) {
-					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+					if ($a['filesize'] == $b['filesize']) {
+										        return 0;
+					}
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
+			} else {
+							$loaded_attachments = null;
 			}
-			else
-				$loaded_attachments = null;
+		} else {
+					$loaded_attachments = null;
 		}
-		else
-			$loaded_attachments = null;
 
 		// Create a GUID for this topic using the tag URI scheme
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['poster_time']) . ':topic=' . $row['id_topic'];
@@ -894,9 +934,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -942,8 +982,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -967,8 +1006,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -980,9 +1018,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1082,9 +1120,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'article',
@@ -1202,22 +1240,25 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			}
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$messages[] = $row['id_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$messages[] = $row['id_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($messages))
-		return array();
+	if (empty($messages)) {
+			return array();
+	}
 
 	// Find the most recent posts this user can see.
 	$request = $smcFunc['db_query']('', '
@@ -1247,8 +1288,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -1275,8 +1317,9 @@ 
 			while ($attach = $smcFunc['db_fetch_assoc']($attach_request))
 			{
 				// Include approved attachments only
-				if ($attach['approved'])
-					$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				if ($attach['approved']) {
+									$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				}
 			}
 			$smcFunc['db_free_result']($attach_request);
 
@@ -1284,16 +1327,17 @@ 
 			if (!empty($loaded_attachments))
 			{
 				uasort($loaded_attachments, function($a, $b) {
-					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+					if ($a['filesize'] == $b['filesize']) {
+										        return 0;
+					}
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
+			} else {
+							$loaded_attachments = null;
 			}
-			else
-				$loaded_attachments = null;
+		} else {
+					$loaded_attachments = null;
 		}
-		else
-			$loaded_attachments = null;
 
 		// Create a GUID for this post using the tag URI scheme
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['poster_time']) . ':msg=' . $row['id_msg'];
@@ -1310,9 +1354,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -1358,8 +1402,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -1383,8 +1426,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -1396,9 +1438,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1498,9 +1540,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'recent-post',
@@ -1619,14 +1661,16 @@ 
 	global $scripturl, $memberContext, $user_profile, $user_info;
 
 	// You must input a valid user....
-	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u']))
-		return array();
+	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u'])) {
+			return array();
+	}
 
 	// Make sure the id is a number and not "I like trying to hack the database".
 	$_GET['u'] = (int) $_GET['u'];
 	// Load the member's contextual information!
-	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view'))
-		return array();
+	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view')) {
+			return array();
+	}
 
 	// Okay, I admit it, I'm lazy.  Stupid $_GET['u'] is long and hard to type.
 	$profile = &$memberContext[$_GET['u']];
@@ -1668,8 +1712,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		$data[] = array(
 			'tag' => 'item',
@@ -1693,8 +1736,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
 		$data[] = array(
 			'tag' => 'entry',
@@ -1747,8 +1789,7 @@ 
 				),
 			)
 		);
-	}
-	else
+	} else
 	{
 		$data = array(
 			array(