albertlast / SMF2.1

index.php

Braces +37 added lines, -25 removed lines

@@ -25,8 +25,9 @@ 
 
 // Get everything started up...
 define('SMF', 1);
-if (function_exists('set_magic_quotes_runtime') && strnatcmp(phpversion(),'5.3.0') < 0)
+if (function_exists('set_magic_quotes_runtime') && strnatcmp(phpversion(),'5.3.0') < 0) {
 	@set_magic_quotes_runtime(0);
+}
 error_reporting(defined('E_STRICT') ? E_ALL | E_STRICT : E_ALL);
 $time_start = microtime();
 
@@ -34,16 +35,18 @@ 
 ob_start();
 
 // Do some cleaning, just in case.
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable], $GLOBALS[$variable]);
+}
 
 // Load the settings...
 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';
+}
 
 // Without those we can't go anywhere
 require_once($sourcedir . '/QueryString.php');
@@ -53,8 +56,9 @@ 
 require_once($sourcedir . '/Load.php');
 
 // If $maintenance is set specifically to 2, then we're upgrading or something.
-if (!empty($maintenance) && $maintenance == 2)
+if (!empty($maintenance) && $maintenance == 2) {
 	display_maintenance_message();
+}
 
 // Create a variable to store some SMF specific functions in.
 $smcFunc = array();
@@ -69,8 +73,9 @@ 
 cleanRequest();
 
 // Seed the random generator.
-if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69)
+if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
 	smf_seed_generator();
+}
 
 // Before we get carried away, are we doing a scheduled task? If so save CPU cycles by jumping out!
 if (isset($_GET['scheduled']))
@@ -90,9 +95,9 @@ 
 if (!empty($modSettings['enableCompressedOutput']) && !headers_sent())
 {
 	// If zlib is being used, turn off output compression.
-	if (ini_get('zlib.output_compression') >=  1 || ini_get('output_handler') == 'ob_gzhandler')
-		$modSettings['enableCompressedOutput'] = '0';
-	else
+	if (ini_get('zlib.output_compression') >=  1 || ini_get('output_handler') == 'ob_gzhandler') {
+			$modSettings['enableCompressedOutput'] = '0';
+	} else
 	{
 		ob_end_clean();
 		ob_start('ob_gzhandler');
@@ -141,18 +146,21 @@ 
 	loadPermissions();
 
 	// Attachments don't require the entire theme to be loaded.
-	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach')
-		detectBrowser();
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach') {
+			detectBrowser();
+	}
 	// Load the current theme.  (note that ?theme=1 will also work, may be used for guest theming.)
-	else
-		loadTheme();
+	else {
+			loadTheme();
+	}
 
 	// Check if the user should be disallowed access.
 	is_not_banned();
 
 	// If we are in a topic and don't have permission to approve it then duck out now.
-	if (!empty($topic) && empty($board_info['cur_topic_approved']) && !allowedTo('approve_posts') && ($user_info['id'] != $board_info['cur_topic_starter'] || $user_info['is_guest']))
-		fatal_lang_error('not_a_topic', false);
+	if (!empty($topic) && empty($board_info['cur_topic_approved']) && !allowedTo('approve_posts') && ($user_info['id'] != $board_info['cur_topic_starter'] || $user_info['is_guest'])) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	$no_stat_actions = array('clock', 'dlattach', 'findmember', 'jsoption', 'likes', 'loadeditorlocale', 'modifycat', 'requestmembers', 'smstats', 'suggest', 'about:unknown', '.xml', 'xmlhttp', 'verificationcode', 'viewquery', 'viewsmfile');
 	call_integration_hook('integrate_pre_log_stats', array(&$no_stat_actions));
@@ -163,8 +171,9 @@ 
 		writeLog();
 
 		// Track forum statistics and hits...?
-		if (!empty($modSettings['hitStats']))
-			trackStats(array('hits' => '+'));
+		if (!empty($modSettings['hitStats'])) {
+					trackStats(array('hits' => '+'));
+		}
 	}
 	unset($no_stat_actions);
 
@@ -178,13 +187,14 @@ 
 			return ($_REQUEST['action'] == 'login2' ? 'Login2' : ($_REQUEST['action'] == 'logintfa' ? 'LoginTFA' : 'Logout'));
 		}
 		// Don't even try it, sonny.
-		else
-			return 'InMaintenance';
+		else {
+					return 'InMaintenance';
+		}
 	}
 	// If guest access is off, a guest can only do one of the very few following actions.
-	elseif (empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('coppa', 'login', 'login2', 'logintfa', 'reminder', 'activate', 'help', 'helpadmin', 'smstats', 'verificationcode', 'signup', 'signup2'))))
-		return 'KickGuest';
-	elseif (empty($_REQUEST['action']))
+	elseif (empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('coppa', 'login', 'login2', 'logintfa', 'reminder', 'activate', 'help', 'helpadmin', 'smstats', 'verificationcode', 'signup', 'signup2')))) {
+			return 'KickGuest';
+	} elseif (empty($_REQUEST['action']))
 	{
 		// Action and board are both empty... BoardIndex! Unless someone else wants to do something different.
 		if (empty($board) && empty($topic))
@@ -200,8 +210,9 @@ 
 
 				$call = call_helper($defaultAction, true);
 
-				if (!empty($call))
-					return $call;
+				if (!empty($call)) {
+									return $call;
+				}
 			}
 
 			// No default action huh? then go to our good old BoardIndex.
@@ -331,8 +342,9 @@ 
 
 			$call = call_helper($fallbackAction, true);
 
-			if (!empty($call))
-				return $call;
+			if (!empty($call)) {
+							return $call;
+			}
 		}
 
 		// No fallback action, huh?

Sources/Profile.php

Braces +155 added lines, -118 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main designating function for modifying profiles. Loads up info, determins what to do, etc.
@@ -30,18 +31,21 @@ 
 	global $db_show_debug, $smcFunc;
 
 	// Don't reload this as we may have processed error strings.
-	if (empty($post_errors))
-		loadLanguage('Profile+Drafts');
+	if (empty($post_errors)) {
+			loadLanguage('Profile+Drafts');
+	}
 	loadTemplate('Profile');
 
 	require_once($sourcedir . '/Subs-Menu.php');
 
 	// Did we get the user by name...
-	if (isset($_REQUEST['user']))
-		$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	if (isset($_REQUEST['user'])) {
+			$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	}
 	// ... or by id_member?
-	elseif (!empty($_REQUEST['u']))
-		$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	elseif (!empty($_REQUEST['u'])) {
+			$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	}
 	// If it was just ?action=profile, edit your own profile, but only if you're not a guest.
 	else
 	{
@@ -51,8 +55,9 @@ 
 	}
 
 	// Check if loadMemberData() has returned a valid result.
-	if (!$memberResult)
-		fatal_lang_error('not_a_user', false, 404);
+	if (!$memberResult) {
+			fatal_lang_error('not_a_user', false, 404);
+	}
 
 	// If all went well, we have a valid member ID!
 	list ($memID) = $memberResult;
@@ -68,8 +73,9 @@ 
 
 	// Group management isn't actually a permission. But we need it to be for this, so we need a phantom permission.
 	// And we care about what the current user can do, not what the user whose profile it is.
-	if ($user_info['mod_cache']['gq'] != '0=1')
-		$user_info['permissions'][] = 'approve_group_requests';
+	if ($user_info['mod_cache']['gq'] != '0=1') {
+			$user_info['permissions'][] = 'approve_group_requests';
+	}
 
 	// If paid subscriptions are enabled, make sure we actually have at least one subscription available...
 	$context['subs_available'] = false;
@@ -437,21 +443,25 @@ 
 		foreach ($section['areas'] as $area_id => $area)
 		{
 			// If it said no permissions that meant it wasn't valid!
-			if (empty($area['permission'][$context['user']['is_owner'] ? 'own' : 'any']))
-				$profile_areas[$section_id]['areas'][$area_id]['enabled'] = false;
+			if (empty($area['permission'][$context['user']['is_owner'] ? 'own' : 'any'])) {
+							$profile_areas[$section_id]['areas'][$area_id]['enabled'] = false;
+			}
 			// Otherwise pick the right set.
-			else
-				$profile_areas[$section_id]['areas'][$area_id]['permission'] = $area['permission'][$context['user']['is_owner'] ? 'own' : 'any'];
+			else {
+							$profile_areas[$section_id]['areas'][$area_id]['permission'] = $area['permission'][$context['user']['is_owner'] ? 'own' : 'any'];
+			}
 
 			// Password required in most cases
-			if (!empty($area['password']))
-				$context['password_areas'][] = $area_id;
+			if (!empty($area['password'])) {
+							$context['password_areas'][] = $area_id;
+			}
 		}
 	}
 
 	// Is there an updated message to show?
-	if (isset($_GET['updated']))
-		$context['profile_updated'] = $txt['profile_updated_own'];
+	if (isset($_GET['updated'])) {
+			$context['profile_updated'] = $txt['profile_updated_own'];
+	}
 
 	// Set a few options for the menu.
 	$menuOptions = array(
@@ -466,8 +476,9 @@ 
 	$profile_include_data = createMenu($profile_areas, $menuOptions);
 
 	// No menu means no access.
-	if (!$profile_include_data && (!$user_info['is_guest'] || validateSession()))
-		fatal_lang_error('no_access', false);
+	if (!$profile_include_data && (!$user_info['is_guest'] || validateSession())) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['profile_menu_id'] = $context['max_menu_id'];
@@ -493,8 +504,9 @@ 
 			if ($current_area == $area_id)
 			{
 				// This can't happen - but is a security check.
-				if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false))
-					fatal_lang_error('no_access', false);
+				if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false)) {
+									fatal_lang_error('no_access', false);
+				}
 
 				// Are we saving data in a valid area?
 				if (isset($area['sc']) && (isset($_REQUEST['save']) || $context['do_preview']))
@@ -513,12 +525,14 @@ 
 				}
 
 				// Does this require session validating?
-				if (!empty($area['validate']) || (isset($_REQUEST['save']) && !$context['user']['is_owner']))
-					$security_checks['validate'] = true;
+				if (!empty($area['validate']) || (isset($_REQUEST['save']) && !$context['user']['is_owner'])) {
+									$security_checks['validate'] = true;
+				}
 
 				// Permissions for good measure.
-				if (!empty($profile_include_data['permission']))
-					$security_checks['permission'] = $profile_include_data['permission'];
+				if (!empty($profile_include_data['permission'])) {
+									$security_checks['permission'] = $profile_include_data['permission'];
+				}
 
 				// Either way got something.
 				$found_area = true;
@@ -527,21 +541,26 @@ 
 	}
 
 	// Oh dear, some serious security lapse is going on here... we'll put a stop to that!
-	if (!$found_area)
-		fatal_lang_error('no_access', false);
+	if (!$found_area) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Release this now.
 	unset($profile_areas);
 
 	// Now the context is setup have we got any security checks to carry out additional to that above?
-	if (isset($security_checks['session']))
-		checkSession($security_checks['session']);
-	if (isset($security_checks['validate']))
-		validateSession();
-	if (isset($security_checks['validateToken']))
-		validateToken($token_name, $token_type);
-	if (isset($security_checks['permission']))
-		isAllowedTo($security_checks['permission']);
+	if (isset($security_checks['session'])) {
+			checkSession($security_checks['session']);
+	}
+	if (isset($security_checks['validate'])) {
+			validateSession();
+	}
+	if (isset($security_checks['validateToken'])) {
+			validateToken($token_name, $token_type);
+	}
+	if (isset($security_checks['permission'])) {
+			isAllowedTo($security_checks['permission']);
+	}
 
 	// Create a token if needed.
 	if (isset($security_checks['needsToken']) || isset($security_checks['validateToken']))
@@ -551,8 +570,9 @@ 
 	}
 
 	// File to include?
-	if (isset($profile_include_data['file']))
-		require_once($sourcedir . '/' . $profile_include_data['file']);
+	if (isset($profile_include_data['file'])) {
+			require_once($sourcedir . '/' . $profile_include_data['file']);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
@@ -560,17 +580,19 @@ 
 		'name' => sprintf($txt['profile_of_username'], $context['member']['name']),
 	);
 
-	if (!empty($profile_include_data['label']))
-		$context['linktree'][] = array(
+	if (!empty($profile_include_data['label'])) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=profile' . ($memID != $user_info['id'] ? ';u=' . $memID : '') . ';area=' . $profile_include_data['current_area'],
 			'name' => $profile_include_data['label'],
 		);
+	}
 
-	if (!empty($profile_include_data['current_subsection']) && $profile_include_data['subsections'][$profile_include_data['current_subsection']][0] != $profile_include_data['label'])
-		$context['linktree'][] = array(
+	if (!empty($profile_include_data['current_subsection']) && $profile_include_data['subsections'][$profile_include_data['current_subsection']][0] != $profile_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=profile' . ($memID != $user_info['id'] ? ';u=' . $memID : '') . ';area=' . $profile_include_data['current_area'] . ';sa=' . $profile_include_data['current_subsection'],
 			'name' => $profile_include_data['subsections'][$profile_include_data['current_subsection']][0],
 		);
+	}
 
 	// Set the template for this area and add the profile layer.
 	$context['sub_template'] = $profile_include_data['function'];
@@ -596,12 +618,14 @@ 
 		if ($check_password)
 		{
 			// Check to ensure we're forcing SSL for authentication
-			if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
-				fatal_lang_error('login_ssl_required');
+			if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) {
+							fatal_lang_error('login_ssl_required');
+			}
 
 			// You didn't even enter a password!
-			if (trim($_POST['oldpasswrd']) == '')
-				$post_errors[] = 'no_password';
+			if (trim($_POST['oldpasswrd']) == '') {
+							$post_errors[] = 'no_password';
+			}
 
 			// Since the password got modified due to all the $_POST cleaning, lets undo it so we can get the correct password
 			$_POST['oldpasswrd'] = un_htmlspecialchars($_POST['oldpasswrd']);
@@ -610,33 +634,35 @@ 
 			$good_password = in_array(true, call_integration_hook('integrate_verify_password', array($cur_profile['member_name'], $_POST['oldpasswrd'], false)), true);
 
 			// Bad password!!!
-			if (!$good_password && !hash_verify_password($user_profile[$memID]['member_name'], un_htmlspecialchars(stripslashes($_POST['oldpasswrd'])), $user_info['passwd']))
-				$post_errors[] = 'bad_password';
+			if (!$good_password && !hash_verify_password($user_profile[$memID]['member_name'], un_htmlspecialchars(stripslashes($_POST['oldpasswrd'])), $user_info['passwd'])) {
+							$post_errors[] = 'bad_password';
+			}
 
 			// Warn other elements not to jump the gun and do custom changes!
-			if (in_array('bad_password', $post_errors))
-				$context['password_auth_failed'] = true;
+			if (in_array('bad_password', $post_errors)) {
+							$context['password_auth_failed'] = true;
+			}
 		}
 
 		// Change the IP address in the database.
-		if ($context['user']['is_owner'])
-			$profile_vars['member_ip'] = $user_info['ip'];
+		if ($context['user']['is_owner']) {
+					$profile_vars['member_ip'] = $user_info['ip'];
+		}
 
 		// Now call the sub-action function...
 		if ($current_area == 'activateaccount')
 		{
-			if (empty($post_errors))
-				activateAccount($memID);
-		}
-		elseif ($current_area == 'deleteaccount')
+			if (empty($post_errors)) {
+							activateAccount($memID);
+			}
+		} elseif ($current_area == 'deleteaccount')
 		{
 			if (empty($post_errors))
 			{
 				deleteAccount2($memID);
 				redirectexit();
 			}
-		}
-		elseif ($current_area == 'groupmembership' && empty($post_errors))
+		} elseif ($current_area == 'groupmembership' && empty($post_errors))
 		{
 			$msg = groupMembership2($profile_vars, $post_errors, $memID);
 
@@ -647,10 +673,9 @@ 
 		elseif ($current_area == 'authentication')
 		{
 			authentication($memID, true);
-		}
-		elseif (in_array($current_area, array('account', 'forumprofile', 'theme')))
-			saveProfileFields();
-		else
+		} elseif (in_array($current_area, array('account', 'forumprofile', 'theme'))) {
+					saveProfileFields();
+		} else
 		{
 			$force_redirect = true;
 			// Ensure we include this.
@@ -666,34 +691,36 @@ 
 			// Load the language file so we can give a nice explanation of the errors.
 			loadLanguage('Errors');
 			$context['post_errors'] = $post_errors;
-		}
-		elseif (!empty($profile_vars))
+		} elseif (!empty($profile_vars))
 		{
 			// If we've changed the password, notify any integration that may be listening in.
-			if (isset($profile_vars['passwd']))
-				call_integration_hook('integrate_reset_pass', array($cur_profile['member_name'], $cur_profile['member_name'], $_POST['passwrd2']));
+			if (isset($profile_vars['passwd'])) {
+							call_integration_hook('integrate_reset_pass', array($cur_profile['member_name'], $cur_profile['member_name'], $_POST['passwrd2']));
+			}
 
 			updateMemberData($memID, $profile_vars);
 
 			// What if this is the newest member?
-			if ($modSettings['latestMember'] == $memID)
-				updateStats('member');
-			elseif (isset($profile_vars['real_name']))
-				updateSettings(array('memberlist_updated' => time()));
+			if ($modSettings['latestMember'] == $memID) {
+							updateStats('member');
+			} elseif (isset($profile_vars['real_name'])) {
+							updateSettings(array('memberlist_updated' => time()));
+			}
 
 			// If the member changed his/her birthdate, update calendar statistics.
-			if (isset($profile_vars['birthdate']) || isset($profile_vars['real_name']))
-				updateSettings(array(
+			if (isset($profile_vars['birthdate']) || isset($profile_vars['real_name'])) {
+							updateSettings(array(
 					'calendar_updated' => time(),
 				));
+			}
 
 			// Anything worth logging?
 			if (!empty($context['log_changes']) && !empty($modSettings['modlog_enabled']))
 			{
 				$log_changes = array();
 				require_once($sourcedir . '/Logging.php');
-				foreach ($context['log_changes'] as $k => $v)
-					$log_changes[] = array(
+				foreach ($context['log_changes'] as $k => $v) {
+									$log_changes[] = array(
 						'action' => $k,
 						'log_type' => 'user',
 						'extra' => array_merge($v, array(
@@ -701,14 +728,16 @@ 
 							'member_affected' => $memID,
 						)),
 					);
+				}
 
 				logActions($log_changes);
 			}
 
 			// Have we got any post save functions to execute?
-			if (!empty($context['profile_execute_on_save']))
-				foreach ($context['profile_execute_on_save'] as $saveFunc)
+			if (!empty($context['profile_execute_on_save'])) {
+							foreach ($context['profile_execute_on_save'] as $saveFunc)
 					$saveFunc();
+			}
 
 			// Let them know it worked!
 			$context['profile_updated'] = $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $cur_profile['member_name']);
@@ -722,27 +751,31 @@ 
 	if (!empty($post_errors))
 	{
 		// Set all the errors so the template knows what went wrong.
-		foreach ($post_errors as $error_type)
-			$context['modify_error'][$error_type] = true;
+		foreach ($post_errors as $error_type) {
+					$context['modify_error'][$error_type] = true;
+		}
 	}
 	// If it's you then we should redirect upon save.
-	elseif (!empty($profile_vars) && $context['user']['is_owner'] && !$context['do_preview'])
-		redirectexit('action=profile;area=' . $current_area . (!empty($current_sa) ? ';sa=' . $current_sa : '') . ';updated');
-	elseif (!empty($force_redirect))
-		redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=' . $current_area);
+	elseif (!empty($profile_vars) && $context['user']['is_owner'] && !$context['do_preview']) {
+			redirectexit('action=profile;area=' . $current_area . (!empty($current_sa) ? ';sa=' . $current_sa : '') . ';updated');
+	} elseif (!empty($force_redirect)) {
+			redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=' . $current_area);
+	}
 
 
 	// Get the right callable.
 	$call = call_helper($profile_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call, $memID);
+	if (!empty($call)) {
+			call_user_func($call, $memID);
+	}
 
 	// Set the page title if it's not already set...
-	if (!isset($context['page_title']))
-		$context['page_title'] = $txt['profile'] . (isset($txt[$current_area]) ? ' - ' . $txt[$current_area] : '');
-}
+	if (!isset($context['page_title'])) {
+			$context['page_title'] = $txt['profile'] . (isset($txt[$current_area]) ? ' - ' . $txt[$current_area] : '');
+	}
+	}
 
 /**
  * Set up the requirements for the profile popup - the area that is shown as the popup menu for the current user.
@@ -865,16 +898,18 @@ 
 	if (!allowedTo('admin_forum') && $area != 'register')
 	{
 		// If it's the owner they can see two types of private fields, regardless.
-		if ($memID == $user_info['id'])
-			$where .= $area == 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)';
-		else
-			$where .= $area == 'summary' ? ' AND private < 2' : ' AND private = 0';
+		if ($memID == $user_info['id']) {
+					$where .= $area == 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)';
+		} else {
+					$where .= $area == 'summary' ? ' AND private < 2' : ' AND private = 0';
+		}
 	}
 
-	if ($area == 'register')
-		$where .= ' AND show_reg != 0';
-	elseif ($area != 'summary')
-		$where .= ' AND show_profile = {string:area}';
+	if ($area == 'register') {
+			$where .= ' AND show_reg != 0';
+	} elseif ($area != 'summary') {
+			$where .= ' AND show_profile = {string:area}';
+	}
 
 	// Load all the relevant fields - and data.
 	$request = $smcFunc['db_query']('', '
@@ -900,13 +935,15 @@ 
 		if (isset($_POST['customfield']) && isset($_POST['customfield'][$row['col_name']]))
 		{
 			$value = $smcFunc['htmlspecialchars']($_POST['customfield'][$row['col_name']]);
-			if (in_array($row['field_type'], array('select', 'radio')))
-					$value = ($options = explode(',', $row['field_options'])) && isset($options[$value]) ? $options[$value] : '';
+			if (in_array($row['field_type'], array('select', 'radio'))) {
+								$value = ($options = explode(',', $row['field_options'])) && isset($options[$value]) ? $options[$value] : '';
+			}
 		}
 
 		// Don't show the "disabled" option for the "gender" field if we are on the "summary" area.
-		if ($area == 'summary' && $row['col_name'] == 'cust_gender' && $value == 'Disabled')
-			continue;
+		if ($area == 'summary' && $row['col_name'] == 'cust_gender' && $value == 'Disabled') {
+					continue;
+		}
 
 		// HTML for the input form.
 		$output_html = $value;
@@ -915,8 +952,7 @@ 
 			$true = (!$exists && $row['default_value']) || $value;
 			$input_html = '<input type="checkbox" name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . ($true ? ' checked' : '') . ' class="input_check">';
 			$output_html = $true ? $txt['yes'] : $txt['no'];
-		}
-		elseif ($row['field_type'] == 'select')
+		} elseif ($row['field_type'] == 'select')
 		{
 			$input_html = '<select name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"><option value="-1"></option>';
 			$options = explode(',', $row['field_options']);
@@ -924,13 +960,13 @@ 
 			{
 				$true = (!$exists && $row['default_value'] == $v) || $value == $v;
 				$input_html .= '<option value="' . $k . '"' . ($true ? ' selected' : '') . '>' . $v . '</option>';
-				if ($true)
-					$output_html = $v;
+				if ($true) {
+									$output_html = $v;
+				}
 			}
 
 			$input_html .= '</select>';
-		}
-		elseif ($row['field_type'] == 'radio')
+		} elseif ($row['field_type'] == 'radio')
 		{
 			$input_html = '<fieldset>';
 			$options = explode(',', $row['field_options']);
@@ -938,36 +974,37 @@ 
 			{
 				$true = (!$exists && $row['default_value'] == $v) || $value == $v;
 				$input_html .= '<label for="customfield_' . $row['col_name'] . '_' . $k . '"><input type="radio" name="customfield[' . $row['col_name'] . ']" class="input_radio" id="customfield_' . $row['col_name'] . '_' . $k . '" value="' . $k . '"' . ($true ? ' checked' : '') . '>' . $v . '</label><br>';
-				if ($true)
-					$output_html = $v;
+				if ($true) {
+									$output_html = $v;
+				}
 			}
 			$input_html .= '</fieldset>';
-		}
-		elseif ($row['field_type'] == 'text')
+		} elseif ($row['field_type'] == 'text')
 		{
 			$input_html = '<input type="text" name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . ($row['field_length'] != 0 ? ' maxlength="' . $row['field_length'] . '"' : '') . ' size="' . ($row['field_length'] == 0 || $row['field_length'] >= 50 ? 50 : ($row['field_length'] > 30 ? 30 : ($row['field_length'] > 10 ? 20 : 10))) . '" value="' . un_htmlspecialchars($value) . '" class="input_text"' . ($row['show_reg'] == 2 ? ' required' : '') . '>';
-		}
-		else
+		} else
 		{
 			@list ($rows, $cols) = @explode(',', $row['default_value']);
 			$input_html = '<textarea name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . (!empty($rows) ? ' rows="' . $rows . '"' : '') . (!empty($cols) ? ' cols="' . $cols . '"' : '') . ($row['show_reg'] == 2 ? ' required' : '' ). '>' . un_htmlspecialchars($value) . '</textarea>';
 		}
 
 		// Parse BBCode
-		if ($row['bbc'])
-			$output_html = parse_bbc($output_html);
-		elseif ($row['field_type'] == 'textarea')
-			// Allow for newlines at least
+		if ($row['bbc']) {
+					$output_html = parse_bbc($output_html);
+		} elseif ($row['field_type'] == 'textarea') {
+					// Allow for newlines at least
 			$output_html = strtr($output_html, array("\n" => '<br>'));
+		}
 
 		// Enclosing the user input within some other text?
-		if (!empty($row['enclose']) && !empty($output_html))
-			$output_html = strtr($row['enclose'], array(
+		if (!empty($row['enclose']) && !empty($output_html)) {
+					$output_html = strtr($row['enclose'], array(
 				'{SCRIPTURL}' => $scripturl,
 				'{IMAGES_URL}' => $settings['images_url'],
 				'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 				'{INPUT}' => un_htmlspecialchars($output_html),
 			));
+		}
 
 		$context['custom_fields'][] = array(
 			'name' => $row['field_name'],

Sources/ManagePaid.php

Braces +202 added lines, -148 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main entrance point for the 'Paid Subscription' screen, calling
@@ -32,18 +33,19 @@ 
 	loadLanguage('ManagePaid');
 	loadTemplate('ManagePaid');
 
-	if (!empty($modSettings['paid_enabled']))
-		$subActions = array(
+	if (!empty($modSettings['paid_enabled'])) {
+			$subActions = array(
 			'modify' => array('ModifySubscription', 'admin_forum'),
 			'modifyuser' => array('ModifyUserSubscription', 'admin_forum'),
 			'settings' => array('ModifySubscriptionSettings', 'admin_forum'),
 			'view' => array('ViewSubscriptions', 'admin_forum'),
 			'viewsub' => array('ViewSubscribedUsers', 'admin_forum'),
 		);
-	else
-		$subActions = array(
+	} else {
+			$subActions = array(
 			'settings' => array('ModifySubscriptionSettings', 'admin_forum'),
 		);
+	}
 
 	// Default the sub-action to 'view subscriptions', but only if they have already set things up..
 	$_REQUEST['sa'] = isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]) ? $_REQUEST['sa'] : (!empty($modSettings['paid_currency_symbol']) && !empty($modSettings['paid_enabled']) ? 'view' : 'settings');
@@ -59,8 +61,8 @@ 
 		'help' => '',
 		'description' => $txt['paid_subscriptions_desc'],
 	);
-	if (!empty($modSettings['paid_enabled']))
-		$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
+	if (!empty($modSettings['paid_enabled'])) {
+			$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
 			'view' => array(
 				'description' => $txt['paid_subs_view_desc'],
 			),
@@ -68,6 +70,7 @@ 
 				'description' => $txt['paid_subs_settings_desc'],
 			),
 		);
+	}
 
 	call_integration_hook('integrate_manage_subscriptions', array(&$subActions));
 
@@ -92,8 +95,9 @@ 
 	{
 		// If the currency is set to something different then we need to set it to other for this to work and set it back shortly.
 		$modSettings['paid_currency'] = !empty($modSettings['paid_currency_code']) ? $modSettings['paid_currency_code'] : '';
-		if (!empty($modSettings['paid_currency_code']) && !in_array($modSettings['paid_currency_code'], array('usd', 'eur', 'gbp', 'cad', 'aud')))
-			$modSettings['paid_currency'] = 'other';
+		if (!empty($modSettings['paid_currency_code']) && !in_array($modSettings['paid_currency_code'], array('usd', 'eur', 'gbp', 'cad', 'aud'))) {
+					$modSettings['paid_currency'] = 'other';
+		}
 
 		// These are all the default settings.
 		$config_vars = array(
@@ -156,8 +160,7 @@ 
 			}
 		}
 		toggleOther();', true);
-	}
-	else
+	} else
 	{
 		$config_vars = array(
 			array('check', 'paid_enabled'),
@@ -166,8 +169,9 @@ 
 	}
 
 	// Just searching?
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template fired up.
 	require_once($sourcedir . '/ManageServer.php');
@@ -211,8 +215,9 @@ 
 			foreach (explode(',', $_POST['paid_email_to']) as $email)
 			{
 				$email = trim($email);
-				if (!empty($email) && filter_var($email, FILTER_VALIDATE_EMAIL))
-					$email_addresses[] = $email;
+				if (!empty($email) && filter_var($email, FILTER_VALIDATE_EMAIL)) {
+									$email_addresses[] = $email;
+				}
 				$_POST['paid_email_to'] = implode(',', $email_addresses);
 			}
 		}
@@ -249,8 +254,9 @@ 
 	global $context, $txt, $modSettings, $sourcedir, $scripturl;
 
 	// Not made the settings yet?
-	if (empty($modSettings['paid_currency_symbol']))
-		fatal_lang_error('paid_not_set_currency', false, $scripturl . '?action=admin;area=paidsubscribe;sa=settings');
+	if (empty($modSettings['paid_currency_symbol'])) {
+			fatal_lang_error('paid_not_set_currency', false, $scripturl . '?action=admin;area=paidsubscribe;sa=settings');
+	}
 
 	// Some basic stuff.
 	$context['page_title'] = $txt['paid_subs_view'];
@@ -270,10 +276,11 @@ 
 
 				foreach ($context['subscriptions'] as $data)
 				{
-					if (++$counter < $start)
-						continue;
-					elseif ($counter == $start + $items_per_page)
-						break;
+					if (++$counter < $start) {
+											continue;
+					} elseif ($counter == $start + $items_per_page) {
+											break;
+					}
 
 					$subscriptions[] = $data;
 				}
@@ -450,8 +457,9 @@ 
 			);
 			$id_group = 0;
 			$add_groups = '';
-			if ($smcFunc['db_num_rows']($request))
-				list ($id_group, $add_groups) = $smcFunc['db_fetch_row']($request);
+			if ($smcFunc['db_num_rows']($request)) {
+							list ($id_group, $add_groups) = $smcFunc['db_fetch_row']($request);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$changes = array();
@@ -463,8 +471,9 @@ 
 				{
 					// If their current primary group isn't what they had before the subscription, and their current group was
 					// granted by the sub, remove it.
-					if ($member_data['old_id_group'] != $member_data['id_group'] && $member_data['id_group'] == $id_group)
-						$changes[$id_member]['id_group'] = $member_data['old_id_group'];
+					if ($member_data['old_id_group'] != $member_data['id_group'] && $member_data['id_group'] == $id_group) {
+											$changes[$id_member]['id_group'] = $member_data['old_id_group'];
+					}
 				}
 			}
 
@@ -477,15 +486,17 @@ 
 					// First let's get their groups sorted.
 					$current_groups = explode(',', $member_data['additional_groups']);
 					$new_groups = implode(',', array_diff($current_groups, $add_groups));
-					if ($new_groups != $member_data['additional_groups'])
-						$changes[$id_member]['additional_groups'] = $new_groups;
+					if ($new_groups != $member_data['additional_groups']) {
+											$changes[$id_member]['additional_groups'] = $new_groups;
+					}
 				}
 			}
 
 			// We're going through changes...
-			if (!empty($changes))
-				foreach ($changes as $id_member => $new_values)
+			if (!empty($changes)) {
+							foreach ($changes as $id_member => $new_values)
 					updateMemberData($id_member, $new_values);
+			}
 		}
 
 		// Delete the subscription
@@ -533,11 +544,13 @@ 
 				'M' => 24,
 				'Y' => 5,
 			);
-			if (empty($_POST['span_unit']) || empty($limits[$_POST['span_unit']]) || empty($_POST['span_value']) || $_POST['span_value'] < 1)
-				fatal_lang_error('paid_invalid_duration', false);
+			if (empty($_POST['span_unit']) || empty($limits[$_POST['span_unit']]) || empty($_POST['span_value']) || $_POST['span_value'] < 1) {
+							fatal_lang_error('paid_invalid_duration', false);
+			}
 
-			if ($_POST['span_value'] > $limits[$_POST['span_unit']])
-				fatal_lang_error('paid_invalid_duration_' . $_POST['span_unit'], false);
+			if ($_POST['span_value'] > $limits[$_POST['span_unit']]) {
+							fatal_lang_error('paid_invalid_duration_' . $_POST['span_unit'], false);
+			}
 
 			// Clean the span.
 			$span = $_POST['span_value'] . $_POST['span_unit'];
@@ -546,8 +559,9 @@ 
 			$cost = array('fixed' => sprintf('%01.2f', strtr($_POST['cost'], ',', '.')));
 
 			// There needs to be something.
-			if (empty($_POST['span_value']) || empty($_POST['cost']))
-				fatal_lang_error('paid_no_cost_value');
+			if (empty($_POST['span_value']) || empty($_POST['cost'])) {
+							fatal_lang_error('paid_no_cost_value');
+			}
 		}
 		// Flexible is harder but more fun ;)
 		else
@@ -561,8 +575,9 @@ 
 				'year' => sprintf('%01.2f', strtr($_POST['cost_year'], ',', '.')),
 			);
 
-			if (empty($_POST['cost_day']) && empty($_POST['cost_week']) && empty($_POST['cost_month']) && empty($_POST['cost_year']))
-				fatal_lang_error('paid_all_freq_blank');
+			if (empty($_POST['cost_day']) && empty($_POST['cost_week']) && empty($_POST['cost_month']) && empty($_POST['cost_year'])) {
+							fatal_lang_error('paid_all_freq_blank');
+			}
 		}
 		$cost = json_encode($cost);
 
@@ -571,9 +586,10 @@ 
 
 		// Yep, time to do additional groups.
 		$addgroups = array();
-		if (!empty($_POST['addgroup']))
-			foreach ($_POST['addgroup'] as $id => $dummy)
+		if (!empty($_POST['addgroup'])) {
+					foreach ($_POST['addgroup'] as $id => $dummy)
 				$addgroups[] = (int) $id;
+		}
 		$addgroups = implode(',', $addgroups);
 
 		// Is it new?!
@@ -682,18 +698,18 @@ 
 			{
 				$span_value = $match[1];
 				$span_unit = $match[2];
-			}
-			else
+			} else
 			{
 				$span_value = 0;
 				$span_unit = 'D';
 			}
 
 			// Is this a flexible one?
-			if ($row['length'] == 'F')
-				$isFlexible = true;
-			else
-				$isFlexible = false;
+			if ($row['length'] == 'F') {
+							$isFlexible = true;
+			} else {
+							$isFlexible = false;
+			}
 
 			$context['sub'] = array(
 				'name' => $row['name'],
@@ -742,8 +758,9 @@ 
 		)
 	);
 	$context['groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['groups'][$row['id_group']] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['groups'][$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// This always happens.
@@ -777,8 +794,9 @@ 
 		)
 	);
 	// Something wrong?
-	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);
+	}
 	// Do the subscription context.
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$context['subscription'] = array(
@@ -1013,8 +1031,8 @@ 
 		))
 	);
 	$subscribers = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$subscribers[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$subscribers[] = array(
 			'id' => $row['id_sublog'],
 			'id_member' => $row['id_member'],
 			'name' => $row['name'],
@@ -1024,6 +1042,7 @@ 
 			'status' => $row['status'],
 			'status_text' => $row['status'] == 0 ? ($row['payments_pending'] == 0 ? $txt['paid_finished'] : $txt['paid_pending']) : $txt['paid_active'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $subscribers;
@@ -1058,14 +1077,16 @@ 
 				'current_log_item' => $context['log_id'],
 			)
 		);
-		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['sub_id']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!isset($context['subscriptions'][$context['sub_id']]))
-		fatal_lang_error('no_access', false);
+	if (!isset($context['subscriptions'][$context['sub_id']])) {
+			fatal_lang_error('no_access', false);
+	}
 	$context['current_subscription'] = $context['subscriptions'][$context['sub_id']];
 
 	// Searching?
@@ -1098,8 +1119,9 @@ 
 					'name' => $_POST['name'],
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('error_member_not_found');
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('error_member_not_found');
+			}
 
 			list ($id_member, $id_group) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
@@ -1115,14 +1137,15 @@ 
 					'current_member' => $id_member,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) != 0)
-				fatal_lang_error('member_already_subscribed');
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							fatal_lang_error('member_already_subscribed');
+			}
 			$smcFunc['db_free_result']($request);
 
 			// Actually put the subscription in place.
-			if ($status == 1)
-				addSubscription($context['sub_id'], $id_member, 0, $starttime, $endtime);
-			else
+			if ($status == 1) {
+							addSubscription($context['sub_id'], $id_member, 0, $starttime, $endtime);
+			} else
 			{
 				$smcFunc['db_insert']('',
 					'{db_prefix}log_subscribed',
@@ -1149,20 +1172,20 @@ 
 					'current_log_item' => $context['log_id'],
 				)
 			);
-			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 ($id_member, $old_status) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
 			// Pick the right permission stuff depending on what the status is changing from/to.
-			if ($old_status == 1 && $status != 1)
-				removeSubscription($context['sub_id'], $id_member);
-			elseif ($status == 1 && $old_status != 1)
+			if ($old_status == 1 && $status != 1) {
+							removeSubscription($context['sub_id'], $id_member);
+			} elseif ($status == 1 && $old_status != 1)
 			{
 				addSubscription($context['sub_id'], $id_member, 0, $starttime, $endtime);
-			}
-			else
+			} else
 			{
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}log_subscribed
@@ -1190,8 +1213,9 @@ 
 		if (!empty($_REQUEST['delsub']))
 		{
 			$toDelete = array();
-			foreach ($_REQUEST['delsub'] as $id => $dummy)
-				$toDelete[] = (int) $id;
+			foreach ($_REQUEST['delsub'] as $id => $dummy) {
+							$toDelete[] = (int) $id;
+			}
 
 			$request = $smcFunc['db_query']('', '
 				SELECT id_subscribe, id_member
@@ -1201,8 +1225,9 @@ 
 					'subscription_list' => $toDelete,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				removeSubscription($row['id_subscribe'], $row['id_member'], isset($_REQUEST['delete']));
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							removeSubscription($row['id_subscribe'], $row['id_member'], isset($_REQUEST['delete']));
+			}
 			$smcFunc['db_free_result']($request);
 		}
 		redirectexit('action=admin;area=paidsubscribe;sa=viewsub;sid=' . $context['sub_id']);
@@ -1246,9 +1271,9 @@ 
 			);
 			list ($context['sub']['username']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
+		} else {
+					$context['sub']['username'] = '';
 		}
-		else
-			$context['sub']['username'] = '';
 	}
 	// Otherwise load the existing info.
 	else
@@ -1265,8 +1290,9 @@ 
 				'blank_string' => '',
 			)
 		);
-		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);
+		}
 		$row = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1287,13 +1313,13 @@ 
 					{
 						foreach ($costs as $duration => $cost)
 						{
-							if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2])
-								$context['pending_payments'][$id] = array(
+							if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2]) {
+															$context['pending_payments'][$id] = array(
 									'desc' => sprintf($modSettings['paid_currency_symbol'], $cost . '/' . $txt[$duration]),
 								);
+							}
 						}
-					}
-					elseif ($costs['fixed'] == $pending[1])
+					} elseif ($costs['fixed'] == $pending[1])
 					{
 						$context['pending_payments'][$id] = array(
 							'desc' => sprintf($modSettings['paid_currency_symbol'], $costs['fixed']),
@@ -1311,8 +1337,9 @@ 
 					if ($_GET['pending'] == $id && $pending[3] == 'payback' && isset($context['pending_payments'][$id]))
 					{
 						// Flexible?
-						if (isset($_GET['accept']))
-							addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] == 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+						if (isset($_GET['accept'])) {
+													addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] == 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+						}
 						unset($pending_details[$id]);
 
 						$new_details = json_encode($pending_details);
@@ -1374,8 +1401,9 @@ 
 	global $smcFunc;
 
 	// Make it an array.
-	if (!is_array($users))
-		$users = array($users);
+	if (!is_array($users)) {
+			$users = array($users);
+	}
 
 	// Get all the members current groups.
 	$groups = array();
@@ -1413,14 +1441,16 @@ 
 		if ($row['id_group'] != 0)
 		{
 			// If this is changing - add the old one to the additional groups so it's not lost.
-			if ($row['id_group'] != $groups[$row['id_member']]['primary'])
-				$groups[$row['id_member']]['additional'][] = $groups[$row['id_member']]['primary'];
+			if ($row['id_group'] != $groups[$row['id_member']]['primary']) {
+							$groups[$row['id_member']]['additional'][] = $groups[$row['id_member']]['primary'];
+			}
 			$groups[$row['id_member']]['primary'] = $row['id_group'];
 		}
 
 		// Additional groups.
-		if (!empty($row['add_groups']))
-			$groups[$row['id_member']]['additional'] = array_merge($groups[$row['id_member']]['additional'], explode(',', $row['add_groups']));
+		if (!empty($row['add_groups'])) {
+					$groups[$row['id_member']]['additional'] = array_merge($groups[$row['id_member']]['additional'], explode(',', $row['add_groups']));
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1428,9 +1458,10 @@ 
 	foreach ($groups as $id => $group)
 	{
 		$group['additional'] = array_unique($group['additional']);
-		foreach ($group['additional'] as $key => $value)
-			if (empty($value))
+		foreach ($group['additional'] as $key => $value) {
+					if (empty($value))
 				unset($group['additional'][$key]);
+		}
 		$addgroups = implode(',', $group['additional']);
 
 		$smcFunc['db_query']('', '
@@ -1464,8 +1495,9 @@ 
 	loadSubscriptions();
 
 	// Exists, yes?
-	if (!isset($context['subscriptions'][$id_subscribe]))
-		return;
+	if (!isset($context['subscriptions'][$id_subscribe])) {
+			return;
+	}
 
 	$curSub = $context['subscriptions'][$id_subscribe];
 
@@ -1513,16 +1545,19 @@ 
 		list ($id_sublog, $endtime, $starttime) = $smcFunc['db_fetch_row']($request);
 
 		// If this has already expired but is active, extension means the period from now.
-		if ($endtime < time())
-			$endtime = time();
-		if ($starttime == 0)
-			$starttime = time();
+		if ($endtime < time()) {
+					$endtime = time();
+		}
+		if ($starttime == 0) {
+					$starttime = time();
+		}
 
 		// Work out the new expiry date.
 		$endtime += $duration;
 
-		if ($forceEndTime != 0)
-			$endtime = $forceEndTime;
+		if ($forceEndTime != 0) {
+					$endtime = $forceEndTime;
+		}
 
 		// As everything else should be good, just update!
 		$smcFunc['db_query']('', '
@@ -1552,8 +1587,9 @@ 
 	);
 
 	// Just in case the member doesn't exist.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return;
+	}
 
 	list ($old_id_group, $additional_groups) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
@@ -1570,16 +1606,18 @@ 
 		$id_group = $curSub['prim_group'];
 
 		// Ensure their old privileges are maintained.
-		if ($old_id_group != 0)
-			$newAddGroups[] = $old_id_group;
+		if ($old_id_group != 0) {
+					$newAddGroups[] = $old_id_group;
+		}
+	} else {
+			$id_group = $old_id_group;
 	}
-	else
-		$id_group = $old_id_group;
 
 	// Yep, make sure it's unique, and no empties.
-	foreach ($newAddGroups as $k => $v)
-		if (empty($v))
+	foreach ($newAddGroups as $k => $v) {
+			if (empty($v))
 			unset($newAddGroups[$k]);
+	}
 	$newAddGroups = array_unique($newAddGroups);
 	$newAddGroups = implode(',', $newAddGroups);
 
@@ -1615,16 +1653,19 @@ 
 		list ($id_sublog, $endtime, $starttime) = $smcFunc['db_fetch_row']($request);
 
 		// If this has already expired but is active, extension means the period from now.
-		if ($endtime < time())
-			$endtime = time();
-		if ($starttime == 0)
-			$starttime = time();
+		if ($endtime < time()) {
+					$endtime = time();
+		}
+		if ($starttime == 0) {
+					$starttime = time();
+		}
 
 		// Work out the new expiry date.
 		$endtime += $duration;
 
-		if ($forceEndTime != 0)
-			$endtime = $forceEndTime;
+		if ($forceEndTime != 0) {
+					$endtime = $forceEndTime;
+		}
 
 		// As everything else should be good, just update!
 		$smcFunc['db_query']('', '
@@ -1647,13 +1688,15 @@ 
 
 	// Otherwise a very simple insert.
 	$endtime = time() + $duration;
-	if ($forceEndTime != 0)
-		$endtime = $forceEndTime;
+	if ($forceEndTime != 0) {
+			$endtime = $forceEndTime;
+	}
 
-	if ($forceStartTime == 0)
-		$starttime = time();
-	else
-		$starttime = $forceStartTime;
+	if ($forceStartTime == 0) {
+			$starttime = time();
+	} else {
+			$starttime = $forceStartTime;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}log_subscribed',
@@ -1726,15 +1769,17 @@ 
 	$new_id_group = -1;
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!isset($context['subscriptions'][$row['id_subscribe']]))
-			continue;
+		if (!isset($context['subscriptions'][$row['id_subscribe']])) {
+					continue;
+		}
 
 		// The one we're removing?
 		if ($row['id_subscribe'] == $id_subscribe)
 		{
 			$removals = explode(',', $context['subscriptions'][$row['id_subscribe']]['add_groups']);
-			if ($context['subscriptions'][$row['id_subscribe']]['prim_group'] != 0)
-				$removals[] = $context['subscriptions'][$row['id_subscribe']]['prim_group'];
+			if ($context['subscriptions'][$row['id_subscribe']]['prim_group'] != 0) {
+							$removals[] = $context['subscriptions'][$row['id_subscribe']]['prim_group'];
+			}
 			$old_id_group = $row['old_id_group'];
 		}
 		// Otherwise things we allow.
@@ -1752,30 +1797,33 @@ 
 
 	// Now, for everything we are removing check they definitely are not allowed it.
 	$existingGroups = explode(',', $additional_groups);
-	foreach ($existingGroups as $key => $group)
-		if (empty($group) || (in_array($group, $removals) && !in_array($group, $allowed)))
+	foreach ($existingGroups as $key => $group) {
+			if (empty($group) || (in_array($group, $removals) && !in_array($group, $allowed)))
 			unset($existingGroups[$key]);
+	}
 
 	// Finally, do something with the current primary group.
 	if (in_array($id_group, $removals))
 	{
 		// If this primary group is actually allowed keep it.
-		if (in_array($id_group, $allowed))
-			$existingGroups[] = $id_group;
+		if (in_array($id_group, $allowed)) {
+					$existingGroups[] = $id_group;
+		}
 
 		// Either way, change the id_group back.
 		if ($new_id_group < 1)
 		{
 			// If we revert to the old id-group we need to ensure it wasn't from a subscription.
-			foreach ($context['subscriptions'] as $id => $group)
-				// It was? Make them a regular member then!
+			foreach ($context['subscriptions'] as $id => $group) {
+							// It was? Make them a regular member then!
 				if ($group['prim_group'] == $old_id_group)
 					$old_id_group = 0;
+			}
 
 			$id_group = $old_id_group;
+		} else {
+					$id_group = $new_id_group;
 		}
-		else
-			$id_group = $new_id_group;
 	}
 
 	// Crazy stuff, we seem to have our groups fixed, just make them unique
@@ -1795,8 +1843,8 @@ 
 	);
 
 	// Disable the subscription.
-	if (!$delete)
-		$smcFunc['db_query']('', '
+	if (!$delete) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_subscribed
 			SET status = {int:not_active}
 			WHERE id_member = {int:current_member}
@@ -1807,9 +1855,10 @@ 
 				'current_subscription' => $id_subscribe,
 			)
 		);
+	}
 	// Otherwise delete it!
-	else
-		$smcFunc['db_query']('', '
+	else {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_subscribed
 			WHERE id_member = {int:current_member}
 				AND id_subscribe = {int:current_subscription}',
@@ -1818,7 +1867,8 @@ 
 				'current_subscription' => $id_subscribe,
 			)
 		);
-}
+	}
+	}
 
 /**
  * This just kind of caches all the subscription data.
@@ -1827,8 +1877,9 @@ 
 {
 	global $context, $txt, $modSettings, $smcFunc;
 
-	if (!empty($context['subscriptions']))
-		return;
+	if (!empty($context['subscriptions'])) {
+			return;
+	}
 
 	// Make sure this is loaded, just in case.
 	loadLanguage('ManagePaid');
@@ -1845,10 +1896,11 @@ 
 		// Pick a cost.
 		$costs = smf_json_decode($row['cost'], true);
 
-		if ($row['length'] != 'F' && !empty($modSettings['paid_currency_symbol']) && !empty($costs['fixed']))
-			$cost = sprintf($modSettings['paid_currency_symbol'], $costs['fixed']);
-		else
-			$cost = '???';
+		if ($row['length'] != 'F' && !empty($modSettings['paid_currency_symbol']) && !empty($costs['fixed'])) {
+					$cost = sprintf($modSettings['paid_currency_symbol'], $costs['fixed']);
+		} else {
+					$cost = '???';
+		}
 
 		// Do the span.
 		preg_match('~(\d*)(\w)~', $row['length'], $match);
@@ -1875,9 +1927,9 @@ 
 					$num_length *= 31556926;
 					break;
 			}
+		} else {
+					$length = '??';
 		}
-		else
-			$length = '??';
 
 		$context['subscriptions'][$row['id_subscribe']] = array(
 			'id' => $row['id_subscribe'],
@@ -1912,8 +1964,9 @@ 
 	{
 		$ind = $row['status'] == 0 ? 'finished' : 'total';
 
-		if (isset($context['subscriptions'][$row['id_subscribe']]))
-			$context['subscriptions'][$row['id_subscribe']][$ind] = $row['member_count'];
+		if (isset($context['subscriptions'][$row['id_subscribe']])) {
+					$context['subscriptions'][$row['id_subscribe']][$ind] = $row['member_count'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1927,8 +1980,9 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (isset($context['subscriptions'][$row['id_subscribe']]))
-			$context['subscriptions'][$row['id_subscribe']]['pending'] = $row['total_pending'];
+		if (isset($context['subscriptions'][$row['id_subscribe']])) {
+					$context['subscriptions'][$row['id_subscribe']]['pending'] = $row['total_pending'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 }

Sources/Subs-Calendar.php

Braces +144 added lines, -99 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get all birthdays within the given time range.
@@ -61,10 +62,11 @@ 
 	$bday = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if ($year_low != $year_high)
-			$age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low;
-		else
-			$age_year = $year_low;
+		if ($year_low != $year_high) {
+					$age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low;
+		} else {
+					$age_year = $year_low;
+		}
 
 		$bday[$age_year . substr($row['birthdate'], 4)][] = array(
 			'id' => $row['id_member'],
@@ -76,8 +78,9 @@ 
 	$smcFunc['db_free_result']($result);
 
 	// Set is_last, so the themes know when to stop placing separators.
-	foreach ($bday as $mday => $array)
-		$bday[$mday][count($array) - 1]['is_last'] = true;
+	foreach ($bday as $mday => $array) {
+			$bday[$mday][count($array) - 1]['is_last'] = true;
+	}
 
 	return $bday;
 }
@@ -125,8 +128,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// If the attached topic is not approved then for the moment pretend it doesn't exist
-		if (!empty($row['id_first_msg']) && $modSettings['postmod_active'] && !$row['approved'])
-			continue;
+		if (!empty($row['id_first_msg']) && $modSettings['postmod_active'] && !$row['approved']) {
+					continue;
+		}
 
 		// Force a censor of the title - as often these are used by others.
 		censorText($row['title'], $use_permissions ? false : true);
@@ -141,13 +145,14 @@ 
 		{
 			// Attempt to avoid DST problems.
 			// @todo Resolve this properly at some point.
-			if (strftime('%Y-%m-%d', $date) == $lastDate)
-				$date += 3601;
+			if (strftime('%Y-%m-%d', $date) == $lastDate) {
+							$date += 3601;
+			}
 			$lastDate = strftime('%Y-%m-%d', $date);
 
 			// If we're using permissions (calendar pages?) then just ouput normal contextual style information.
-			if ($use_permissions)
-				$events[strftime('%Y-%m-%d', $date)][] = array(
+			if ($use_permissions) {
+							$events[strftime('%Y-%m-%d', $date)][] = array(
 					'id' => $row['id_event'],
 					'title' => $row['title'],
 					'start_date' => $row['start_date'],
@@ -162,9 +167,10 @@ 
 					'can_export' => !empty($modSettings['cal_export']) ? true : false,
 					'export_href' => $scripturl . '?action=calendar;sa=ical;eventid=' . $row['id_event'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				);
+			}
 			// Otherwise, this is going to be cached and the VIEWER'S permissions should apply... just put together some info.
-			else
-				$events[strftime('%Y-%m-%d', $date)][] = array(
+			else {
+							$events[strftime('%Y-%m-%d', $date)][] = array(
 					'id' => $row['id_event'],
 					'title' => $row['title'],
 					'start_date' => $row['start_date'],
@@ -181,6 +187,7 @@ 
 					'poster' => $row['id_member'],
 					'allowed_groups' => explode(',', $row['member_groups']),
 				);
+			}
 		}
 	}
 	$smcFunc['db_free_result']($result);
@@ -188,8 +195,9 @@ 
 	// If we're doing normal contextual data, go through and make things clear to the templates ;).
 	if ($use_permissions)
 	{
-		foreach ($events as $mday => $array)
-			$events[$mday][count($array) - 1]['is_last'] = true;
+		foreach ($events as $mday => $array) {
+					$events[$mday][count($array) - 1]['is_last'] = true;
+		}
 	}
 
 	return $events;
@@ -207,11 +215,12 @@ 
 	global $smcFunc;
 
 	// Get the lowest and highest dates for "all years".
-	if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
-		$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec}
+	if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) {
+			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec}
 			OR event_date BETWEEN {date:all_year_jan} AND {date:all_year_high}';
-	else
-		$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}';
+	} else {
+			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}';
+	}
 
 	// Find some holidays... ;).
 	$result = $smcFunc['db_query']('', '
@@ -231,10 +240,11 @@ 
 	$holidays = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
-			$event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4);
-		else
-			$event_year = substr($low_date, 0, 4);
+		if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) {
+					$event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4);
+		} else {
+					$event_year = substr($low_date, 0, 4);
+		}
 
 		$holidays[$event_year . substr($row['event_date'], 4)][] = $row['title'];
 	}
@@ -258,10 +268,12 @@ 
 	isAllowedTo('calendar_post');
 
 	// No board?  No topic?!?
-	if (empty($board))
-		fatal_lang_error('missing_board_id', false);
-	if (empty($topic))
-		fatal_lang_error('missing_topic_id', false);
+	if (empty($board)) {
+			fatal_lang_error('missing_board_id', false);
+	}
+	if (empty($topic)) {
+			fatal_lang_error('missing_topic_id', false);
+	}
 
 	// Administrator, Moderator, or owner.  Period.
 	if (!allowedTo('admin_forum') && !allowedTo('moderate_board'))
@@ -279,12 +291,14 @@ 
 		if ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Not the owner of the topic.
-			if ($row['id_member_started'] != $user_info['id'])
-				fatal_lang_error('not_your_topic', 'user');
+			if ($row['id_member_started'] != $user_info['id']) {
+							fatal_lang_error('not_your_topic', 'user');
+			}
 		}
 		// Topic/Board doesn't exist.....
-		else
-			fatal_lang_error('calendar_no_topic', 'general');
+		else {
+					fatal_lang_error('calendar_no_topic', 'general');
+		}
 		$smcFunc['db_free_result']($result);
 	}
 }
@@ -372,14 +386,16 @@ 
 	if (!empty($calendarOptions['start_day']))
 	{
 		$nShift -= $calendarOptions['start_day'];
-		if ($nShift < 0)
-			$nShift = 7 + $nShift;
+		if ($nShift < 0) {
+					$nShift = 7 + $nShift;
+		}
 	}
 
 	// Number of rows required to fit the month.
 	$nRows = floor(($month_info['last_day']['day_of_month'] + $nShift) / 7);
-	if (($month_info['last_day']['day_of_month'] + $nShift) % 7)
-		$nRows++;
+	if (($month_info['last_day']['day_of_month'] + $nShift) % 7) {
+			$nRows++;
+	}
 
 	// Fetch the arrays for birthdays, posted events, and holidays.
 	$bday = $calendarOptions['show_birthdays'] ? getBirthdayRange($month_info['first_day']['date'], $month_info['last_day']['date']) : array();
@@ -392,8 +408,9 @@ 
 	{
 		$calendarGrid['week_days'][] = $count;
 		$count++;
-		if ($count == 7)
-			$count = 0;
+		if ($count == 7) {
+					$count = 0;
+		}
 	}
 
 	// Iterate through each week.
@@ -410,8 +427,9 @@ 
 		{
 			$nDay = ($nRow * 7) + $nCol - $nShift + 1;
 
-			if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month'])
-				$nDay = 0;
+			if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month']) {
+							$nDay = 0;
+			}
 
 			$date = sprintf('%04d-%02d-%02d', $year, $month, $nDay);
 
@@ -429,8 +447,9 @@ 
 	}
 
 	// What is the last day of the month?
-	if ($is_previous === true)
-		$calendarGrid['last_of_month'] = $month_info['last_day']['day_of_month'];
+	if ($is_previous === true) {
+			$calendarGrid['last_of_month'] = $month_info['last_day']['day_of_month'];
+	}
 
 	// We'll use the shift in the template.
 	$calendarGrid['shift'] = $nShift;
@@ -464,8 +483,9 @@ 
 	{
 		// Here we offset accordingly to get things to the real start of a week.
 		$date_diff = $day_of_week - $calendarOptions['start_day'];
-		if ($date_diff < 0)
-			$date_diff += 7;
+		if ($date_diff < 0) {
+					$date_diff += 7;
+		}
 		$new_timestamp = mktime(0, 0, 0, $month, $day, $year) - $date_diff * 86400;
 		$day = (int) strftime('%d', $new_timestamp);
 		$month = (int) strftime('%m', $new_timestamp);
@@ -616,8 +636,9 @@ 
 	// Holidays between now and now + days.
 	for ($i = $now; $i < $now + $days_for_index; $i += 86400)
 	{
-		if (isset($cached_data['holidays'][strftime('%Y-%m-%d', $i)]))
-			$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][strftime('%Y-%m-%d', $i)]);
+		if (isset($cached_data['holidays'][strftime('%Y-%m-%d', $i)])) {
+					$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][strftime('%Y-%m-%d', $i)]);
+		}
 	}
 
 	// Happy Birthday, guys and gals!
@@ -626,8 +647,9 @@ 
 		$loop_date = strftime('%Y-%m-%d', $i);
 		if (isset($cached_data['birthdays'][$loop_date]))
 		{
-			foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy)
-				$cached_data['birthdays'][strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+			foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy) {
+							$cached_data['birthdays'][strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+			}
 			$return_data['calendar_birthdays'] = array_merge($return_data['calendar_birthdays'], $cached_data['birthdays'][$loop_date]);
 		}
 	}
@@ -639,8 +661,9 @@ 
 		$loop_date = strftime('%Y-%m-%d', $i);
 
 		// No events today? Check the next day.
-		if (empty($cached_data['events'][$loop_date]))
-			continue;
+		if (empty($cached_data['events'][$loop_date])) {
+					continue;
+		}
 
 		// Loop through all events to add a few last-minute values.
 		foreach ($cached_data['events'][$loop_date] as $ev => $event)
@@ -653,9 +676,9 @@ 
 			{
 				unset($cached_data['events'][$loop_date][$ev]);
 				continue;
+			} else {
+							$duplicates[$this_event['topic'] . $this_event['title']] = true;
 			}
-			else
-				$duplicates[$this_event['topic'] . $this_event['title']] = true;
 
 			// Might be set to true afterwards, depending on the permissions.
 			$this_event['can_edit'] = false;
@@ -663,15 +686,18 @@ 
 			$this_event['date'] = $loop_date;
 		}
 
-		if (!empty($cached_data['events'][$loop_date]))
-			$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]);
+		if (!empty($cached_data['events'][$loop_date])) {
+					$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]);
+		}
 	}
 
 	// Mark the last item so that a list separator can be used in the template.
-	for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++)
-		$return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]);
-	for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++)
-		$return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+	for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++) {
+			$return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]);
+	}
+	for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++) {
+			$return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+	}
 
 	return array(
 		'data' => $return_data,
@@ -716,16 +742,20 @@ 
 	if (!isset($_POST['deleteevent']))
 	{
 		// No month?  No year?
-		if (!isset($_POST['month']))
-			fatal_lang_error('event_month_missing', false);
-		if (!isset($_POST['year']))
-			fatal_lang_error('event_year_missing', false);
+		if (!isset($_POST['month'])) {
+					fatal_lang_error('event_month_missing', false);
+		}
+		if (!isset($_POST['year'])) {
+					fatal_lang_error('event_year_missing', false);
+		}
 
 		// Check the month and year...
-		if ($_POST['month'] < 1 || $_POST['month'] > 12)
-			fatal_lang_error('invalid_month', false);
-		if ($_POST['year'] < $modSettings['cal_minyear'] || $_POST['year'] > $modSettings['cal_maxyear'])
-			fatal_lang_error('invalid_year', false);
+		if ($_POST['month'] < 1 || $_POST['month'] > 12) {
+					fatal_lang_error('invalid_month', false);
+		}
+		if ($_POST['year'] < $modSettings['cal_minyear'] || $_POST['year'] > $modSettings['cal_maxyear']) {
+					fatal_lang_error('invalid_year', false);
+		}
 	}
 
 	// Make sure they're allowed to post...
@@ -734,32 +764,39 @@ 
 	if (isset($_POST['span']))
 	{
 		// Make sure it's turned on and not some fool trying to trick it.
-		if (empty($modSettings['cal_allowspan']))
-			fatal_lang_error('no_span', false);
-		if ($_POST['span'] < 1 || $_POST['span'] > $modSettings['cal_maxspan'])
-			fatal_lang_error('invalid_days_numb', false);
+		if (empty($modSettings['cal_allowspan'])) {
+					fatal_lang_error('no_span', false);
+		}
+		if ($_POST['span'] < 1 || $_POST['span'] > $modSettings['cal_maxspan']) {
+					fatal_lang_error('invalid_days_numb', false);
+		}
 	}
 
 	// There is no need to validate the following values if we are just deleting the event.
 	if (!isset($_POST['deleteevent']))
 	{
 		// No day?
-		if (!isset($_POST['day']))
-			fatal_lang_error('event_day_missing', false);
-		if (!isset($_POST['evtitle']) && !isset($_POST['subject']))
-			fatal_lang_error('event_title_missing', false);
-		elseif (!isset($_POST['evtitle']))
-			$_POST['evtitle'] = $_POST['subject'];
+		if (!isset($_POST['day'])) {
+					fatal_lang_error('event_day_missing', false);
+		}
+		if (!isset($_POST['evtitle']) && !isset($_POST['subject'])) {
+					fatal_lang_error('event_title_missing', false);
+		} elseif (!isset($_POST['evtitle'])) {
+					$_POST['evtitle'] = $_POST['subject'];
+		}
 
 		// Bad day?
-		if (!checkdate($_POST['month'], $_POST['day'], $_POST['year']))
-			fatal_lang_error('invalid_date', false);
+		if (!checkdate($_POST['month'], $_POST['day'], $_POST['year'])) {
+					fatal_lang_error('invalid_date', false);
+		}
 
 		// No title?
-		if ($smcFunc['htmltrim']($_POST['evtitle']) === '')
-			fatal_lang_error('no_event_title', false);
-		if ($smcFunc['strlen']($_POST['evtitle']) > 100)
-			$_POST['evtitle'] = $smcFunc['substr']($_POST['evtitle'], 0, 100);
+		if ($smcFunc['htmltrim']($_POST['evtitle']) === '') {
+					fatal_lang_error('no_event_title', false);
+		}
+		if ($smcFunc['strlen']($_POST['evtitle']) > 100) {
+					$_POST['evtitle'] = $smcFunc['substr']($_POST['evtitle'], 0, 100);
+		}
 		$_POST['evtitle'] = str_replace(';', '', $_POST['evtitle']);
 	}
 }
@@ -786,8 +823,9 @@ 
 	);
 
 	// No results, return false.
-	if ($smcFunc['db_num_rows'] === 0)
-		return false;
+	if ($smcFunc['db_num_rows'] === 0) {
+			return false;
+	}
 
 	// Grab the results and return.
 	list ($poster) = $smcFunc['db_fetch_row']($request);
@@ -815,13 +853,15 @@ 
 
 	// Make sure the start date is in ISO order.
 	// @todo $year, $month, and $day are not set
-	if (($num_results = sscanf($eventOptions['start_date'], '%d-%d-%d', $year, $month, $day)) !== 3)
-		trigger_error('modifyEvent(): invalid start date format given', E_USER_ERROR);
+	if (($num_results = sscanf($eventOptions['start_date'], '%d-%d-%d', $year, $month, $day)) !== 3) {
+			trigger_error('modifyEvent(): invalid start date format given', E_USER_ERROR);
+	}
 
 	// Set the end date (if not yet given)
 	// @todo $year, $month, and $day are not set
-	if (!isset($eventOptions['end_date']))
-		$eventOptions['end_date'] = strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	if (!isset($eventOptions['end_date'])) {
+			$eventOptions['end_date'] = strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	}
 
 	// If no topic and board are given, they are not linked to a topic.
 	$eventOptions['board'] = isset($eventOptions['board']) ? (int) $eventOptions['board'] : 0;
@@ -888,15 +928,17 @@ 
 	$eventOptions['title'] = $smcFunc['htmlspecialchars']($eventOptions['title'], ENT_QUOTES);
 
 	// Scan the start date for validity and get its components.
-	if (($num_results = sscanf($eventOptions['start_date'], '%d-%d-%d', $year, $month, $day)) !== 3)
-		trigger_error('modifyEvent(): invalid start date format given', E_USER_ERROR);
+	if (($num_results = sscanf($eventOptions['start_date'], '%d-%d-%d', $year, $month, $day)) !== 3) {
+			trigger_error('modifyEvent(): invalid start date format given', E_USER_ERROR);
+	}
 
 	// Default span to 0 days.
 	$eventOptions['span'] = isset($eventOptions['span']) ? (int) $eventOptions['span'] : 0;
 
 	// Set the end date to the start date + span (if the end date wasn't already given).
-	if (!isset($eventOptions['end_date']))
-		$eventOptions['end_date'] = strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	if (!isset($eventOptions['end_date'])) {
+			$eventOptions['end_date'] = strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	}
 
 	$event_columns = array(
 		'start_date' => '{date:start_date}',
@@ -918,8 +960,9 @@ 
 	call_integration_hook('integrate_modify_event', array($event_id, &$eventOptions, &$event_columns, &$event_parameters));
 
 	$column_clauses = array();
-	foreach ($event_columns as $col => $crit)
-		$column_clauses[] = $col . ' = ' . $crit;
+	foreach ($event_columns as $col => $crit) {
+			$column_clauses[] = $col . ' = ' . $crit;
+	}
 
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}calendar
@@ -993,8 +1036,9 @@ 
 	);
 
 	// If nothing returned, we are in poo, poo.
-	if ($smcFunc['db_num_rows']($request) === 0)
-		return false;
+	if ($smcFunc['db_num_rows']($request) === 0) {
+			return false;
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
@@ -1048,8 +1092,9 @@ 
 		)
 	);
 	$holidays = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$holidays[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$holidays[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $holidays;

Sources/Subs-MembersOnline.php

Braces +30 added lines, -23 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Retrieve a list and several other statistics of the users currently online.
@@ -45,12 +46,14 @@ 
 	}
 
 	// Not allowed sort method? Bang! Error!
-	elseif (!in_array($membersOnlineOptions['sort'], $allowed_sort_options))
-		trigger_error('Sort method for getMembersOnlineStats() function is not allowed', E_USER_NOTICE);
+	elseif (!in_array($membersOnlineOptions['sort'], $allowed_sort_options)) {
+			trigger_error('Sort method for getMembersOnlineStats() function is not allowed', E_USER_NOTICE);
+	}
 
 	// Get it from the cache and send it back.
-	if (($temp = cache_get_data('membersOnlineStats-' . $membersOnlineOptions['sort'], 240)) !== null)
-		return $temp;
+	if (($temp = cache_get_data('membersOnlineStats-' . $membersOnlineOptions['sort'], 240)) !== null) {
+			return $temp;
+	}
 
 	// Initialize the array that'll be returned later on.
 	$membersOnlineStats = array(
@@ -67,8 +70,9 @@ 
 	// Get any spiders if enabled.
 	$spiders = array();
 	$spider_finds = array();
-	if (!empty($modSettings['show_spider_online']) && ($modSettings['show_spider_online'] < 3 || allowedTo('admin_forum')) && !empty($modSettings['spider_name_cache']))
-		$spiders = smf_json_decode($modSettings['spider_name_cache'], true);
+	if (!empty($modSettings['show_spider_online']) && ($modSettings['show_spider_online'] < 3 || allowedTo('admin_forum')) && !empty($modSettings['spider_name_cache'])) {
+			$spiders = smf_json_decode($modSettings['spider_name_cache'], true);
+	}
 
 	// Load the users online right now.
 	$request = $smcFunc['db_query']('', '
@@ -96,9 +100,7 @@ 
 			$membersOnlineStats['num_guests']++;
 
 			continue;
-		}
-
-		elseif (empty($row['show_online']) && empty($membersOnlineOptions['show_hidden']))
+		} elseif (empty($row['show_online']) && empty($membersOnlineOptions['show_hidden']))
 		{
 			// Just increase the stats and don't add this hidden user to any list.
 			$membersOnlineStats['num_users_hidden']++;
@@ -106,10 +108,11 @@ 
 		}
 
 		// Some basic color coding...
-		if (!empty($row['online_color']))
-			$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-		else
-			$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		if (!empty($row['online_color'])) {
+					$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
+		} else {
+					$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		}
 
 		// Buddies get counted and highlighted.
 		$is_buddy = in_array($row['id_member'], $user_info['buddies']);
@@ -136,12 +139,13 @@ 
 		$membersOnlineStats['list_users_online'][$row[$membersOnlineOptions['sort']] . '_' . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
 
 		// Store all distinct (primary) membergroups that are shown.
-		if (!isset($membersOnlineStats['online_groups'][$row['id_group']]))
-			$membersOnlineStats['online_groups'][$row['id_group']] = array(
+		if (!isset($membersOnlineStats['online_groups'][$row['id_group']])) {
+					$membersOnlineStats['online_groups'][$row['id_group']] = array(
 				'id' => $row['id_group'],
 				'name' => $row['group_name'],
 				'color' => $row['online_color']
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -204,11 +208,12 @@ 
 	$settingsToUpdate = array();
 
 	// More members on now than ever were?  Update it!
-	if (!isset($modSettings['mostOnline']) || $total_users_online >= $modSettings['mostOnline'])
-		$settingsToUpdate = array(
+	if (!isset($modSettings['mostOnline']) || $total_users_online >= $modSettings['mostOnline']) {
+			$settingsToUpdate = array(
 			'mostOnline' => $total_users_online,
 			'mostDate' => time()
 		);
+	}
 
 	$date = strftime('%Y-%m-%d', forum_time(false));
 
@@ -240,8 +245,9 @@ 
 		{
 			list ($modSettings['mostOnlineToday']) = $smcFunc['db_fetch_row']($request);
 
-			if ($total_users_online > $modSettings['mostOnlineToday'])
-				trackStats(array('most_on' => $total_users_online));
+			if ($total_users_online > $modSettings['mostOnlineToday']) {
+							trackStats(array('most_on' => $total_users_online));
+			}
 
 			$total_users_online = max($total_users_online, $modSettings['mostOnlineToday']);
 		}
@@ -258,8 +264,9 @@ 
 		$settingsToUpdate['mostOnlineToday'] = $total_users_online;
 	}
 
-	if (!empty($settingsToUpdate))
-		updateSettings($settingsToUpdate);
-}
+	if (!empty($settingsToUpdate)) {
+			updateSettings($settingsToUpdate);
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/Subs-Recent.php

Braces +5 added lines, -3 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get the latest posts of a forum.
@@ -59,8 +60,9 @@ 
 		censorText($row['body']);
 
 		$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']), array('<br>' => '&#10;')));
-		if ($smcFunc['strlen']($row['body']) > 128)
-			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		if ($smcFunc['strlen']($row['body']) > 128) {
+					$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		}
 
 		// Build the array.
 		$posts[] = array(

Sources/Attachments.php

Braces +102 added lines, -76 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class Attachments
 {
@@ -70,16 +71,18 @@ 
 
 		$this->_sa = !empty($_REQUEST['sa']) ? $smcFunc['htmlspecialchars']($smcFunc['htmltrim']($_REQUEST['sa'])) : false;
 
-		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions))
-			$this->{$this->_sa}();
+		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions)) {
+					$this->{$this->_sa}();
+		}
 
 		// Just send a generic message.
-		else
-			$this->setResponse(array(
+		else {
+					$this->setResponse(array(
 				'text' => $this->_sa == 'add' ? 'attach_error_title' :   'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Back to the future, oh, to the browser!
 		$this->sendResponse();
@@ -95,12 +98,13 @@ 
 		$attachID = !empty($_REQUEST['attach']) && is_numeric($_REQUEST['attach']) ? (int) $_REQUEST['attach'] : 0;
 
 		// Need something to work with.
-		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID])))
-			return $this->setResponse(array(
+		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID]))) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Lets pass some params and see what happens :P
 		$affectedMessage = removeAttachments(array('id_attach' => $attachID), '', true, true);
@@ -121,19 +125,21 @@ 
 		$result = array();
 
 		// You gotta be able to post attachments.
-		if (!$this->_canPostAttachment)
-			return $this->setResponse(array(
+		if (!$this->_canPostAttachment) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_cannot',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Process them at once!
 		$this->processAttachments();
 
 		// The attachments was created and moved the the right folder, time to update the DB.
-		if (!empty($_SESSION['temp_attachments']))
-			$this->createAtttach();
+		if (!empty($_SESSION['temp_attachments'])) {
+					$this->createAtttach();
+		}
 
 		// Set the response.
 		$this->setResponse();
@@ -146,8 +152,9 @@ 
 	{
 		global $context, $modSettings, $smcFunc, $user_info, $txt;
 
-		if (!isset($_FILES['attachment']['name']))
-			$_FILES['attachment']['tmp_name'] = array();
+		if (!isset($_FILES['attachment']['name'])) {
+					$_FILES['attachment']['tmp_name'] = array();
+		}
 
 		// If there are attachments, calculate the total size and how many.
 		$context['attachments']['total_size'] = 0;
@@ -157,25 +164,30 @@ 
 		if (isset($_REQUEST['msg']))
 		{
 			$context['attachments']['quantity'] = count($context['current_attachments']);
-			foreach ($context['current_attachments'] as $attachment)
-				$context['attachments']['total_size'] += $attachment['size'];
+			foreach ($context['current_attachments'] as $attachment) {
+							$context['attachments']['total_size'] += $attachment['size'];
+			}
 		}
 
 		// A bit of house keeping first.
-		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1)
-			unset($_SESSION['temp_attachments']);
+		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1) {
+					unset($_SESSION['temp_attachments']);
+		}
 
 		// Our infamous SESSION var, we are gonna have soo much fun with it!
-		if (!isset($_SESSION['temp_attachments']))
-			$_SESSION['temp_attachments'] = array();
+		if (!isset($_SESSION['temp_attachments'])) {
+					$_SESSION['temp_attachments'] = array();
+		}
 
 		// Make sure we're uploading to the right place.
-		if (!empty($modSettings['automanage_attachments']))
-			automanage_attachments_check_directory();
+		if (!empty($modSettings['automanage_attachments'])) {
+					automanage_attachments_check_directory();
+		}
 
 		// Is the attachments folder actually there?
-		if (!empty($context['dir_creation_error']))
-			$this->_generalErrors[] = $context['dir_creation_error'];
+		if (!empty($context['dir_creation_error'])) {
+					$this->_generalErrors[] = $context['dir_creation_error'];
+		}
 
 		// The current attach folder ha some issues...
 		elseif (!is_dir($this->_attchDir))
@@ -200,13 +212,12 @@ 
 			);
 			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-
-		else
-			$context['attachments'] = array(
+		} else {
+					$context['attachments'] = array(
 				'quantity' => 0,
 				'total_size' => 0,
 			);
+		}
 
 		// Check for other general errors here.
 
@@ -214,9 +225,10 @@ 
 		if (!empty($this->_generalErrors))
 		{
 			// And delete the files 'cos they ain't going nowhere.
-			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+							if (file_exists($_FILES['attachment']['tmp_name'][$n]))
 					unlink($_FILES['attachment']['tmp_name'][$n]);
+			}
 
 			$_FILES['attachment']['tmp_name'] = array();
 
@@ -227,26 +239,29 @@ 
 		// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
 		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 		{
-			if ($_FILES['attachment']['name'][$n] == '')
-				continue;
+			if ($_FILES['attachment']['name'][$n] == '') {
+							continue;
+			}
 
 			// First, let's first check for PHP upload errors.
 			$errors = array();
 			if (!empty($_FILES['attachment']['error'][$n]))
 			{
-				if ($_FILES['attachment']['error'][$n] == 2)
-					$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
-
-				else
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				if ($_FILES['attachment']['error'][$n] == 2) {
+									$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+				} else {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				}
 
 				// Log this one, because...
-				if ($_FILES['attachment']['error'][$n] == 6)
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				if ($_FILES['attachment']['error'][$n] == 6) {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				}
 
 				// Weird, no errors were cached, still fill out a generic one.
-				if (empty($errors))
-					$errors[] = 'attach_php_error';
+				if (empty($errors)) {
+									$errors[] = 'attach_php_error';
+				}
 			}
 
 			// Try to move and rename the file before doing any more checks on it.
@@ -266,16 +281,18 @@ 
 				);
 
 				// Move the file to the attachments folder with a temp name for now.
-				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-					smf_chmod($destName, 0644);
+				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
+									smf_chmod($destName, 0644);
+				}
 
 				// This is madness!!
 				else
 				{
 					// File couldn't be moved.
 					$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
-					if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-						unlink($_FILES['attachment']['tmp_name'][$n]);
+					if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+											unlink($_FILES['attachment']['tmp_name'][$n]);
+					}
 				}
 			}
 
@@ -288,13 +305,15 @@ 
 					'errors' => $errors,
 				);
 
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 
 			// If there's no errors to this point. We still do need to apply some additional checks before we are finished.
-			if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
-				attachmentChecks($attachID);
+			if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
+							attachmentChecks($attachID);
+			}
 		}
 
 		// Mod authors, finally a hook to hang an alternate attachment upload system upon
@@ -333,23 +352,24 @@ 
 				'errors' => $attachment['errors'],
 			);
 
-			if (empty($attachment['errors']))
-				if (createAttachment($attachmentOptions))
+			if (empty($attachment['errors'])) {
+							if (createAttachment($attachmentOptions))
 				{
 					// Avoid JS getting confused.
 					$attachmentOptions['attachID'] = $attachmentOptions['id'];
+			}
 					unset($attachmentOptions['id']);
 
 					$_SESSION['already_attached'][$attachmentOptions['attachID']] = $attachmentOptions['attachID'];
 
-					if (!empty($attachmentOptions['thumb']))
-						$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
-
-					if ($this->_msg)
-						assignAttachments($_SESSION['already_attached'], $this->_msg);
-				}
+					if (!empty($attachmentOptions['thumb'])) {
+											$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
+					}
 
-			elseif (!empty($attachmentOptions['errors']))
+					if ($this->_msg) {
+											assignAttachments($_SESSION['already_attached'], $this->_msg);
+					}
+				} elseif (!empty($attachmentOptions['errors']))
 			{
 				// Sort out the errors for display and delete any associated files.
 				$log_these = array('attachments_no_create', 'attachments_no_write', 'attach_timeout', 'ran_out_of_space', 'cant_access_upload_path', 'attach_0_byte_file');
@@ -361,14 +381,16 @@ 
 					if (!is_array($error))
 					{
 						$attachmentOptions['errors'][] = $txt[$error];
-						if (in_array($error, $log_these))
-							log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						if (in_array($error, $log_these)) {
+													log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						}
+					} else {
+											$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 					}
-					else
-						$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 				}
-				if (file_exists($attachment['tmp_name']))
-					unlink($attachment['tmp_name']);
+				if (file_exists($attachment['tmp_name'])) {
+									unlink($attachment['tmp_name']);
+				}
 			}
 
 			// Regardless of errors, pass the results.
@@ -376,8 +398,9 @@ 
 		}
 
 		// Temp save this on the db.
-		if (!empty($_SESSION['already_attached']))
-			$this->_attachSuccess = $_SESSION['already_attached'];
+		if (!empty($_SESSION['already_attached'])) {
+					$this->_attachSuccess = $_SESSION['already_attached'];
+		}
 
 		unset($_SESSION['temp_attachments']);
 	}
@@ -397,14 +420,16 @@ 
 		if ($this->_sa == 'add')
 		{
 			// Is there any generic errors? made some sense out of them!
-			if ($this->_generalErrors)
-				foreach ($this->_generalErrors as $k => $v)
+			if ($this->_generalErrors) {
+							foreach ($this->_generalErrors as $k => $v)
 					$this->_generalErrors[$k] = (is_array($v) ? vsprintf($txt[$v[0]], $v[1]) : $txt[$v]);
+			}
 
 			// Gotta urlencode the filename.
-			if ($this->_attachResults)
-				foreach ($this->_attachResults as $k => $v)
+			if ($this->_attachResults) {
+							foreach ($this->_attachResults as $k => $v)
 					$this->_attachResults[$k]['name'] =  urlencode($this->_attachResults[$k]['name']);
+			}
 
 			$this->_response = array(
 				'files' => $this->_attachResults ? $this->_attachResults : false,
@@ -413,9 +438,10 @@ 
 		}
 
 		// Rest of us mere mortals gets no special treatment...
-		elseif (!empty($data))
-			if (!empty($data['text']) && !empty($txt[$data['text']]))
+		elseif (!empty($data)) {
+					if (!empty($data['text']) && !empty($txt[$data['text']]))
 				$this->_response['text'] = $txt[$data['text']];
+		}
 	}
 
 	protected function sendResponse()
@@ -424,11 +450,11 @@ 
 
 		ob_end_clean();
 
-		if (!empty($modSettings['CompressedOutput']))
-			@ob_start('ob_gzhandler');
-
-		else
-			ob_start();
+		if (!empty($modSettings['CompressedOutput'])) {
+					@ob_start('ob_gzhandler');
+		} else {
+					ob_start();
+		}
 
 		// Set the header.
 		header('Content-Type: application/json; charset='. $context['character_set'] .'');

Sources/Logging.php

Braces +134 added lines, -96 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Put this user in the online log.
@@ -33,8 +34,9 @@ 
 		// Don't update for every page - this isn't wholly accurate but who cares.
 		if ($topic)
 		{
-			if (isset($_SESSION['last_topic_id']) && $_SESSION['last_topic_id'] == $topic)
-				$force = false;
+			if (isset($_SESSION['last_topic_id']) && $_SESSION['last_topic_id'] == $topic) {
+							$force = false;
+			}
 			$_SESSION['last_topic_id'] = $topic;
 		}
 	}
@@ -47,22 +49,24 @@ 
 	}
 
 	// Don't mark them as online more than every so often.
-	if (!empty($_SESSION['log_time']) && $_SESSION['log_time'] >= (time() - 8) && !$force)
-		return;
+	if (!empty($_SESSION['log_time']) && $_SESSION['log_time'] >= (time() - 8) && !$force) {
+			return;
+	}
 
 	if (!empty($modSettings['who_enabled']))
 	{
 		$serialized = $_GET + array('USER_AGENT' => $_SERVER['HTTP_USER_AGENT']);
 
 		// In the case of a dlattach action, session_var may not be set.
-		if (!isset($context['session_var']))
-			$context['session_var'] = $_SESSION['session_var'];
+		if (!isset($context['session_var'])) {
+					$context['session_var'] = $_SESSION['session_var'];
+		}
 
 		unset($serialized['sesc'], $serialized[$context['session_var']]);
 		$serialized = json_encode($serialized);
+	} else {
+			$serialized = '';
 	}
-	else
-		$serialized = '';
 
 	// Guests use 0, members use their session ID.
 	$session_id = $user_info['is_guest'] ? 'ip' . $user_info['ip'] : session_id();
@@ -102,17 +106,18 @@ 
 		);
 
 		// Guess it got deleted.
-		if ($smcFunc['db_affected_rows']() == 0)
+		if ($smcFunc['db_affected_rows']() == 0) {
+					$_SESSION['log_time'] = 0;
+		}
+	} else {
 			$_SESSION['log_time'] = 0;
 	}
-	else
-		$_SESSION['log_time'] = 0;
 
 	// Otherwise, we have to delete and insert.
 	if (empty($_SESSION['log_time']))
 	{
-		if ($do_delete || !empty($user_info['id']))
-			$smcFunc['db_query']('', '
+		if ($do_delete || !empty($user_info['id'])) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}log_online
 				WHERE ' . ($do_delete ? 'log_time < {int:log_time}' : '') . ($do_delete && !empty($user_info['id']) ? ' OR ' : '') . (empty($user_info['id']) ? '' : 'id_member = {int:current_member}'),
 				array(
@@ -120,6 +125,7 @@ 
 					'log_time' => time() - $modSettings['lastActive'] * 60,
 				)
 			);
+		}
 
 		$smcFunc['db_insert']($do_delete ? 'ignore' : 'replace',
 			'{db_prefix}log_online',
@@ -133,21 +139,24 @@ 
 	$_SESSION['log_time'] = time();
 
 	// Well, they are online now.
-	if (empty($_SESSION['timeOnlineUpdated']))
-		$_SESSION['timeOnlineUpdated'] = time();
+	if (empty($_SESSION['timeOnlineUpdated'])) {
+			$_SESSION['timeOnlineUpdated'] = time();
+	}
 
 	// Set their login time, if not already done within the last minute.
 	if (SMF != 'SSI' && !empty($user_info['last_login']) && $user_info['last_login'] < time() - 60 && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('.xml', 'login2', 'logintfa'))))
 	{
 		// Don't count longer than 15 minutes.
-		if (time() - $_SESSION['timeOnlineUpdated'] > 60 * 15)
-			$_SESSION['timeOnlineUpdated'] = time();
+		if (time() - $_SESSION['timeOnlineUpdated'] > 60 * 15) {
+					$_SESSION['timeOnlineUpdated'] = time();
+		}
 
 		$user_settings['total_time_logged_in'] += time() - $_SESSION['timeOnlineUpdated'];
 		updateMemberData($user_info['id'], array('last_login' => time(), 'member_ip' => $user_info['ip'], 'member_ip2' => $_SERVER['BAN_CHECK_IP'], 'total_time_logged_in' => $user_settings['total_time_logged_in']));
 
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-			cache_put_data('user_settings-' . $user_info['id'], $user_settings, 60);
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+					cache_put_data('user_settings-' . $user_info['id'], $user_settings, 60);
+		}
 
 		$user_info['total_time_logged_in'] += time() - $_SESSION['timeOnlineUpdated'];
 		$_SESSION['timeOnlineUpdated'] = time();
@@ -184,8 +193,7 @@ 
 			// Oops. maybe we have no more disk space left, or some other troubles, troubles...
 			// Copy the file back and run for your life!
 			@copy($boarddir . '/db_last_error_bak.php', $boarddir . '/db_last_error.php');
-		}
-		else
+		} else
 		{
 			@touch($boarddir . '/' . 'Settings.php');
 			return true;
@@ -205,22 +213,27 @@ 
 	global $db_cache, $db_count, $cache_misses, $cache_count_misses, $db_show_debug, $cache_count, $cache_hits, $smcFunc, $txt;
 
 	// Add to Settings.php if you want to show the debugging information.
-	if (!isset($db_show_debug) || $db_show_debug !== true || (isset($_GET['action']) && $_GET['action'] == 'viewquery'))
-		return;
+	if (!isset($db_show_debug) || $db_show_debug !== true || (isset($_GET['action']) && $_GET['action'] == 'viewquery')) {
+			return;
+	}
 
-	if (empty($_SESSION['view_queries']))
-		$_SESSION['view_queries'] = 0;
-	if (empty($context['debug']['language_files']))
-		$context['debug']['language_files'] = array();
-	if (empty($context['debug']['sheets']))
-		$context['debug']['sheets'] = array();
+	if (empty($_SESSION['view_queries'])) {
+			$_SESSION['view_queries'] = 0;
+	}
+	if (empty($context['debug']['language_files'])) {
+			$context['debug']['language_files'] = array();
+	}
+	if (empty($context['debug']['sheets'])) {
+			$context['debug']['sheets'] = array();
+	}
 
 	$files = get_included_files();
 	$total_size = 0;
 	for ($i = 0, $n = count($files); $i < $n; $i++)
 	{
-		if (file_exists($files[$i]))
-			$total_size += filesize($files[$i]);
+		if (file_exists($files[$i])) {
+					$total_size += filesize($files[$i]);
+		}
 		$files[$i] = strtr($files[$i], array($boarddir => '.', $sourcedir => '(Sources)', $cachedir => '(Cache)', $settings['actual_theme_dir'] => '(Current Theme)'));
 	}
 
@@ -229,8 +242,9 @@ 
 	{
 		foreach ($db_cache as $q => $qq)
 		{
-			if (!empty($qq['w']))
-				$warnings += count($qq['w']);
+			if (!empty($qq['w'])) {
+							$warnings += count($qq['w']);
+			}
 		}
 
 		$_SESSION['debug'] = &$db_cache;
@@ -251,12 +265,14 @@ 
 	',(isset($context['debug']['instances']) ? ($txt['debug_instances'] . (empty($context['debug']['instances']) ? 0 : count($context['debug']['instances'])) . ' (<a href="javascript:void(0);" onclick="document.getElementById(\'debug_instances\').style.display = \'inline\'; this.style.display = \'none\'; return false;">'. $txt['debug_show'] .'</a><span id="debug_instances" style="display: none;"><em>'. implode('</em>, <em>', array_keys($context['debug']['instances'])) .'</em></span>)'. '<br>') : ''),'
 	', $txt['debug_files_included'], count($files), ' - ', round($total_size / 1024), $txt['debug_kb'], ' (<a href="javascript:void(0);" onclick="document.getElementById(\'debug_include_info\').style.display = \'inline\'; this.style.display = \'none\'; return false;">', $txt['debug_show'], '</a><span id="debug_include_info" style="display: none;"><em>', implode('</em>, <em>', $files), '</em></span>)<br>';
 
-	if (function_exists('memory_get_peak_usage'))
-		echo $txt['debug_memory_use'], ceil(memory_get_peak_usage() / 1024), $txt['debug_kb'], '<br>';
+	if (function_exists('memory_get_peak_usage')) {
+			echo $txt['debug_memory_use'], ceil(memory_get_peak_usage() / 1024), $txt['debug_kb'], '<br>';
+	}
 
 	// What tokens are active?
-	if (isset($_SESSION['token']))
-		echo $txt['debug_tokens'] . '<em>' . implode(',</em> <em>', array_keys($_SESSION['token'])), '</em>.<br>';
+	if (isset($_SESSION['token'])) {
+			echo $txt['debug_tokens'] . '<em>' . implode(',</em> <em>', array_keys($_SESSION['token'])), '</em>.<br>';
+	}
 
 	if (!empty($modSettings['cache_enable']) && !empty($cache_hits))
 	{
@@ -269,10 +285,12 @@ 
 			$total_t += $cache_hit['t'];
 			$total_s += $cache_hit['s'];
 		}
-		if (!isset($cache_misses))
-			$cache_misses = array();
-		foreach ($cache_misses as $missed)
-			$missed_entires[] = $missed['d'] . ' ' . $missed['k'];
+		if (!isset($cache_misses)) {
+					$cache_misses = array();
+		}
+		foreach ($cache_misses as $missed) {
+					$missed_entires[] = $missed['d'] . ' ' . $missed['k'];
+		}
 
 		echo '
 	', $txt['debug_cache_hits'], $cache_count, ': ', sprintf($txt['debug_cache_seconds_bytes_total'], comma_format($total_t, 5), comma_format($total_s)), ' (<a href="javascript:void(0);" onclick="document.getElementById(\'debug_cache_info\').style.display = \'inline\'; this.style.display = \'none\'; return false;">', $txt['debug_show'], '</a><span id="debug_cache_info" style="display: none;"><em>', implode('</em>, <em>', $entries), '</em></span>)<br>
@@ -283,38 +301,44 @@ 
 	<a href="', $scripturl, '?action=viewquery" target="_blank" class="new_win">', $warnings == 0 ? sprintf($txt['debug_queries_used'], (int) $db_count) : sprintf($txt['debug_queries_used_and_warnings'], (int) $db_count, $warnings), '</a><br>
 	<br>';
 
-	if ($_SESSION['view_queries'] == 1 && !empty($db_cache))
-		foreach ($db_cache as $q => $qq)
+	if ($_SESSION['view_queries'] == 1 && !empty($db_cache)) {
+			foreach ($db_cache as $q => $qq)
 		{
 			$is_select = strpos(trim($qq['q']), 'SELECT') === 0 || preg_match('~^INSERT(?: IGNORE)? INTO \w+(?:\s+\([^)]+\))?\s+SELECT .+$~s', trim($qq['q'])) != 0;
+	}
 			// Temporary tables created in earlier queries are not explainable.
 			if ($is_select)
 			{
-				foreach (array('log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages') as $tmp)
-					if (strpos(trim($qq['q']), $tmp) !== false)
+				foreach (array('log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages') as $tmp) {
+									if (strpos(trim($qq['q']), $tmp) !== false)
 					{
 						$is_select = false;
+				}
 						break;
 					}
 			}
 			// But actual creation of the temporary tables are.
-			elseif (preg_match('~^CREATE TEMPORARY TABLE .+?SELECT .+$~s', trim($qq['q'])) != 0)
-				$is_select = true;
+			elseif (preg_match('~^CREATE TEMPORARY TABLE .+?SELECT .+$~s', trim($qq['q'])) != 0) {
+							$is_select = true;
+			}
 
 			// Make the filenames look a bit better.
-			if (isset($qq['f']))
-				$qq['f'] = preg_replace('~^' . preg_quote($boarddir, '~') . '~', '...', $qq['f']);
+			if (isset($qq['f'])) {
+							$qq['f'] = preg_replace('~^' . preg_quote($boarddir, '~') . '~', '...', $qq['f']);
+			}
 
 			echo '
 	<strong>', $is_select ? '<a href="' . $scripturl . '?action=viewquery;qq=' . ($q + 1) . '#qq' . $q . '" target="_blank" class="new_win" style="text-decoration: none;">' : '', nl2br(str_replace("\t", '&nbsp;&nbsp;&nbsp;', $smcFunc['htmlspecialchars'](ltrim($qq['q'], "\n\r")))) . ($is_select ? '</a></strong>' : '</strong>') . '<br>
 	&nbsp;&nbsp;&nbsp;';
-			if (!empty($qq['f']) && !empty($qq['l']))
-				echo sprintf($txt['debug_query_in_line'], $qq['f'], $qq['l']);
+			if (!empty($qq['f']) && !empty($qq['l'])) {
+							echo sprintf($txt['debug_query_in_line'], $qq['f'], $qq['l']);
+			}
 
-			if (isset($qq['s'], $qq['t']) && isset($txt['debug_query_which_took_at']))
-				echo sprintf($txt['debug_query_which_took_at'], round($qq['t'], 8), round($qq['s'], 8)) . '<br>';
-			elseif (isset($qq['t']))
-				echo sprintf($txt['debug_query_which_took'], round($qq['t'], 8)) . '<br>';
+			if (isset($qq['s'], $qq['t']) && isset($txt['debug_query_which_took_at'])) {
+							echo sprintf($txt['debug_query_which_took_at'], round($qq['t'], 8), round($qq['s'], 8)) . '<br>';
+			} elseif (isset($qq['t'])) {
+							echo sprintf($txt['debug_query_which_took'], round($qq['t'], 8)) . '<br>';
+			}
 			echo '
 	<br>';
 		}
@@ -339,12 +363,14 @@ 
 	global $modSettings, $smcFunc;
 	static $cache_stats = array();
 
-	if (empty($modSettings['trackStats']))
-		return false;
-	if (!empty($stats))
-		return $cache_stats = array_merge($cache_stats, $stats);
-	elseif (empty($cache_stats))
-		return false;
+	if (empty($modSettings['trackStats'])) {
+			return false;
+	}
+	if (!empty($stats)) {
+			return $cache_stats = array_merge($cache_stats, $stats);
+	} elseif (empty($cache_stats)) {
+			return false;
+	}
 
 	$setStringUpdate = '';
 	$insert_keys = array();
@@ -357,10 +383,11 @@ 
 		$setStringUpdate .= '
 			' . $field . ' = ' . ($change === '+' ? $field . ' + 1' : '{int:' . $field . '}') . ',';
 
-		if ($change === '+')
-			$cache_stats[$field] = 1;
-		else
-			$update_parameters[$field] = $change;
+		if ($change === '+') {
+					$cache_stats[$field] = 1;
+		} else {
+					$update_parameters[$field] = $change;
+		}
 		$insert_keys[$field] = 'int';
 	}
 
@@ -424,43 +451,50 @@ 
 	);
 
 	// Make sure this particular log is enabled first...
-	if (empty($modSettings['modlog_enabled']))
-		unset ($log_types['moderate']);
-	if (empty($modSettings['userlog_enabled']))
-		unset ($log_types['user']);
-	if (empty($modSettings['adminlog_enabled']))
-		unset ($log_types['admin']);
+	if (empty($modSettings['modlog_enabled'])) {
+			unset ($log_types['moderate']);
+	}
+	if (empty($modSettings['userlog_enabled'])) {
+			unset ($log_types['user']);
+	}
+	if (empty($modSettings['adminlog_enabled'])) {
+			unset ($log_types['admin']);
+	}
 
 	call_integration_hook('integrate_log_types', array(&$log_types));
 
 	foreach ($logs as $log)
 	{
-		if (!isset($log_types[$log['log_type']]))
-			return false;
+		if (!isset($log_types[$log['log_type']])) {
+					return false;
+		}
 
-		if (!is_array($log['extra']))
-			trigger_error('logActions(): data is not an array with action \'' . $log['action'] . '\'', E_USER_NOTICE);
+		if (!is_array($log['extra'])) {
+					trigger_error('logActions(): data is not an array with action \'' . $log['action'] . '\'', E_USER_NOTICE);
+		}
 
 		// Pull out the parts we want to store separately, but also make sure that the data is proper
 		if (isset($log['extra']['topic']))
 		{
-			if (!is_numeric($log['extra']['topic']))
-				trigger_error('logActions(): data\'s topic is not a number', E_USER_NOTICE);
+			if (!is_numeric($log['extra']['topic'])) {
+							trigger_error('logActions(): data\'s topic is not a number', E_USER_NOTICE);
+			}
 			$topic_id = empty($log['extra']['topic']) ? 0 : (int) $log['extra']['topic'];
 			unset($log['extra']['topic']);
+		} else {
+					$topic_id = 0;
 		}
-		else
-			$topic_id = 0;
 
 		if (isset($log['extra']['message']))
 		{
-			if (!is_numeric($log['extra']['message']))
-				trigger_error('logActions(): data\'s message is not a number', E_USER_NOTICE);
+			if (!is_numeric($log['extra']['message'])) {
+							trigger_error('logActions(): data\'s message is not a number', E_USER_NOTICE);
+			}
 			$msg_id = empty($log['extra']['message']) ? 0 : (int) $log['extra']['message'];
 			unset($log['extra']['message']);
+		} else {
+					$msg_id = 0;
 		}
-		else
-			$msg_id = 0;
 
 		// @todo cache this?
 		// Is there an associated report on this?
@@ -487,23 +521,26 @@ 
 			$smcFunc['db_free_result']($request);
 		}
 
-		if (isset($log['extra']['member']) && !is_numeric($log['extra']['member']))
-			trigger_error('logActions(): data\'s member is not a number', E_USER_NOTICE);
+		if (isset($log['extra']['member']) && !is_numeric($log['extra']['member'])) {
+					trigger_error('logActions(): data\'s member is not a number', E_USER_NOTICE);
+		}
 
 		if (isset($log['extra']['board']))
 		{
-			if (!is_numeric($log['extra']['board']))
-				trigger_error('logActions(): data\'s board is not a number', E_USER_NOTICE);
+			if (!is_numeric($log['extra']['board'])) {
+							trigger_error('logActions(): data\'s board is not a number', E_USER_NOTICE);
+			}
 			$board_id = empty($log['extra']['board']) ? 0 : (int) $log['extra']['board'];
 			unset($log['extra']['board']);
+		} else {
+					$board_id = 0;
 		}
-		else
-			$board_id = 0;
 
 		if (isset($log['extra']['board_to']))
 		{
-			if (!is_numeric($log['extra']['board_to']))
-				trigger_error('logActions(): data\'s board_to is not a number', E_USER_NOTICE);
+			if (!is_numeric($log['extra']['board_to'])) {
+							trigger_error('logActions(): data\'s board_to is not a number', E_USER_NOTICE);
+			}
 			if (empty($board_id))
 			{
 				$board_id = empty($log['extra']['board_to']) ? 0 : (int) $log['extra']['board_to'];
@@ -511,10 +548,11 @@ 
 			}
 		}
 
-		if (isset($log['extra']['member_affected']))
-			$memID = $log['extra']['member_affected'];
-		else
-			$memID = $user_info['id'];
+		if (isset($log['extra']['member_affected'])) {
+					$memID = $log['extra']['member_affected'];
+		} else {
+					$memID = $user_info['id'];
+		}
 
 		$inserts[] = array(
 			time(), $log_types[$log['log_type']], $memID, $user_info['ip'], $log['action'],

Sources/SearchAPI-Custom.php

Braces +48 added lines, -34 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Used for the "custom search index" option
@@ -54,8 +55,9 @@ 
 			return;
 		}
 
-		if (empty($modSettings['search_custom_index_config']))
-			return;
+		if (empty($modSettings['search_custom_index_config'])) {
+					return;
+		}
 
 		$this->indexSettings = smf_json_decode($modSettings['search_custom_index_config'], true);
 
@@ -118,21 +120,23 @@ 
 
 		$subwords = text2words($word, $this->min_word_length, true);
 
-		if (empty($modSettings['search_force_index']))
-			$wordsSearch['words'][] = $word;
+		if (empty($modSettings['search_force_index'])) {
+					$wordsSearch['words'][] = $word;
+		}
 
 		// Excluded phrases don't benefit from being split into subwords.
-		if (count($subwords) > 1 && $isExcluded)
-			return;
-		else
+		if (count($subwords) > 1 && $isExcluded) {
+					return;
+		} else
 		{
 			foreach ($subwords as $subword)
 			{
 				if ($smcFunc['strlen']($subword) >= $this->min_word_length && !in_array($subword, $this->bannedWords))
 				{
 					$wordsSearch['indexed_words'][] = $subword;
-					if ($isExcluded)
-						$wordsExclude[] = $subword;
+					if ($isExcluded) {
+											$wordsExclude[] = $subword;
+					}
 				}
 			}
 		}
@@ -153,8 +157,9 @@ 
 		$query_where = array();
 		$query_params = $search_data['params'];
 
-		if ($query_params['id_search'])
-			$query_select['id_search'] = '{int:id_search}';
+		if ($query_params['id_search']) {
+					$query_select['id_search'] = '{int:id_search}';
+		}
 
 		$count = 0;
 		foreach ($words['words'] as $regularWord)
@@ -163,30 +168,37 @@ 
 			$query_params['complex_body_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($regularWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $regularWord), '\\\'') . '[[:>:]]';
 		}
 
-		if ($query_params['user_query'])
-			$query_where[] = '{raw:user_query}';
-		if ($query_params['board_query'])
-			$query_where[] = 'm.id_board {raw:board_query}';
+		if ($query_params['user_query']) {
+					$query_where[] = '{raw:user_query}';
+		}
+		if ($query_params['board_query']) {
+					$query_where[] = 'm.id_board {raw:board_query}';
+		}
 
-		if ($query_params['topic'])
-			$query_where[] = 'm.id_topic = {int:topic}';
-		if ($query_params['min_msg_id'])
-			$query_where[] = 'm.id_msg >= {int:min_msg_id}';
-		if ($query_params['max_msg_id'])
-			$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		if ($query_params['topic']) {
+					$query_where[] = 'm.id_topic = {int:topic}';
+		}
+		if ($query_params['min_msg_id']) {
+					$query_where[] = 'm.id_msg >= {int:min_msg_id}';
+		}
+		if ($query_params['max_msg_id']) {
+					$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		}
 
 		$count = 0;
-		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_phrases'] as $phrase)
+		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_phrases'] as $phrase)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : ' RLIKE ') . '{string:exclude_subject_phrase_' . $count . '}';
+		}
 				$query_params['exclude_subject_phrase_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($phrase, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $phrase), '\\\'') . '[[:>:]]';
 			}
 		$count = 0;
-		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_subject_words'] as $excludedWord)
+		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_subject_words'] as $excludedWord)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : ' RLIKE ') . '{string:exclude_subject_words_' . $count . '}';
+		}
 				$query_params['exclude_subject_words_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($excludedWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $excludedWord), '\\\'') . '[[:>:]]';
 			}
 
@@ -199,8 +211,7 @@ 
 			{
 				$query_left_join[] = '{db_prefix}log_search_words AS lsw' . $numTables . ' ON (lsw' . $numTables . '.id_word = ' . $indexedWord . ' AND lsw' . $numTables . '.id_msg = m.id_msg)';
 				$query_where[] = '(lsw' . $numTables . '.id_word IS NULL)';
-			}
-			else
+			} else
 			{
 				$query_inner_join[] = '{db_prefix}log_search_words AS lsw' . $numTables . ' ON (lsw' . $numTables . '.id_msg = ' . ($prev_join === 0 ? 'm' : 'lsw' . $prev_join) . '.id_msg)';
 				$query_where[] = 'lsw' . $numTables . '.id_word = ' . $indexedWord;
@@ -236,16 +247,18 @@ 
 		$customIndexSettings = smf_json_decode($modSettings['search_custom_index_config'], true);
 
 		$inserts = array();
-		foreach (text2words($msgOptions['body'], $customIndexSettings['bytes_per_word'], true) as $word)
-			$inserts[] = array($word, $msgOptions['id']);
+		foreach (text2words($msgOptions['body'], $customIndexSettings['bytes_per_word'], true) as $word) {
+					$inserts[] = array($word, $msgOptions['id']);
+		}
 
-		if (!empty($inserts))
-			$smcFunc['db_insert']('ignore',
+		if (!empty($inserts)) {
+					$smcFunc['db_insert']('ignore',
 				'{db_prefix}log_search_words',
 				array('id_word' => 'int', 'id_msg' => 'int'),
 				$inserts,
 				array('id_word', 'id_msg')
 			);
+		}
 	}
 
 	/**
@@ -288,8 +301,9 @@ 
 			if (!empty($inserted_words))
 			{
 				$inserts = array();
-				foreach ($inserted_words as $word)
-					$inserts[] = array($word, $msgOptions['id']);
+				foreach ($inserted_words as $word) {
+									$inserts[] = array($word, $msgOptions['id']);
+				}
 				$smcFunc['db_insert']('insert',
 					'{db_prefix}log_search_words',
 					array('id_word' => 'string', 'id_msg' => 'int'),