albertlast / SMF2.1

Sources/Logging.php

Braces +149 added lines, -107 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Truncate the GET array to a specified length
@@ -26,24 +27,28 @@ 
 function truncateArray($arr, $max_length=1900)
 {
 	$curr_length = 0;
-	foreach ($arr as $key => $value)
-		if (is_array($value))
+	foreach ($arr as $key => $value) {
+			if (is_array($value))
 			foreach ($value as $key2 => $value2)
 				$curr_length += strlen ($value2);
-		else
-			$curr_length += strlen ($value);
-	if ($curr_length <= $max_length)
-		return $arr;
-	else
+	}
+		else {
+					$curr_length += strlen ($value);
+		}
+	if ($curr_length <= $max_length) {
+			return $arr;
+	} else
 	{
 		// Truncate each element's value to a reasonable length
 		$param_max = floor($max_length/count($arr));
-		foreach ($arr as $key => &$value)
-			if (is_array($value))
+		foreach ($arr as $key => &$value) {
+					if (is_array($value))
 				foreach ($value as $key2 => &$value2)
 					$value2 = substr($value2, 0, $param_max - strlen($key) - 5);
-			else
-				$value = substr($value, 0, $param_max - strlen($key) - 5);
+		}
+			else {
+							$value = substr($value, 0, $param_max - strlen($key) - 5);
+			}
 		return $arr;
 	}
 }
@@ -65,8 +70,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;
 		}
 	}
@@ -79,22 +85,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']))
 	{
 		$encoded_get = truncateArray($_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($encoded_get['sesc'], $encoded_get[$context['session_var']]);
 		$encoded_get = $smcFunc['json_encode']($encoded_get);
+	} else {
+			$encoded_get = '';
 	}
-	else
-		$encoded_get = '';
 
 	// Guests use 0, members use their session ID.
 	$session_id = $user_info['is_guest'] ? 'ip' . $user_info['ip'] : session_id();
@@ -134,17 +142,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(
@@ -152,6 +161,7 @@ 
 					'log_time' => time() - $modSettings['lastActive'] * 60,
 				)
 			);
+		}
 
 		$smcFunc['db_insert']($do_delete ? 'ignore' : 'replace',
 			'{db_prefix}log_online',
@@ -165,21 +175,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();
@@ -216,8 +229,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($cachedir . '/db_last_error_bak.php', $cachedir . '/db_last_error.php');
-		}
-		else
+		} else
 		{
 			@touch($boarddir . '/' . 'Settings.php');
 			return true;
@@ -237,22 +249,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)'));
 	}
 
@@ -261,8 +278,9 @@ 
 	{
 		foreach ($db_cache as $q => $query_data)
 		{
-			if (!empty($query_data['w']))
-				$warnings += count($query_data['w']);
+			if (!empty($query_data['w'])) {
+							$warnings += count($query_data['w']);
+			}
 		}
 
 		$_SESSION['debug'] = &$db_cache;
@@ -283,12 +301,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))
 	{
@@ -302,10 +322,12 @@ 
 			$total_t += $cache_hit['t'];
 			$total_s += $cache_hit['s'];
 		}
-		if (!isset($cache_misses))
-			$cache_misses = array();
-		foreach ($cache_misses as $missed)
-			$missed_entries[] = $missed['d'] . ' ' . $missed['k'];
+		if (!isset($cache_misses)) {
+					$cache_misses = array();
+		}
+		foreach ($cache_misses as $missed) {
+					$missed_entries[] = $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>
@@ -316,38 +338,44 @@ 
 	<a href="', $scripturl, '?action=viewquery" target="_blank" rel="noopener">', $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 => $query_data)
+	if ($_SESSION['view_queries'] == 1 && !empty($db_cache)) {
+			foreach ($db_cache as $q => $query_data)
 		{
 			$is_select = strpos(trim($query_data['q']), 'SELECT') === 0 || preg_match('~^INSERT(?: IGNORE)? INTO \w+(?:\s+\([^)]+\))?\s+SELECT .+$~s', trim($query_data['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($query_data['q']), $tmp) !== false)
+				foreach (array('log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages') as $tmp) {
+									if (strpos(trim($query_data['q']), $tmp) !== false)
 					{
 						$is_select = false;
+				}
 						break;
 					}
 			}
 			// But actual creation of the temporary tables are.
-			elseif (preg_match('~^CREATE TEMPORARY TABLE .+?SELECT .+$~s', trim($query_data['q'])) != 0)
-				$is_select = true;
+			elseif (preg_match('~^CREATE TEMPORARY TABLE .+?SELECT .+$~s', trim($query_data['q'])) != 0) {
+							$is_select = true;
+			}
 
 			// Make the filenames look a bit better.
-			if (isset($query_data['f']))
-				$query_data['f'] = preg_replace('~^' . preg_quote($boarddir, '~') . '~', '...', $query_data['f']);
+			if (isset($query_data['f'])) {
+							$query_data['f'] = preg_replace('~^' . preg_quote($boarddir, '~') . '~', '...', $query_data['f']);
+			}
 
 			echo '
 	<strong>', $is_select ? '<a href="' . $scripturl . '?action=viewquery;qq=' . ($q + 1) . '#qq' . $q . '" target="_blank" rel="noopener" style="text-decoration: none;">' : '', nl2br(str_replace("\t", '&nbsp;&nbsp;&nbsp;', $smcFunc['htmlspecialchars'](ltrim($query_data['q'], "\n\r")))) . ($is_select ? '</a></strong>' : '</strong>') . '<br>
 	&nbsp;&nbsp;&nbsp;';
-			if (!empty($query_data['f']) && !empty($query_data['l']))
-				echo sprintf($txt['debug_query_in_line'], $query_data['f'], $query_data['l']);
+			if (!empty($query_data['f']) && !empty($query_data['l'])) {
+							echo sprintf($txt['debug_query_in_line'], $query_data['f'], $query_data['l']);
+			}
 
-			if (isset($query_data['s'], $query_data['t']) && isset($txt['debug_query_which_took_at']))
-				echo sprintf($txt['debug_query_which_took_at'], round($query_data['t'], 8), round($query_data['s'], 8)) . '<br>';
-			elseif (isset($query_data['t']))
-				echo sprintf($txt['debug_query_which_took'], round($query_data['t'], 8)) . '<br>';
+			if (isset($query_data['s'], $query_data['t']) && isset($txt['debug_query_which_took_at'])) {
+							echo sprintf($txt['debug_query_which_took_at'], round($query_data['t'], 8), round($query_data['s'], 8)) . '<br>';
+			} elseif (isset($query_data['t'])) {
+							echo sprintf($txt['debug_query_which_took'], round($query_data['t'], 8)) . '<br>';
+			}
 			echo '
 	<br>';
 		}
@@ -372,12 +400,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();
@@ -390,10 +420,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';
 	}
 
@@ -457,43 +488,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?
@@ -520,23 +558,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'];
@@ -544,10 +585,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/ManageMembers.php

Braces +163 added lines, -122 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main entrance point for the Manage Members screen.
@@ -62,16 +63,18 @@ 
 	$context['activation_numbers'] = array();
 	$context['awaiting_activation'] = 0;
 	$context['awaiting_approval'] = 0;
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['activation_numbers'][$row['is_activated']] = $row['total_members'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['activation_numbers'][$row['is_activated']] = $row['total_members'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	foreach ($context['activation_numbers'] as $activation_type => $total_members)
 	{
-		if (in_array($activation_type, array(0, 2)))
-			$context['awaiting_activation'] += $total_members;
-		elseif (in_array($activation_type, array(3, 4, 5)))
-			$context['awaiting_approval'] += $total_members;
+		if (in_array($activation_type, array(0, 2))) {
+					$context['awaiting_activation'] += $total_members;
+		} elseif (in_array($activation_type, array(3, 4, 5))) {
+					$context['awaiting_approval'] += $total_members;
+		}
 	}
 
 	// For the page header... do we show activation?
@@ -124,8 +127,9 @@ 
 	}
 	if (!$context['show_approve'] && ($_REQUEST['sa'] != 'browse' || $_REQUEST['type'] != 'approve'))
 	{
-		if (!$context['show_activate'] && ($_REQUEST['sa'] != 'browse' || $_REQUEST['type'] != 'activate'))
-			$context['tabs']['search']['is_last'] = true;
+		if (!$context['show_activate'] && ($_REQUEST['sa'] != 'browse' || $_REQUEST['type'] != 'activate')) {
+					$context['tabs']['search']['is_last'] = true;
+		}
 		unset($context['tabs']['approve']);
 	}
 
@@ -157,8 +161,9 @@ 
 		foreach ($_POST['delete'] as $key => $value)
 		{
 			// Don't delete yourself, idiot.
-			if ($value != $user_info['id'])
-				$delete[$key] = (int) $value;
+			if ($value != $user_info['id']) {
+							$delete[$key] = (int) $value;
+			}
 		}
 
 		if (!empty($delete))
@@ -194,17 +199,18 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['min_posts'] == -1)
-				$context['membergroups'][] = array(
+			if ($row['min_posts'] == -1) {
+							$context['membergroups'][] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name'],
 					'can_be_additional' => true
 				);
-			else
-				$context['postgroups'][] = array(
+			} else {
+							$context['postgroups'][] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name']
 				);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -276,14 +282,15 @@ 
 		call_integration_hook('integrate_view_members_params', array(&$params));
 
 		$search_params = array();
-		if ($context['sub_action'] == 'query' && !empty($_REQUEST['params']) && empty($_POST['types']))
-			$search_params = $smcFunc['json_decode'](base64_decode($_REQUEST['params']), true);
-		elseif (!empty($_POST))
+		if ($context['sub_action'] == 'query' && !empty($_REQUEST['params']) && empty($_POST['types'])) {
+					$search_params = $smcFunc['json_decode'](base64_decode($_REQUEST['params']), true);
+		} elseif (!empty($_POST))
 		{
 			$search_params['types'] = $_POST['types'];
-			foreach ($params as $param_name => $param_info)
-				if (isset($_POST[$param_name]))
+			foreach ($params as $param_name => $param_info) {
+							if (isset($_POST[$param_name]))
 					$search_params[$param_name] = $_POST[$param_name];
+			}
 		}
 
 		$search_url_params = isset($search_params) ? base64_encode($smcFunc['json_encode']($search_params)) : null;
@@ -296,34 +303,38 @@ 
 		foreach ($params as $param_name => $param_info)
 		{
 			// Not filled in?
-			if (!isset($search_params[$param_name]) || $search_params[$param_name] === '')
-				continue;
+			if (!isset($search_params[$param_name]) || $search_params[$param_name] === '') {
+							continue;
+			}
 
 			// Make sure numeric values are really numeric.
-			if (in_array($param_info['type'], array('int', 'age')))
-				$search_params[$param_name] = (int) $search_params[$param_name];
+			if (in_array($param_info['type'], array('int', 'age'))) {
+							$search_params[$param_name] = (int) $search_params[$param_name];
+			}
 			// Date values have to match the specified format.
 			elseif ($param_info['type'] == 'date')
 			{
 				// Check if this date format is valid.
-				if (preg_match('/^\d{4}-\d{1,2}-\d{1,2}$/', $search_params[$param_name]) == 0)
-					continue;
+				if (preg_match('/^\d{4}-\d{1,2}-\d{1,2}$/', $search_params[$param_name]) == 0) {
+									continue;
+				}
 
 				$search_params[$param_name] = strtotime($search_params[$param_name]);
-			}
-			elseif ($param_info['type'] == 'inet')
+			} elseif ($param_info['type'] == 'inet')
 			{
 				$search_params[$param_name] = ip2range($search_params[$param_name]);
-				if (empty($search_params[$param_name]))
-					continue;
+				if (empty($search_params[$param_name])) {
+									continue;
+				}
 			}
 
 			// Those values that are in some kind of range (<, <=, =, >=, >).
 			if (!empty($param_info['range']))
 			{
 				// Default to '=', just in case...
-				if (empty($range_trans[$search_params['types'][$param_name]]))
-					$search_params['types'][$param_name] = '=';
+				if (empty($range_trans[$search_params['types'][$param_name]])) {
+									$search_params['types'][$param_name] = '=';
+				}
 
 				// Handle special case 'age'.
 				if ($param_info['type'] == 'age')
@@ -351,16 +362,17 @@ 
 				elseif ($param_info['type'] == 'date' && $search_params['types'][$param_name] == '=')
 				{
 					$query_parts[] = $param_info['db_fields'][0] . ' > ' . $search_params[$param_name] . ' AND ' . $param_info['db_fields'][0] . ' < ' . ($search_params[$param_name] + 86400);
+				} else {
+									$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . $search_params[$param_name];
 				}
-				else
-					$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . $search_params[$param_name];
 			}
 			// Checkboxes.
 			elseif ($param_info['type'] == 'checkbox')
 			{
 				// Each checkbox or no checkbox at all is checked -> ignore.
-				if (!is_array($search_params[$param_name]) || count($search_params[$param_name]) == 0 || count($search_params[$param_name]) == count($param_info['values']))
-					continue;
+				if (!is_array($search_params[$param_name]) || count($search_params[$param_name]) == 0 || count($search_params[$param_name]) == count($param_info['values'])) {
+									continue;
+				}
 
 				$query_parts[] = ($param_info['db_fields'][0]) . ' IN ({array_string:' . $param_name . '_check})';
 				$where_params[$param_name . '_check'] = $search_params[$param_name];
@@ -372,24 +384,23 @@ 
 				{
 					$query_parts[] = '(' . $param_info['db_fields'][0] . ' = {inet:' . $param_name . '})';
 					$where_params[$param_name] = $search_params[$param_name][0];
-				}
-				elseif (count($search_params[$param_name]) === 2)
+				} elseif (count($search_params[$param_name]) === 2)
 				{
 					$query_parts[] = '(' . $param_info['db_fields'][0] . ' <= {inet:' . $param_name . '_high} and ' . $param_info['db_fields'][0] . ' >= {inet:' . $param_name . '_low})';
 					$where_params[$param_name.'_low'] = $search_params[$param_name]['low'];
 					$where_params[$param_name.'_high'] = $search_params[$param_name]['high'];
 				}
 				
-			}
-			elseif ($param_info['type'] != 'groups')
+			} elseif ($param_info['type'] != 'groups')
 			{
 				// Replace the wildcard characters ('*' and '?') into MySQL ones.
 				$parameter = strtolower(strtr($smcFunc['htmlspecialchars']($search_params[$param_name], ENT_QUOTES), array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_')));
 
-				if ($smcFunc['db_case_sensitive'])
-					$query_parts[] = '(LOWER(' . implode(') LIKE {string:' . $param_name . '_normal} OR LOWER(', $param_info['db_fields']) . ') LIKE {string:' . $param_name . '_normal})';
-				else
-					$query_parts[] = '(' . implode(' LIKE {string:' . $param_name . '_normal} OR ', $param_info['db_fields']) . ' LIKE {string:' . $param_name . '_normal})';
+				if ($smcFunc['db_case_sensitive']) {
+									$query_parts[] = '(LOWER(' . implode(') LIKE {string:' . $param_name . '_normal} OR LOWER(', $param_info['db_fields']) . ') LIKE {string:' . $param_name . '_normal})';
+				} else {
+									$query_parts[] = '(' . implode(' LIKE {string:' . $param_name . '_normal} OR ', $param_info['db_fields']) . ' LIKE {string:' . $param_name . '_normal})';
+				}
 				$where_params[$param_name . '_normal'] = '%' . $parameter . '%';
 			}
 		}
@@ -405,16 +416,18 @@ 
 		}
 
 		// Additional membergroups (these are only relevant if not all primary groups where selected!).
-		if (!empty($search_params['membergroups'][2]) && (empty($search_params['membergroups'][1]) || count($context['membergroups']) != count($search_params['membergroups'][1])))
-			foreach ($search_params['membergroups'][2] as $mg)
+		if (!empty($search_params['membergroups'][2]) && (empty($search_params['membergroups'][1]) || count($context['membergroups']) != count($search_params['membergroups'][1]))) {
+					foreach ($search_params['membergroups'][2] as $mg)
 			{
 				$mg_query_parts[] = 'FIND_IN_SET({int:add_group_' . $mg . '}, mem.additional_groups) != 0';
+		}
 				$where_params['add_group_' . $mg] = $mg;
 			}
 
 		// Combine the one or two membergroup parts into one query part linked with an OR.
-		if (!empty($mg_query_parts))
-			$query_parts[] = '(' . implode(' OR ', $mg_query_parts) . ')';
+		if (!empty($mg_query_parts)) {
+					$query_parts[] = '(' . implode(' OR ', $mg_query_parts) . ')';
+		}
 
 		// Get all selected post count related membergroups.
 		if (!empty($search_params['postgroups']) && count($search_params['postgroups']) != count($context['postgroups']))
@@ -426,9 +439,9 @@ 
 		// Construct the where part of the query.
 		$where = empty($query_parts) ? '1=1' : implode('
 			AND ', $query_parts);
+	} else {
+			$search_url_params = null;
 	}
-	else
-		$search_url_params = null;
 
 	// Construct the additional URL part with the query info in it.
 	$context['params_url'] = $context['sub_action'] == 'query' ? ';sa=query;params=' . $search_url_params : '';
@@ -551,28 +564,32 @@ 
 					'function' => function($rowData) use ($txt)
 					{
 						// Calculate number of days since last online.
-						if (empty($rowData['last_login']))
-							$difference = $txt['never'];
-						else
+						if (empty($rowData['last_login'])) {
+													$difference = $txt['never'];
+						} else
 						{
 							$num_days_difference = jeffsdatediff($rowData['last_login']);
 
 							// Today.
-							if (empty($num_days_difference))
-								$difference = $txt['viewmembers_today'];
+							if (empty($num_days_difference)) {
+															$difference = $txt['viewmembers_today'];
+							}
 
 							// Yesterday.
-							elseif ($num_days_difference == 1)
-								$difference = sprintf('1 %1$s', $txt['viewmembers_day_ago']);
+							elseif ($num_days_difference == 1) {
+															$difference = sprintf('1 %1$s', $txt['viewmembers_day_ago']);
+							}
 
 							// X days ago.
-							else
-								$difference = sprintf('%1$d %2$s', $num_days_difference, $txt['viewmembers_days_ago']);
+							else {
+															$difference = sprintf('%1$d %2$s', $num_days_difference, $txt['viewmembers_days_ago']);
+							}
 						}
 
 						// Show it in italics if they're not activated...
-						if ($rowData['is_activated'] % 10 != 1)
-							$difference = sprintf('<em title="%1$s">%2$s</em>', $txt['not_activated'], $difference);
+						if ($rowData['is_activated'] % 10 != 1) {
+													$difference = sprintf('<em title="%1$s">%2$s</em>', $txt['not_activated'], $difference);
+						}
 
 						return $difference;
 					},
@@ -624,8 +641,9 @@ 
 	);
 
 	// Without enough permissions, don't show 'delete members' checkboxes.
-	if (!allowedTo('profile_remove_any'))
-		unset($listOptions['cols']['check'], $listOptions['form'], $listOptions['additional_rows']);
+	if (!allowedTo('profile_remove_any')) {
+			unset($listOptions['cols']['check'], $listOptions['form'], $listOptions['additional_rows']);
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 	createList($listOptions);
@@ -668,17 +686,18 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['min_posts'] == -1)
-			$context['membergroups'][] = array(
+		if ($row['min_posts'] == -1) {
+					$context['membergroups'][] = array(
 				'id' => $row['id_group'],
 				'name' => $row['group_name'],
 				'can_be_additional' => true
 			);
-		else
-			$context['postgroups'][] = array(
+		} else {
+					$context['postgroups'][] = array(
 				'id' => $row['id_group'],
 				'name' => $row['group_name']
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -705,8 +724,9 @@ 
 	$context['page_title'] = $txt['admin_members'];
 	$context['sub_template'] = 'admin_browse';
 	$context['browse_type'] = isset($_REQUEST['type']) ? $_REQUEST['type'] : (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1 ? 'activate' : 'approve');
-	if (isset($context['tabs'][$context['browse_type']]))
-		$context['tabs'][$context['browse_type']]['is_selected'] = true;
+	if (isset($context['tabs'][$context['browse_type']])) {
+			$context['tabs'][$context['browse_type']]['is_selected'] = true;
+	}
 
 	// Allowed filters are those we can have, in theory.
 	$context['allowed_filters'] = $context['browse_type'] == 'approve' ? array(3, 4, 5) : array(0, 2);
@@ -717,18 +737,20 @@ 
 	foreach ($context['activation_numbers'] as $type => $amount)
 	{
 		// We have some of these...
-		if (in_array($type, $context['allowed_filters']) && $amount > 0)
-			$context['available_filters'][] = array(
+		if (in_array($type, $context['allowed_filters']) && $amount > 0) {
+					$context['available_filters'][] = array(
 				'type' => $type,
 				'amount' => $amount,
 				'desc' => isset($txt['admin_browse_filter_type_' . $type]) ? $txt['admin_browse_filter_type_' . $type] : '?',
 				'selected' => $type == $context['current_filter']
 			);
+		}
 	}
 
 	// If the filter was not sent, set it to whatever has people in it!
-	if ($context['current_filter'] == -1 && !empty($context['available_filters'][0]['amount']))
-		$context['current_filter'] = $context['available_filters'][0]['type'];
+	if ($context['current_filter'] == -1 && !empty($context['available_filters'][0]['amount'])) {
+			$context['current_filter'] = $context['available_filters'][0]['type'];
+	}
 
 	// This little variable is used to determine if we should flag where we are looking.
 	$context['show_filter'] = ($context['current_filter'] != 0 && $context['current_filter'] != 3) || count($context['available_filters']) > 1;
@@ -743,44 +765,47 @@ 
 	);
 
 	// Are we showing duplicate information?
-	if (isset($_GET['showdupes']))
-		$_SESSION['showdupes'] = (int) $_GET['showdupes'];
+	if (isset($_GET['showdupes'])) {
+			$_SESSION['showdupes'] = (int) $_GET['showdupes'];
+	}
 	$context['show_duplicates'] = !empty($_SESSION['showdupes']);
 
 	// Determine which actions we should allow on this page.
 	if ($context['browse_type'] == 'approve')
 	{
 		// If we are approving deleted accounts we have a slightly different list... actually a mirror ;)
-		if ($context['current_filter'] == 4)
-			$context['allowed_actions'] = array(
+		if ($context['current_filter'] == 4) {
+					$context['allowed_actions'] = array(
 				'reject' => $txt['admin_browse_w_approve_deletion'],
 				'ok' => $txt['admin_browse_w_reject'],
 			);
-		else
-			$context['allowed_actions'] = array(
+		} else {
+					$context['allowed_actions'] = array(
 				'ok' => $txt['admin_browse_w_approve'],
 				'okemail' => $txt['admin_browse_w_approve'] . ' ' . $txt['admin_browse_w_email'],
 				'require_activation' => $txt['admin_browse_w_approve_require_activate'],
 				'reject' => $txt['admin_browse_w_reject'],
 				'rejectemail' => $txt['admin_browse_w_reject'] . ' ' . $txt['admin_browse_w_email'],
 			);
-	}
-	elseif ($context['browse_type'] == 'activate')
-		$context['allowed_actions'] = array(
+		}
+	} elseif ($context['browse_type'] == 'activate') {
+			$context['allowed_actions'] = array(
 			'ok' => $txt['admin_browse_w_activate'],
 			'okemail' => $txt['admin_browse_w_activate'] . ' ' . $txt['admin_browse_w_email'],
 			'delete' => $txt['admin_browse_w_delete'],
 			'deleteemail' => $txt['admin_browse_w_delete'] . ' ' . $txt['admin_browse_w_email'],
 			'remind' => $txt['admin_browse_w_remind'] . ' ' . $txt['admin_browse_w_email'],
 		);
+	}
 
 	// Create an option list for actions allowed to be done with selected members.
 	$allowed_actions = '
 			<option selected value="">' . $txt['admin_browse_with_selected'] . ':</option>
 			<option value="" disabled>-----------------------------</option>';
-	foreach ($context['allowed_actions'] as $key => $desc)
-		$allowed_actions .= '
+	foreach ($context['allowed_actions'] as $key => $desc) {
+			$allowed_actions .= '
 			<option value="' . $key . '">' . $desc . '</option>';
+	}
 
 	// Setup the Javascript function for selecting an action for the list.
 	$javascript = '
@@ -792,15 +817,16 @@ 
 			var message = "";';
 
 	// We have special messages for approving deletion of accounts - it's surprisingly logical - honest.
-	if ($context['current_filter'] == 4)
-		$javascript .= '
+	if ($context['current_filter'] == 4) {
+			$javascript .= '
 			if (document.forms.postForm.todo.value.indexOf("reject") != -1)
 				message = "' . $txt['admin_browse_w_delete'] . '";
 			else
 				message = "' . $txt['admin_browse_w_reject'] . '";';
+	}
 	// Otherwise a nice standard message.
-	else
-		$javascript .= '
+	else {
+			$javascript .= '
 			if (document.forms.postForm.todo.value.indexOf("delete") != -1)
 				message = "' . $txt['admin_browse_w_delete'] . '";
 			else if (document.forms.postForm.todo.value.indexOf("reject") != -1)
@@ -809,6 +835,7 @@ 
 				message = "' . $txt['admin_browse_w_remind'] . '";
 			else
 				message = "' . ($context['browse_type'] == 'approve' ? $txt['admin_browse_w_approve'] : $txt['admin_browse_w_activate']) . '";';
+	}
 	$javascript .= '
 			if (confirm(message + " ' . $txt['admin_browse_warn'] . '"))
 				document.forms.postForm.submit();
@@ -941,10 +968,11 @@ 
 						$member_links = array();
 						foreach ($rowData['duplicate_members'] as $member)
 						{
-							if ($member['id'])
-								$member_links[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '" ' . (!empty($member['is_banned']) ? 'class="red"' : '') . '>' . $member['name'] . '</a>';
-							else
-								$member_links[] = $member['name'] . ' (' . $txt['guest'] . ')';
+							if ($member['id']) {
+															$member_links[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '" ' . (!empty($member['is_banned']) ? 'class="red"' : '') . '>' . $member['name'] . '</a>';
+							} else {
+															$member_links[] = $member['name'] . ' (' . $txt['guest'] . ')';
+							}
 						}
 						return implode(', ', $member_links);
 					},
@@ -993,14 +1021,16 @@ 
 	);
 
 	// Pick what column to actually include if we're showing duplicates.
-	if ($context['show_duplicates'])
-		unset($listOptions['columns']['email']);
-	else
-		unset($listOptions['columns']['duplicates']);
+	if ($context['show_duplicates']) {
+			unset($listOptions['columns']['email']);
+	} else {
+			unset($listOptions['columns']['duplicates']);
+	}
 
 	// Only show hostname on duplicates as it takes a lot of time.
-	if (!$context['show_duplicates'] || !empty($modSettings['disableHostnameLookup']))
-		unset($listOptions['columns']['hostname']);
+	if (!$context['show_duplicates'] || !empty($modSettings['disableHostnameLookup'])) {
+			unset($listOptions['columns']['hostname']);
+	}
 
 	// Is there any need to show filters?
 	if (isset($context['available_filters']) && count($context['available_filters']) > 1)
@@ -1008,9 +1038,10 @@ 
 		$filterOptions = '
 			<strong>' . $txt['admin_browse_filter_by'] . ':</strong>
 			<select name="filter" onchange="this.form.submit();">';
-		foreach ($context['available_filters'] as $filter)
-			$filterOptions .= '
+		foreach ($context['available_filters'] as $filter) {
+					$filterOptions .= '
 				<option value="' . $filter['type'] . '"' . ($filter['selected'] ? ' selected' : '') . '>' . $filter['desc'] . ' - ' . $filter['amount'] . ' ' . ($filter['amount'] == 1 ? $txt['user'] : $txt['users']) . '</option>';
+		}
 		$filterOptions .= '
 			</select>
 			<noscript><input type="submit" value="' . $txt['go'] . '" name="filter" class="button"></noscript>';
@@ -1022,12 +1053,13 @@ 
 	}
 
 	// What about if we only have one filter, but it's not the "standard" filter - show them what they are looking at.
-	if (!empty($context['show_filter']) && !empty($context['available_filters']))
-		$listOptions['additional_rows'][] = array(
+	if (!empty($context['show_filter']) && !empty($context['available_filters'])) {
+			$listOptions['additional_rows'][] = array(
 			'position' => 'above_column_headers',
 			'value' => '<strong>' . $txt['admin_browse_filter_show'] . ':</strong> ' . $context['available_filters'][0]['desc'],
 			'class' => 'smalltext floatright',
 		);
+	}
 
 	// Now that we have all the options, create the list.
 	require_once($sourcedir . '/Subs-List.php');
@@ -1057,12 +1089,14 @@ 
 	$current_filter = (int) $_REQUEST['orig_filter'];
 
 	// If we are applying a filter do just that - then redirect.
-	if (isset($_REQUEST['filter']) && $_REQUEST['filter'] != $_REQUEST['orig_filter'])
-		redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $_REQUEST['filter'] . ';start=' . $_REQUEST['start']);
+	if (isset($_REQUEST['filter']) && $_REQUEST['filter'] != $_REQUEST['orig_filter']) {
+			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $_REQUEST['filter'] . ';start=' . $_REQUEST['start']);
+	}
 
 	// Nothing to do?
-	if (!isset($_POST['todoAction']) && !isset($_POST['time_passed']))
-		redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	if (!isset($_POST['todoAction']) && !isset($_POST['time_passed'])) {
+			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	}
 
 	// Are we dealing with members who have been waiting for > set amount of time?
 	if (isset($_POST['time_passed']))
@@ -1075,8 +1109,9 @@ 
 	else
 	{
 		$members = array();
-		foreach ($_POST['todoAction'] as $id)
-			$members[] = (int) $id;
+		foreach ($_POST['todoAction'] as $id) {
+					$members[] = (int) $id;
+		}
 		$condition = '
 			AND id_member IN ({array_int:members})';
 	}
@@ -1097,8 +1132,9 @@ 
 	$member_count = $smcFunc['db_num_rows']($request);
 
 	// If no results then just return!
-	if ($member_count == 0)
-		redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	if ($member_count == 0) {
+			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	}
 
 	$member_info = array();
 	$members = array();
@@ -1137,8 +1173,9 @@ 
 		// Do we have to let the integration code know about the activations?
 		if (!empty($modSettings['integrate_activate']))
 		{
-			foreach ($member_info as $member)
-				call_integration_hook('integrate_activate', array($member['username']));
+			foreach ($member_info as $member) {
+							call_integration_hook('integrate_activate', array($member['username']));
+			}
 		}
 
 		// Check for email.
@@ -1268,20 +1305,23 @@ 
 		$log_action = $_POST['todo'] == 'remind' ? 'remind_member' : 'approve_member';
 
 		require_once($sourcedir . '/Logging.php');
-		foreach ($member_info as $member)
-			logAction($log_action, array('member' => $member['id']), 'admin');
+		foreach ($member_info as $member) {
+					logAction($log_action, array('member' => $member['id']), 'admin');
+		}
 	}
 
 	// Although updateStats *may* catch this, best to do it manually just in case (Doesn't always sort out unapprovedMembers).
-	if (in_array($current_filter, array(3, 4, 5)))
-		updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > $member_count ? $modSettings['unapprovedMembers'] - $member_count : 0)));
+	if (in_array($current_filter, array(3, 4, 5))) {
+			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > $member_count ? $modSettings['unapprovedMembers'] - $member_count : 0)));
+	}
 
 	// Update the member's stats. (but, we know the member didn't change their name.)
 	updateStats('member', false);
 
 	// If they haven't been deleted, update the post group statistics on them...
-	if (!in_array($_POST['todo'], array('delete', 'deleteemail', 'reject', 'rejectemail', 'remind')))
-		updateStats('postgroups', $members);
+	if (!in_array($_POST['todo'], array('delete', 'deleteemail', 'reject', 'rejectemail', 'remind'))) {
+			updateStats('postgroups', $members);
+	}
 
 	redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
 }
@@ -1306,10 +1346,11 @@ 
 	$dis = time() - $old;
 
 	// Before midnight?
-	if ($dis < $sinceMidnight)
-		return 0;
-	else
-		$dis -= $sinceMidnight;
+	if ($dis < $sinceMidnight) {
+			return 0;
+	} else {
+			$dis -= $sinceMidnight;
+	}
 
 	// Divide out the seconds in a day to get the number of days.
 	return ceil($dis / (24 * 60 * 60));

Packages/index.php

Braces +2 added lines, -1 removed lines

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

cron.php

Braces +36 added lines, -28 removed lines

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

Sources/ShowAttachments.php

Braces +59 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Downloads an avatar or attachment based on $_GET['attach'], and increments the download count.
@@ -40,11 +41,11 @@ 
 
 	if (!empty($modSettings['enableCompressedOutput']) && !headers_sent() && ob_get_length() == 0)
 	{
-		if (@ini_get('zlib.output_compression') == '1' || @ini_get('output_handler') == 'ob_gzhandler')
-			$modSettings['enableCompressedOutput'] = 0;
-
-		else
-			ob_start('ob_gzhandler');
+		if (@ini_get('zlib.output_compression') == '1' || @ini_get('output_handler') == 'ob_gzhandler') {
+					$modSettings['enableCompressedOutput'] = 0;
+		} else {
+					ob_start('ob_gzhandler');
+		}
 	}
 
 	if (empty($modSettings['enableCompressedOutput']))
@@ -76,8 +77,9 @@ 
 	}
 
 	// Use cache when possible.
-	if (($cache = cache_get_data('attachment_lookup_id-' . $attachId)) != null)
-		list($file, $thumbFile) = $cache;
+	if (($cache = cache_get_data('attachment_lookup_id-' . $attachId)) != null) {
+			list($file, $thumbFile) = $cache;
+	}
 
 	// Get the info from the DB.
 	if (empty($file) || empty($thumbFile) && !empty($file['id_thumb']))
@@ -85,10 +87,9 @@ 
 		// Do we have a hook wanting to use our attachment system? We use $attachRequest to prevent accidental usage of $request.
 		$attachRequest = null;
 		call_integration_hook('integrate_download_request', array(&$attachRequest));
-		if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest))
-			$request = $attachRequest;
-
-		else
+		if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest)) {
+					$request = $attachRequest;
+		} else
 		{
 			// Make sure this attachment is on this board and load its info while we are at it.
 			$request = $smcFunc['db_query']('', '
@@ -181,13 +182,15 @@ 
 		}
 
 		// Cache it.
-		if (!empty($file) || !empty($thumbFile))
-			cache_put_data('attachment_lookup_id-' . $file['id_attach'], array($file, $thumbFile), mt_rand(850, 900));
+		if (!empty($file) || !empty($thumbFile)) {
+					cache_put_data('attachment_lookup_id-' . $file['id_attach'], array($file, $thumbFile), mt_rand(850, 900));
+		}
 	}
 
 	// Replace the normal file with its thumbnail if it has one!
-	if (!empty($showThumb) && !empty($thumbFile))
-		$file = $thumbFile;
+	if (!empty($showThumb) && !empty($thumbFile)) {
+			$file = $thumbFile;
+	}
 
 	// No point in a nicer message, because this is supposed to be an attachment anyway...
 	if (!file_exists($file['filePath']))
@@ -237,8 +240,8 @@ 
 	}
 
 	// Update the download counter (unless it's a thumbnail or resuming an incomplete download).
-	if ($file['attachment_type'] != 3 && empty($showThumb) && $range === 0)
-		$smcFunc['db_query']('', '
+	if ($file['attachment_type'] != 3 && empty($showThumb) && $range === 0) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}attachments
 			SET downloads = downloads + 1
 			WHERE id_attach = {int:id_attach}',
@@ -246,12 +249,14 @@ 
 				'id_attach' => $attachId,
 			)
 		);
+	}
 
 	// Send the attachment headers.
 	header('pragma: ');
 
-	if (!isBrowser('gecko'))
-		header('content-transfer-encoding: binary');
+	if (!isBrowser('gecko')) {
+			header('content-transfer-encoding: binary');
+	}
 
 	header('expires: ' . gmdate('D, d M Y H:i:s', time() + 525600 * 60) . ' GMT');
 	header('last-modified: ' . gmdate('D, d M Y H:i:s', filemtime($file['filePath'])) . ' GMT');
@@ -260,18 +265,19 @@ 
 	header('etag: ' . $eTag);
 
 	// Make sure the mime type warrants an inline display.
-	if (isset($_REQUEST['image']) && !empty($file['mime_type']) && strpos($file['mime_type'], 'image/') !== 0)
-		unset($_REQUEST['image']);
+	if (isset($_REQUEST['image']) && !empty($file['mime_type']) && strpos($file['mime_type'], 'image/') !== 0) {
+			unset($_REQUEST['image']);
+	}
 
 	// Does this have a mime type?
-	elseif (!empty($file['mime_type']) && (isset($_REQUEST['image']) || !in_array($file['fileext'], array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff'))))
-		header('content-type: ' . strtr($file['mime_type'], array('image/bmp' => 'image/x-ms-bmp')));
-
-	else
+	elseif (!empty($file['mime_type']) && (isset($_REQUEST['image']) || !in_array($file['fileext'], array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff')))) {
+			header('content-type: ' . strtr($file['mime_type'], array('image/bmp' => 'image/x-ms-bmp')));
+	} else
 	{
 		header('content-type: ' . (isBrowser('ie') || isBrowser('opera') ? 'application/octetstream' : 'application/octet-stream'));
-		if (isset($_REQUEST['image']))
-			unset($_REQUEST['image']);
+		if (isset($_REQUEST['image'])) {
+					unset($_REQUEST['image']);
+		}
 	}
 
 	// Convert the file to UTF-8, cuz most browsers dig that.
@@ -279,24 +285,22 @@ 
 	$disposition = !isset($_REQUEST['image']) ? 'attachment' : 'inline';
 
 	// Different browsers like different standards...
-	if (isBrowser('firefox'))
-		header('content-disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
-
-	elseif (isBrowser('opera'))
-		header('content-disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
-
-	elseif (isBrowser('ie'))
-		header('content-disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
-
-	else
-		header('content-disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	if (isBrowser('firefox')) {
+			header('content-disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
+	} elseif (isBrowser('opera')) {
+			header('content-disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
+	} elseif (isBrowser('ie')) {
+			header('content-disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
+	} else {
+			header('content-disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	}
 
 	// If this has an "image extension" - but isn't actually an image - then ensure it isn't cached cause of silly IE.
-	if (!isset($_REQUEST['image']) && in_array($file['fileext'], array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff')))
-		header('cache-control: no-cache');
-
-	else
-		header('cache-control: max-age=' . (525600 * 60) . ', private');
+	if (!isset($_REQUEST['image']) && in_array($file['fileext'], array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff'))) {
+			header('cache-control: no-cache');
+	} else {
+			header('cache-control: max-age=' . (525600 * 60) . ', private');
+	}
 
 	// Multipart and resuming support
 	if (isset($_SERVER['HTTP_RANGE']))
@@ -304,9 +308,9 @@ 
 		header("HTTP/1.1 206 Partial Content");
 		header("content-length: $new_length");
 		header("content-range: bytes $range-$range_end/$size");
+	} else {
+			header("content-length: " . $size);
 	}
-	else
-		header("content-length: " . $size);
 
 
 	// Try to buy some time...
@@ -315,8 +319,9 @@ 
 	// For multipart/resumable downloads, send the requested chunk(s) of the file
 	if (isset($_SERVER['HTTP_RANGE']))
 	{
-		while (@ob_get_level() > 0)
-			@ob_end_clean();
+		while (@ob_get_level() > 0) {
+					@ob_end_clean();
+		}
 
 		// 40 kilobytes is a good-ish amount
 		$chunksize = 40 * 1024;
@@ -340,8 +345,9 @@ 
 	elseif ($size > 4194304)
 	{
 		// Forcibly end any output buffering going on.
-		while (@ob_get_level() > 0)
-			@ob_end_clean();
+		while (@ob_get_level() > 0) {
+					@ob_end_clean();
+		}
 
 		$fp = fopen($file['filePath'], 'rb');
 		while (!feof($fp))
@@ -353,8 +359,9 @@ 
 	}
 
 	// On some of the less-bright hosts, readfile() is disabled.  It's just a faster, more byte safe, version of what's in the if.
-	elseif (@readfile($file['filePath']) === null)
-		echo file_get_contents($file['filePath']);
+	elseif (@readfile($file['filePath']) === null) {
+			echo file_get_contents($file['filePath']);
+	}
 
 	die();
 }

Sources/Subscriptions-PayPal.php

Braces +83 added lines, -61 removed lines

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

Sources/News.php

Braces +226 added lines, -185 removed lines

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

Sources/Subs-Graphics.php

Braces +240 added lines, -195 removed lines

@@ -18,8 +18,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * downloads a file from a url and stores it locally for avatar use by id_member.
@@ -44,8 +45,9 @@ 
 	$destName = 'avatar_' . $memID . '_' . time() . '.' . $ext;
 
 	// Just making sure there is a non-zero member.
-	if (empty($memID))
-		return false;
+	if (empty($memID)) {
+			return false;
+	}
 
 	require_once($sourcedir . '/ManageAttachments.php');
 	removeAttachments(array('id_member' => $memID));
@@ -76,10 +78,11 @@ 
 	$destName = $modSettings['custom_avatar_dir'] . '/' . $destName . '.tmp';
 
 	// Resize it.
-	if (!empty($modSettings['avatar_download_png']))
-		$success = resizeImageFile($url, $destName, $max_width, $max_height, 3);
-	else
-		$success = resizeImageFile($url, $destName, $max_width, $max_height);
+	if (!empty($modSettings['avatar_download_png'])) {
+			$success = resizeImageFile($url, $destName, $max_width, $max_height, 3);
+	} else {
+			$success = resizeImageFile($url, $destName, $max_width, $max_height);
+	}
 
 	// Remove the .tmp extension.
 	$destName = substr($destName, 0, -4);
@@ -108,11 +111,10 @@ 
 				)
 			);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}attachments
@@ -144,17 +146,18 @@ 
 	$destName = $source . '_thumb.tmp';
 
 	// Do the actual resize.
-	if (!empty($modSettings['attachment_thumb_png']))
-		$success = resizeImageFile($source, $destName, $max_width, $max_height, 3);
-	else
-		$success = resizeImageFile($source, $destName, $max_width, $max_height);
+	if (!empty($modSettings['attachment_thumb_png'])) {
+			$success = resizeImageFile($source, $destName, $max_width, $max_height, 3);
+	} else {
+			$success = resizeImageFile($source, $destName, $max_width, $max_height);
+	}
 
 	// Okay, we're done with the temporary stuff.
 	$destName = substr($destName, 0, -4);
 
-	if ($success && @rename($destName . '.tmp', $destName))
-		return true;
-	else
+	if ($success && @rename($destName . '.tmp', $destName)) {
+			return true;
+	} else
 	{
 		@unlink($destName . '.tmp');
 		@touch($destName);
@@ -176,18 +179,21 @@ 
 {
 	if (!resizeImageFile($fileName, $fileName . '.tmp', null, null, $preferred_format))
 	{
-		if (file_exists($fileName . '.tmp'))
-			unlink($fileName . '.tmp');
+		if (file_exists($fileName . '.tmp')) {
+					unlink($fileName . '.tmp');
+		}
 
 		return false;
 	}
 
-	if (!unlink($fileName))
-		return false;
+	if (!unlink($fileName)) {
+			return false;
+	}
 
-	if (!rename($fileName . '.tmp', $fileName))
-		return false;
-}
+	if (!rename($fileName . '.tmp', $fileName)) {
+			return false;
+	}
+	}
 
 /**
  * Searches through the file to see if there's potentially harmful non-binary content.
@@ -200,8 +206,9 @@ 
 function checkImageContents($fileName, $extensiveCheck = false)
 {
 	$fp = fopen($fileName, 'rb');
-	if (!$fp)
-		fatal_lang_error('attach_timeout');
+	if (!$fp) {
+			fatal_lang_error('attach_timeout');
+	}
 
 	$prev_chunk = '';
 	while (!feof($fp))
@@ -218,8 +225,7 @@ 
 				fclose($fp);
 				return false;
 			}
-		}
-		else
+		} else
 		{
 			// Check for potential infection - focus on clues for inline php & flash.
 			// Will result in significantly fewer false positives than the paranoid check.
@@ -247,8 +253,9 @@ 
 	global $gd2;
 
 	// Check to see if GD is installed and what version.
-	if (($extensionFunctions = get_extension_funcs('gd')) === false)
-		return false;
+	if (($extensionFunctions = get_extension_funcs('gd')) === false) {
+			return false;
+	}
 
 	// Also determine if GD2 is installed and store it in a global.
 	$gd2 = in_array('imagecreatetruecolor', $extensionFunctions) && function_exists('imagecreatetruecolor');
@@ -320,8 +327,9 @@ 
 	global $sourcedir;
 
 	// Nothing to do without GD or IM/MW
-	if (!checkGD() && !checkImagick() && !checkMagickWand())
-		return false;
+	if (!checkGD() && !checkImagick() && !checkMagickWand()) {
+			return false;
+	}
 
 	static $default_formats = array(
 		'1' => 'gif',
@@ -343,38 +351,39 @@ 
 		fclose($fp_destination);
 
 		$sizes = @getimagesize($destination);
-	}
-	elseif ($fp_destination)
+	} elseif ($fp_destination)
 	{
 		$sizes = @getimagesize($source);
 
 		$fp_source = fopen($source, 'rb');
 		if ($fp_source !== false)
 		{
-			while (!feof($fp_source))
-				fwrite($fp_destination, fread($fp_source, 8192));
+			while (!feof($fp_source)) {
+							fwrite($fp_destination, fread($fp_source, 8192));
+			}
 			fclose($fp_source);
+		} else {
+					$sizes = array(-1, -1, -1);
 		}
-		else
-			$sizes = array(-1, -1, -1);
 		fclose($fp_destination);
 	}
 	// We can't get to the file.
-	else
-		$sizes = array(-1, -1, -1);
+	else {
+			$sizes = array(-1, -1, -1);
+	}
 
 	// See if we have -or- can get the needed memory for this operation
 	// ImageMagick isn't subject to PHP's memory limits :)
-	if (!(checkIMagick() || checkMagickWand()) && checkGD() && !imageMemoryCheck($sizes))
-		return false;
+	if (!(checkIMagick() || checkMagickWand()) && checkGD() && !imageMemoryCheck($sizes)) {
+			return false;
+	}
 
 	// A known and supported format?
 	// @todo test PSD and gif.
 	if ((checkImagick() || checkMagickWand()) && isset($default_formats[$sizes[2]]))
 	{
 		return resizeImage(null, $destination, null, null, $max_width, $max_height, true, $preferred_format);
-	}
-	elseif (checkGD() && isset($default_formats[$sizes[2]]) && function_exists('imagecreatefrom' . $default_formats[$sizes[2]]))
+	} elseif (checkGD() && isset($default_formats[$sizes[2]]) && function_exists('imagecreatefrom' . $default_formats[$sizes[2]]))
 	{
 		$imagecreatefrom = 'imagecreatefrom' . $default_formats[$sizes[2]];
 		if ($src_img = @$imagecreatefrom($destination))
@@ -427,14 +436,14 @@ 
 			$dest_width = empty($max_width) ? $src_width : $max_width;
 			$dest_height = empty($max_height) ? $src_height : $max_height;
 
-			if ($default_formats[$preferred_format] == 'jpeg')
-				$imagick->setCompressionQuality(!empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			if ($default_formats[$preferred_format] == 'jpeg') {
+							$imagick->setCompressionQuality(!empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			}
 
 			$imagick->setImageFormat($default_formats[$preferred_format]);
 			$imagick->resizeImage($dest_width, $dest_height, Imagick::FILTER_LANCZOS, 1, true);
 			$success = $imagick->writeImage($destName);
-		}
-		else
+		} else
 		{
 			$magick_wand = newMagickWand();
 			MagickReadImage($magick_wand, $destName);
@@ -443,8 +452,9 @@ 
 			$dest_width = empty($max_width) ? $src_width : $max_width;
 			$dest_height = empty($max_height) ? $src_height : $max_height;
 
-			if ($default_formats[$preferred_format] == 'jpeg')
-				MagickSetCompressionQuality($magick_wand, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			if ($default_formats[$preferred_format] == 'jpeg') {
+							MagickSetCompressionQuality($magick_wand, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			}
 
 			MagickSetImageFormat($magick_wand, $default_formats[$preferred_format]);
 			MagickResizeImage($magick_wand, $dest_width, $dest_height, MW_LanczosFilter, 1, true);
@@ -452,8 +462,7 @@ 
 		}
 
 		return !empty($success);
-	}
-	elseif (checkGD())
+	} elseif (checkGD())
 	{
 		$success = false;
 
@@ -464,8 +473,7 @@ 
 			{
 				$dst_width = $max_width;
 				$dst_height = round($src_height * $max_width / $src_width);
-			}
-			elseif (!empty($max_height))
+			} elseif (!empty($max_height))
 			{
 				$dst_width = round($src_width * $max_height / $src_height);
 				$dst_height = $max_height;
@@ -483,44 +491,48 @@ 
 					if ((!empty($preferred_format)) && ($preferred_format == 3))
 					{
 						imagealphablending($dst_img, false);
-						if (function_exists('imagesavealpha'))
-							imagesavealpha($dst_img, true);
+						if (function_exists('imagesavealpha')) {
+													imagesavealpha($dst_img, true);
+						}
 					}
+				} else {
+									$dst_img = imagecreate($dst_width, $dst_height);
 				}
-				else
-					$dst_img = imagecreate($dst_width, $dst_height);
 
 				// Resize it!
-				if ($gd2)
-					imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
-				else
-					imagecopyresamplebicubic($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
+				if ($gd2) {
+									imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
+				} else {
+									imagecopyresamplebicubic($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
+				}
+			} else {
+							$dst_img = $src_img;
 			}
-			else
-				$dst_img = $src_img;
+		} else {
+					$dst_img = $src_img;
 		}
-		else
-			$dst_img = $src_img;
 
 		// Save the image as ...
-		if (!empty($preferred_format) && ($preferred_format == 3) && function_exists('imagepng'))
-			$success = imagepng($dst_img, $destName);
-		elseif (!empty($preferred_format) && ($preferred_format == 1) && function_exists('imagegif'))
-			$success = imagegif($dst_img, $destName);
-		elseif (function_exists('imagejpeg'))
-			$success = imagejpeg($dst_img, $destName, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+		if (!empty($preferred_format) && ($preferred_format == 3) && function_exists('imagepng')) {
+					$success = imagepng($dst_img, $destName);
+		} elseif (!empty($preferred_format) && ($preferred_format == 1) && function_exists('imagegif')) {
+					$success = imagegif($dst_img, $destName);
+		} elseif (function_exists('imagejpeg')) {
+					$success = imagejpeg($dst_img, $destName, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+		}
 
 		// Free the memory.
 		imagedestroy($src_img);
-		if ($dst_img != $src_img)
-			imagedestroy($dst_img);
+		if ($dst_img != $src_img) {
+					imagedestroy($dst_img);
+		}
 
 		return $success;
-	}
-	else
-		// Without GD, no image resizing at all.
+	} else {
+			// Without GD, no image resizing at all.
 		return false;
-}
+	}
+	}
 
 /**
  * Copy image.
@@ -574,8 +586,9 @@ 
 			$color = imagecolorresolve($dst_img, $red, $green, $blue);
 			if ($color == -1)
 			{
-				if ($palsize++ < 256)
-					imagecolorallocate($dst_img, $red, $green, $blue);
+				if ($palsize++ < 256) {
+									imagecolorallocate($dst_img, $red, $green, $blue);
+				}
 				$color = imagecolorclosest($dst_img, $red, $green, $blue);
 			}
 
@@ -605,13 +618,15 @@ 
 		$header = unpack('vtype/Vsize/Vreserved/Voffset', fread($fp, 14));
 		$info = unpack('Vsize/Vwidth/Vheight/vplanes/vbits/Vcompression/Vimagesize/Vxres/Vyres/Vncolor/Vcolorimportant', fread($fp, 40));
 
-		if ($header['type'] != 0x4D42)
-			return false;
+		if ($header['type'] != 0x4D42) {
+					return false;
+		}
 
-		if ($gd2)
-			$dst_img = imagecreatetruecolor($info['width'], $info['height']);
-		else
-			$dst_img = imagecreate($info['width'], $info['height']);
+		if ($gd2) {
+					$dst_img = imagecreatetruecolor($info['width'], $info['height']);
+		} else {
+					$dst_img = imagecreate($info['width'], $info['height']);
+		}
 
 		$palette_size = $header['offset'] - 54;
 		$info['ncolor'] = $palette_size / 4;
@@ -637,8 +652,9 @@ 
 			fseek($fp, $header['offset'] + ($scan_line_size + $scan_line_align) * $l);
 			$scan_line = fread($fp, $scan_line_size);
 
-			if (strlen($scan_line) < $scan_line_size)
-				continue;
+			if (strlen($scan_line) < $scan_line_size) {
+							continue;
+			}
 
 			if ($info['bits'] == 32)
 			{
@@ -656,14 +672,14 @@ 
 						$color = imagecolorallocate($dst_img, $r, $g, $b);
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
-						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						if ($color == -1) {
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
 				}
-			}
-			elseif ($info['bits'] == 24)
+			} elseif ($info['bits'] == 24)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -678,14 +694,14 @@ 
 						$color = imagecolorallocate($dst_img, $r, $g, $b);
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
-						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						if ($color == -1) {
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
 				}
-			}
-			elseif ($info['bits'] == 16)
+			} elseif ($info['bits'] == 16)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -706,20 +722,20 @@ 
 						$color = imagecolorallocate($dst_img, $r, $g, $b);
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
-						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						if ($color == -1) {
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
 				}
-			}
-			elseif ($info['bits'] == 8)
+			} elseif ($info['bits'] == 8)
 			{
 				$x = 0;
-				for ($j = 0; $j < $scan_line_size; $x++)
-					imagesetpixel($dst_img, $x, $y, $palette[ord($scan_line{$j++})]);
-			}
-			elseif ($info['bits'] == 4)
+				for ($j = 0; $j < $scan_line_size; $x++) {
+									imagesetpixel($dst_img, $x, $y, $palette[ord($scan_line{$j++})]);
+				}
+			} elseif ($info['bits'] == 4)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -727,11 +743,11 @@ 
 					$byte = ord($scan_line{$j++});
 
 					imagesetpixel($dst_img, $x, $y, $palette[(int) ($byte / 16)]);
-					if (++$x < $info['width'])
-						imagesetpixel($dst_img, $x, $y, $palette[$byte & 15]);
+					if (++$x < $info['width']) {
+											imagesetpixel($dst_img, $x, $y, $palette[$byte & 15]);
+					}
 				}
-			}
-			elseif ($info['bits'] == 1)
+			} elseif ($info['bits'] == 1)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -740,7 +756,9 @@ 
 
 					imagesetpixel($dst_img, $x, $y, $palette[(($byte) & 128) != 0]);
 					for ($shift = 1; $shift < 8; $shift++) {
-						if (++$x < $info['width']) imagesetpixel($dst_img, $x, $y, $palette[(($byte << $shift) & 128) != 0]);
+						if (++$x < $info['width']) {
+							imagesetpixel($dst_img, $x, $y, $palette[(($byte << $shift) & 128) != 0]);
+						}
 					}
 				}
 			}
@@ -764,15 +782,18 @@ 
  */
 function gif_outputAsPng($gif, $lpszFileName, $background_color = -1)
 {
-	if (!isset($gif) || @get_class($gif) != 'cgif' || !$gif->loaded || $lpszFileName == '')
-		return false;
+	if (!isset($gif) || @get_class($gif) != 'cgif' || !$gif->loaded || $lpszFileName == '') {
+			return false;
+	}
 
 	$fd = $gif->get_png_data($background_color);
-	if (strlen($fd) <= 0)
-		return false;
+	if (strlen($fd) <= 0) {
+			return false;
+	}
 
-	if (!($fh = @fopen($lpszFileName, 'wb')))
-		return false;
+	if (!($fh = @fopen($lpszFileName, 'wb'))) {
+			return false;
+	}
 
 	@fwrite($fh, $fd, strlen($fd));
 	@fflush($fh);
@@ -799,8 +820,9 @@ 
 	// What type are we going to be doing?
 	$imageType = $modSettings['visual_verification_type'];
 	// Special case to allow the admin center to show samples.
-	if ($user_info['is_admin'] && isset($_GET['type']))
-		$imageType = (int) $_GET['type'];
+	if ($user_info['is_admin'] && isset($_GET['type'])) {
+			$imageType = (int) $_GET['type'];
+	}
 
 	// Some quick references for what we do.
 	// Do we show no, low or high noise?
@@ -834,25 +856,28 @@ 
 	$character_spacing = 1;
 
 	// What color is the background - generally white unless we're on "hard".
-	if ($simpleBGColor)
-		$background_color = array(255, 255, 255);
-	else
-		$background_color = isset($settings['verification_background']) ? $settings['verification_background'] : array(236, 237, 243);
+	if ($simpleBGColor) {
+			$background_color = array(255, 255, 255);
+	} else {
+			$background_color = isset($settings['verification_background']) ? $settings['verification_background'] : array(236, 237, 243);
+	}
 
 	// The color of the characters shown (red, green, blue).
-	if ($simpleFGColor)
-		$foreground_color = array(0, 0, 0);
-	else
+	if ($simpleFGColor) {
+			$foreground_color = array(0, 0, 0);
+	} else
 	{
 		$foreground_color = array(64, 101, 136);
 
 		// Has the theme author requested a custom color?
-		if (isset($settings['verification_foreground']))
-			$foreground_color = $settings['verification_foreground'];
+		if (isset($settings['verification_foreground'])) {
+					$foreground_color = $settings['verification_foreground'];
+		}
 	}
 
-	if (!is_dir($settings['default_theme_dir'] . '/fonts'))
-		return false;
+	if (!is_dir($settings['default_theme_dir'] . '/fonts')) {
+			return false;
+	}
 
 	// Get a list of the available fonts.
 	$font_dir = dir($settings['default_theme_dir'] . '/fonts');
@@ -863,25 +888,28 @@ 
 	{
 		if (preg_match('~^(.+)\.gdf$~', $entry, $matches) === 1)
 		{
-			if ($endian ^ (strpos($entry, '_end.gdf') === false))
-				$font_list[] = $entry;
+			if ($endian ^ (strpos($entry, '_end.gdf') === false)) {
+							$font_list[] = $entry;
+			}
+		} elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1) {
+					$ttfont_list[] = $entry;
 		}
-		elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1)
-			$ttfont_list[] = $entry;
 	}
 
-	if (empty($font_list))
-		return false;
+	if (empty($font_list)) {
+			return false;
+	}
 
 	// For non-hard things don't even change fonts.
 	if (!$varyFonts)
 	{
 		$font_list = array($font_list[0]);
 		// Try use Screenge if we can - it looks good!
-		if (in_array('AnonymousPro.ttf', $ttfont_list))
-			$ttfont_list = array('AnonymousPro.ttf');
-		else
-			$ttfont_list = empty($ttfont_list) ? array() : array($ttfont_list[0]);
+		if (in_array('AnonymousPro.ttf', $ttfont_list)) {
+					$ttfont_list = array('AnonymousPro.ttf');
+		} else {
+					$ttfont_list = empty($ttfont_list) ? array() : array($ttfont_list[0]);
+		}
 
 	}
 
@@ -899,14 +927,16 @@ 
 	}
 
 	// Load all fonts and determine the maximum font height.
-	foreach ($loaded_fonts as $font_index => $dummy)
-		$loaded_fonts[$font_index] = imageloadfont($settings['default_theme_dir'] . '/fonts/' . $font_list[$font_index]);
+	foreach ($loaded_fonts as $font_index => $dummy) {
+			$loaded_fonts[$font_index] = imageloadfont($settings['default_theme_dir'] . '/fonts/' . $font_list[$font_index]);
+	}
 
 	// Determine the dimensions of each character.
-	if ($imageType == 4 || $imageType == 5)
-		$extra = 80;
-	else
-		$extra = 45;
+	if ($imageType == 4 || $imageType == 5) {
+			$extra = 80;
+	} else {
+			$extra = 45;
+	}
 
 	$total_width = $character_spacing * strlen($code) + $extra;
 	$max_height = 0;
@@ -927,13 +957,15 @@ 
 	imagefilledrectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $bg_color);
 
 	// Randomize the foreground color a little.
-	for ($i = 0; $i < 3; $i++)
-		$foreground_color[$i] = mt_rand(max($foreground_color[$i] - 3, 0), min($foreground_color[$i] + 3, 255));
+	for ($i = 0; $i < 3; $i++) {
+			$foreground_color[$i] = mt_rand(max($foreground_color[$i] - 3, 0), min($foreground_color[$i] + 3, 255));
+	}
 	$fg_color = imagecolorallocate($code_image, $foreground_color[0], $foreground_color[1], $foreground_color[2]);
 
 	// Color for the dots.
-	for ($i = 0; $i < 3; $i++)
-		$dotbgcolor[$i] = $background_color[$i] < $foreground_color[$i] ? mt_rand(0, max($foreground_color[$i] - 20, 0)) : mt_rand(min($foreground_color[$i] + 20, 255), 255);
+	for ($i = 0; $i < 3; $i++) {
+			$dotbgcolor[$i] = $background_color[$i] < $foreground_color[$i] ? mt_rand(0, max($foreground_color[$i] - 20, 0)) : mt_rand(min($foreground_color[$i] + 20, 255), 255);
+	}
 	$randomness_color = imagecolorallocate($code_image, $dotbgcolor[0], $dotbgcolor[1], $dotbgcolor[2]);
 
 	// Some squares/rectanges for new extreme level
@@ -959,10 +991,11 @@ 
 			$can_do_ttf = function_exists('imagettftext');
 
 			// How much rotation will we give?
-			if ($rotationType == 'none')
-				$angle = 0;
-			else
-				$angle = mt_rand(-100, 100) / ($rotationType == 'high' ? 6 : 10);
+			if ($rotationType == 'none') {
+							$angle = 0;
+			} else {
+							$angle = mt_rand(-100, 100) / ($rotationType == 'high' ? 6 : 10);
+			}
 
 			// What color shall we do it?
 			if ($fontColorType == 'cyclic')
@@ -976,51 +1009,56 @@ 
 					array(0, 0, 0),
 					array(143, 39, 31),
 				);
-				if (!isset($last_index))
-					$last_index = -1;
+				if (!isset($last_index)) {
+									$last_index = -1;
+				}
 				$new_index = $last_index;
-				while ($last_index == $new_index)
-					$new_index = mt_rand(0, count($colors) - 1);
+				while ($last_index == $new_index) {
+									$new_index = mt_rand(0, count($colors) - 1);
+				}
 				$char_fg_color = $colors[$new_index];
 				$last_index = $new_index;
+			} elseif ($fontColorType == 'random') {
+							$char_fg_color = array(mt_rand(max($foreground_color[0] - 2, 0), $foreground_color[0]), mt_rand(max($foreground_color[1] - 2, 0), $foreground_color[1]), mt_rand(max($foreground_color[2] - 2, 0), $foreground_color[2]));
+			} else {
+							$char_fg_color = array($foreground_color[0], $foreground_color[1], $foreground_color[2]);
 			}
-			elseif ($fontColorType == 'random')
-				$char_fg_color = array(mt_rand(max($foreground_color[0] - 2, 0), $foreground_color[0]), mt_rand(max($foreground_color[1] - 2, 0), $foreground_color[1]), mt_rand(max($foreground_color[2] - 2, 0), $foreground_color[2]));
-			else
-				$char_fg_color = array($foreground_color[0], $foreground_color[1], $foreground_color[2]);
 
 			if (!empty($can_do_ttf))
 			{
 				// GD2 handles font size differently.
-				if ($fontSizeRandom)
-					$font_size = $gd2 ? mt_rand(17, 19) : mt_rand(18, 25);
-				else
-					$font_size = $gd2 ? 18 : 24;
+				if ($fontSizeRandom) {
+									$font_size = $gd2 ? mt_rand(17, 19) : mt_rand(18, 25);
+				} else {
+									$font_size = $gd2 ? 18 : 24;
+				}
 
 				// Work out the sizes - also fix the character width cause TTF not quite so wide!
 				$font_x = $fontHorSpace == 'minus' && $cur_x > 0 ? $cur_x - 3 : $cur_x + 5;
 				$font_y = $max_height - ($fontVerPos == 'vrandom' ? mt_rand(2, 8) : ($fontVerPos == 'random' ? mt_rand(3, 5) : 5));
 
 				// What font face?
-				if (!empty($ttfont_list))
-					$fontface = $settings['default_theme_dir'] . '/fonts/' . $ttfont_list[mt_rand(0, count($ttfont_list) - 1)];
+				if (!empty($ttfont_list)) {
+									$fontface = $settings['default_theme_dir'] . '/fonts/' . $ttfont_list[mt_rand(0, count($ttfont_list) - 1)];
+				}
 
 				// What color are we to do it in?
 				$is_reverse = $showReverseChars ? mt_rand(0, 1) : false;
 				$char_color = function_exists('imagecolorallocatealpha') && $fontTrans ? imagecolorallocatealpha($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2], 50) : imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2]);
 
 				$fontcord = @imagettftext($code_image, $font_size, $angle, $font_x, $font_y, $char_color, $fontface, $character['id']);
-				if (empty($fontcord))
-					$can_do_ttf = false;
-				elseif ($is_reverse)
+				if (empty($fontcord)) {
+									$can_do_ttf = false;
+				} elseif ($is_reverse)
 				{
 					imagefilledpolygon($code_image, $fontcord, 4, $fg_color);
 					// Put the character back!
 					imagettftext($code_image, $font_size, $angle, $font_x, $font_y, $randomness_color, $fontface, $character['id']);
 				}
 
-				if ($can_do_ttf)
-					$cur_x = max($fontcord[2], $fontcord[4]) + ($angle == 0 ? 0 : 3);
+				if ($can_do_ttf) {
+									$cur_x = max($fontcord[2], $fontcord[4]) + ($angle == 0 ? 0 : 3);
+				}
 			}
 
 			if (!$can_do_ttf)
@@ -1039,8 +1077,9 @@ 
 				}
 
 				// Sorry, no rotation available.
-				else
-					imagechar($code_image, $loaded_fonts[$character['font']], $cur_x, floor(($max_height - $character['height']) / 2), $character['id'], imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2]));
+				else {
+									imagechar($code_image, $loaded_fonts[$character['font']], $cur_x, floor(($max_height - $character['height']) / 2), $character['id'], imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2]));
+				}
 				$cur_x += $character['width'] + $character_spacing;
 			}
 		}
@@ -1053,17 +1092,22 @@ 
 	}
 
 	// Make the background color transparent on the hard image.
-	if (!$simpleBGColor)
-		imagecolortransparent($code_image, $bg_color);
-	if ($hasBorder)
-		imagerectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $fg_color);
+	if (!$simpleBGColor) {
+			imagecolortransparent($code_image, $bg_color);
+	}
+	if ($hasBorder) {
+			imagerectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $fg_color);
+	}
 
 	// Add some noise to the background?
 	if ($noiseType != 'none')
 	{
-		for ($i = mt_rand(0, 2); $i < $max_height; $i += mt_rand(1, 2))
-			for ($j = mt_rand(0, 10); $j < $total_width; $j += mt_rand(1, 10))
-				imagesetpixel($code_image, $j, $i, mt_rand(0, 1) ? $fg_color : $randomness_color);
+		for ($i = mt_rand(0, 2); $i < $max_height; $i += mt_rand(1, 2)) {
+					for ($j = mt_rand(0, 10);
+		}
+		$j < $total_width; $j += mt_rand(1, 10)) {
+							imagesetpixel($code_image, $j, $i, mt_rand(0, 1) ? $fg_color : $randomness_color);
+			}
 
 		// Put in some lines too?
 		if ($noiseType != 'extreme')
@@ -1076,8 +1120,7 @@ 
 					$x1 = mt_rand(0, $total_width);
 					$x2 = mt_rand(0, $total_width);
 					$y1 = 0; $y2 = $max_height;
-				}
-				else
+				} else
 				{
 					$y1 = mt_rand(0, $max_height);
 					$y2 = mt_rand(0, $max_height);
@@ -1086,8 +1129,7 @@ 
 				imagesetthickness($code_image, mt_rand(1, 2));
 				imageline($code_image, $x1, $y1, $x2, $y2, mt_rand(0, 1) ? $fg_color : $randomness_color);
 			}
-		}
-		else
+		} else
 		{
 			// Put in some ellipse
 			$num_ellipse = $noiseType == 'extreme' ? mt_rand(6, 12) : mt_rand(2, 6);
@@ -1107,8 +1149,7 @@ 
 	{
 		header('content-type: image/gif');
 		imagegif($code_image);
-	}
-	else
+	} else
 	{
 		header('content-type: image/png');
 		imagepng($code_image);
@@ -1131,25 +1172,29 @@ 
 {
 	global $settings;
 
-	if (!is_dir($settings['default_theme_dir'] . '/fonts'))
-		return false;
+	if (!is_dir($settings['default_theme_dir'] . '/fonts')) {
+			return false;
+	}
 
 	// Get a list of the available font directories.
 	$font_dir = dir($settings['default_theme_dir'] . '/fonts');
 	$font_list = array();
-	while ($entry = $font_dir->read())
-		if ($entry[0] !== '.' && is_dir($settings['default_theme_dir'] . '/fonts/' . $entry) && file_exists($settings['default_theme_dir'] . '/fonts/' . $entry . '.gdf'))
+	while ($entry = $font_dir->read()) {
+			if ($entry[0] !== '.' && is_dir($settings['default_theme_dir'] . '/fonts/' . $entry) && file_exists($settings['default_theme_dir'] . '/fonts/' . $entry . '.gdf'))
 			$font_list[] = $entry;
+	}
 
-	if (empty($font_list))
-		return false;
+	if (empty($font_list)) {
+			return false;
+	}
 
 	// Pick a random font.
 	$random_font = $font_list[array_rand($font_list)];
 
 	// Check if the given letter exists.
-	if (!file_exists($settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . $letter . '.png'))
-		return false;
+	if (!file_exists($settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . $letter . '.png')) {
+			return false;
+	}
 
 	// Include it!
 	header('content-type: image/png');

Sources/Calendar.php

Braces +122 added lines, -97 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Show the calendar.
@@ -47,12 +48,14 @@ 
 		'post' => 'CalendarPost',
 	);
 
-	if (isset($_GET['sa']) && isset($subActions[$_GET['sa']]))
-		return call_helper($subActions[$_GET['sa']]);
+	if (isset($_GET['sa']) && isset($subActions[$_GET['sa']])) {
+			return call_helper($subActions[$_GET['sa']]);
+	}
 
 	// You can't do anything if the calendar is off.
-	if (empty($modSettings['cal_enabled']))
-		fatal_lang_error('calendar_off', false);
+	if (empty($modSettings['cal_enabled'])) {
+			fatal_lang_error('calendar_off', false);
+	}
 
 	// This is gonna be needed...
 	loadTemplate('Calendar');
@@ -88,22 +91,25 @@ 
 	$context['page_title'] = $txt['calendar'];
 
 	// Ensure a default view is defined
-	if (empty($modSettings['calendar_default_view']))
-		$modSettings['calendar_default_view'] = 'viewlist';
+	if (empty($modSettings['calendar_default_view'])) {
+			$modSettings['calendar_default_view'] = 'viewlist';
+	}
 
 	// What view do we want?
-	if (isset($_GET['viewweek']))
-		$context['calendar_view'] = 'viewweek';
-	elseif (isset($_GET['viewmonth']))
-		$context['calendar_view'] = 'viewmonth';
-	elseif (isset($_GET['viewlist']))
-		$context['calendar_view'] = 'viewlist';
-	else
-		$context['calendar_view'] = $modSettings['calendar_default_view'];
+	if (isset($_GET['viewweek'])) {
+			$context['calendar_view'] = 'viewweek';
+	} elseif (isset($_GET['viewmonth'])) {
+			$context['calendar_view'] = 'viewmonth';
+	} elseif (isset($_GET['viewlist'])) {
+			$context['calendar_view'] = 'viewlist';
+	} else {
+			$context['calendar_view'] = $modSettings['calendar_default_view'];
+	}
 
 	// Don't let search engines index the non-default calendar pages
-	if ($context['calendar_view'] !== $modSettings['calendar_default_view'])
-		$context['robot_no_index'] = true;
+	if ($context['calendar_view'] !== $modSettings['calendar_default_view']) {
+			$context['robot_no_index'] = true;
+	}
 
 	// Get the current day of month...
 	require_once($sourcedir . '/Subs-Calendar.php');
@@ -164,16 +170,19 @@ 
 	);
 
 	// Make sure the year and month are in valid ranges.
-	if ($curPage['month'] < 1 || $curPage['month'] > 12)
-		fatal_lang_error('invalid_month', false);
-	if ($curPage['year'] < $modSettings['cal_minyear'] || $curPage['year'] > $modSettings['cal_maxyear'])
-		fatal_lang_error('invalid_year', false);
+	if ($curPage['month'] < 1 || $curPage['month'] > 12) {
+			fatal_lang_error('invalid_month', false);
+	}
+	if ($curPage['year'] < $modSettings['cal_minyear'] || $curPage['year'] > $modSettings['cal_maxyear']) {
+			fatal_lang_error('invalid_year', false);
+	}
 	// If we have a day clean that too.
 	if ($context['calendar_view'] != 'viewmonth')
 	{
 		$isValid = checkdate($curPage['month'], $curPage['day'], $curPage['year']);
-		if (!$isValid)
-			fatal_lang_error('invalid_day', false);
+		if (!$isValid) {
+					fatal_lang_error('invalid_day', false);
+		}
 	}
 
 	// Load all the context information needed to show the calendar grid.
@@ -195,23 +204,26 @@ 
 	);
 
 	// Load up the main view.
-	if ($context['calendar_view'] == 'viewlist')
-		$context['calendar_grid_main'] = getCalendarList($curPage['start_date'], $curPage['end_date'], $calendarOptions);
-	elseif ($context['calendar_view'] == 'viewweek')
-		$context['calendar_grid_main'] = getCalendarWeek($curPage['month'], $curPage['year'], $curPage['day'], $calendarOptions);
-	else
-		$context['calendar_grid_main'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
+	if ($context['calendar_view'] == 'viewlist') {
+			$context['calendar_grid_main'] = getCalendarList($curPage['start_date'], $curPage['end_date'], $calendarOptions);
+	} elseif ($context['calendar_view'] == 'viewweek') {
+			$context['calendar_grid_main'] = getCalendarWeek($curPage['month'], $curPage['year'], $curPage['day'], $calendarOptions);
+	} else {
+			$context['calendar_grid_main'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
+	}
 
 	// Load up the previous and next months.
 	$context['calendar_grid_current'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
 
 	// Only show previous month if it isn't pre-January of the min-year
-	if ($context['calendar_grid_current']['previous_calendar']['year'] > $modSettings['cal_minyear'] || $curPage['month'] != 1)
-		$context['calendar_grid_prev'] = getCalendarGrid($context['calendar_grid_current']['previous_calendar']['month'], $context['calendar_grid_current']['previous_calendar']['year'], $calendarOptions, true);
+	if ($context['calendar_grid_current']['previous_calendar']['year'] > $modSettings['cal_minyear'] || $curPage['month'] != 1) {
+			$context['calendar_grid_prev'] = getCalendarGrid($context['calendar_grid_current']['previous_calendar']['month'], $context['calendar_grid_current']['previous_calendar']['year'], $calendarOptions, true);
+	}
 
 	// Only show next month if it isn't post-December of the max-year
-	if ($context['calendar_grid_current']['next_calendar']['year'] < $modSettings['cal_maxyear'] || $curPage['month'] != 12)
-		$context['calendar_grid_next'] = getCalendarGrid($context['calendar_grid_current']['next_calendar']['month'], $context['calendar_grid_current']['next_calendar']['year'], $calendarOptions);
+	if ($context['calendar_grid_current']['next_calendar']['year'] < $modSettings['cal_maxyear'] || $curPage['month'] != 12) {
+			$context['calendar_grid_next'] = getCalendarGrid($context['calendar_grid_current']['next_calendar']['month'], $context['calendar_grid_current']['next_calendar']['year'], $calendarOptions);
+	}
 
 	// Basic template stuff.
 	$context['allow_calendar_event'] = allowedTo('calendar_post');
@@ -231,8 +243,9 @@ 
 	$context['blocks_disabled'] = !empty($modSettings['cal_disable_prev_next']) ? 1 : 0;
 
 	// Set the page title to mention the month or week, too
-	if ($context['calendar_view'] != 'viewlist')
-		$context['page_title'] .= ' - ' . ($context['calendar_view'] == 'viewweek' ? $context['calendar_grid_main']['week_title'] : $txt['months'][$context['current_month']] . ' ' . $context['current_year']);
+	if ($context['calendar_view'] != 'viewlist') {
+			$context['page_title'] .= ' - ' . ($context['calendar_view'] == 'viewweek' ? $context['calendar_grid_main']['week_title'] : $txt['months'][$context['current_month']] . ' ' . $context['current_year']);
+	}
 
 	// Load up the linktree!
 	$context['linktree'][] = array(
@@ -245,17 +258,19 @@ 
 		'name' => $txt['months'][$context['current_month']] . ' ' . $context['current_year']
 	);
 	// If applicable, add the current week to the linktree.
-	if ($context['calendar_view'] == 'viewweek')
-		$context['linktree'][] = array(
+	if ($context['calendar_view'] == 'viewweek') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=calendar;viewweek;year=' . $context['current_year'] . ';month=' . $context['current_month'] . ';day=' . $context['current_day'],
 			'name' => $context['calendar_grid_main']['week_title'],
 		);
+	}
 
 	// Build the calendar button array.
 	$context['calendar_buttons'] = array();
 
-	if ($context['can_post'])
-		$context['calendar_buttons']['post_event'] = array('text' => 'calendar_post_event', 'image' => 'calendarpe.png', 'url' => $scripturl . '?action=calendar;sa=post;month=' . $context['current_month'] . ';year=' . $context['current_year'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_post']) {
+			$context['calendar_buttons']['post_event'] = array('text' => 'calendar_post_event', 'image' => 'calendarpe.png', 'url' => $scripturl . '?action=calendar;sa=post;month=' . $context['current_month'] . ';year=' . $context['current_year'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
 	// Allow mods to add additional buttons here
 	call_integration_hook('integrate_calendar_buttons');
@@ -284,14 +299,16 @@ 
 	require_once($sourcedir . '/Subs.php');
 
 	// Cast this for safety...
-	if (isset($_REQUEST['eventid']))
-		$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
+	if (isset($_REQUEST['eventid'])) {
+			$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
+	}
 
 	// We want a fairly compact version of the time, but as close as possible to the user's settings.
-	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$time_string = '%k:%M';
-	else
-		$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$time_string = '%k:%M';
+	} else {
+			$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	}
 
 	$js_time_string = str_replace(
 		array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r',      '%R',  '%S', '%T',    '%X'),
@@ -305,12 +322,14 @@ 
 		checkSession();
 
 		// Validate the post...
-		if (!isset($_POST['link_to_board']))
-			validateEventPost();
+		if (!isset($_POST['link_to_board'])) {
+					validateEventPost();
+		}
 
 		// If you're not allowed to edit any events, you have to be the poster.
-		if ($_REQUEST['eventid'] > 0 && !allowedTo('calendar_edit_any'))
-			isAllowedTo('calendar_edit_' . (!empty($user_info['id']) && getEventPoster($_REQUEST['eventid']) == $user_info['id'] ? 'own' : 'any'));
+		if ($_REQUEST['eventid'] > 0 && !allowedTo('calendar_edit_any')) {
+					isAllowedTo('calendar_edit_' . (!empty($user_info['id']) && getEventPoster($_REQUEST['eventid']) == $user_info['id'] ? 'own' : 'any'));
+		}
 
 		// New - and directing?
 		if (isset($_POST['link_to_board']) || empty($modSettings['cal_allow_unlinked']))
@@ -333,8 +352,9 @@ 
 		}
 
 		// Deleting...
-		elseif (isset($_REQUEST['deleteevent']))
-			removeEvent($_REQUEST['eventid']);
+		elseif (isset($_REQUEST['deleteevent'])) {
+					removeEvent($_REQUEST['eventid']);
+		}
 
 		// ... or just update it?
 		else
@@ -357,15 +377,13 @@ 
 			$year = $d['year'];
 			$month = $d['month'];
 			$day = $d['day'];
-		}
-		elseif (isset($_POST['start_datetime']))
+		} elseif (isset($_POST['start_datetime']))
 		{
 			$d = date_parse($_POST['start_datetime']);
 			$year = $d['year'];
 			$month = $d['month'];
 			$day = $d['day'];
-		}
-		else
+		} else
 		{
 			$today = getdate();
 			$year = isset($_POST['year']) ? $_POST['year'] : $today['year'];
@@ -399,13 +417,13 @@ 
 		$context['event'] = array_merge($context['event'], $eventDatetimes);
 
 		$context['event']['last_day'] = (int) strftime('%d', mktime(0, 0, 0, $context['event']['month'] == 12 ? 1 : $context['event']['month'] + 1, 0, $context['event']['month'] == 12 ? $context['event']['year'] + 1 : $context['event']['year']));
-	}
-	else
+	} else
 	{
 		$context['event'] = getEventProperties($_REQUEST['eventid']);
 
-		if ($context['event'] === false)
-			fatal_lang_error('no_access', false);
+		if ($context['event'] === false) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// If it has a board, then they should be editing it within the topic.
 		if (!empty($context['event']['topic']['id']) && !empty($context['event']['topic']['first_msg']))
@@ -416,10 +434,11 @@ 
 		}
 
 		// Make sure the user is allowed to edit this event.
-		if ($context['event']['member'] != $user_info['id'])
-			isAllowedTo('calendar_edit_any');
-		elseif (!allowedTo('calendar_edit_any'))
-			isAllowedTo('calendar_edit_own');
+		if ($context['event']['member'] != $user_info['id']) {
+					isAllowedTo('calendar_edit_any');
+		} elseif (!allowedTo('calendar_edit_any')) {
+					isAllowedTo('calendar_edit_own');
+		}
 	}
 
 	// An all day event? Set up some nice defaults in case the user wants to change that
@@ -453,8 +472,7 @@ 
 	{
 		// You can post new events but can't link them to anything...
 		$context['event']['categories'] = array();
-	}
-	else
+	} else
 	{
 		// Load the list of boards and categories in the context.
 		require_once($sourcedir . '/Subs-MessageIndex.php');
@@ -541,12 +559,14 @@ 
 	global $smcFunc, $sourcedir, $forum_version, $modSettings, $webmaster_email, $mbname;
 
 	// You can't export if the calendar export feature is off.
-	if (empty($modSettings['cal_export']))
-		fatal_lang_error('calendar_export_off', false);
+	if (empty($modSettings['cal_export'])) {
+			fatal_lang_error('calendar_export_off', false);
+	}
 
 	// Goes without saying that this is required.
-	if (!isset($_REQUEST['eventid']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_REQUEST['eventid'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// This is kinda wanted.
 	require_once($sourcedir . '/Subs-Calendar.php');
@@ -554,15 +574,17 @@ 
 	// Load up the event in question and check it exists.
 	$event = getEventProperties($_REQUEST['eventid']);
 
-	if ($event === false)
-		fatal_lang_error('no_access', false);
+	if ($event === false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Check the title isn't too long - iCal requires some formatting if so.
 	$title = str_split($event['title'], 30);
 	foreach ($title as $id => $line)
 	{
-		if ($id != 0)
-			$title[$id] = ' ' . $title[$id];
+		if ($id != 0) {
+					$title[$id] = ' ' . $title[$id];
+		}
 		$title[$id] .= "\n";
 	}
 
@@ -575,8 +597,7 @@ 
 	{
 		$datestart = date_format($start_date, 'Ymd\THis');
 		$dateend = date_format($end_date, 'Ymd\THis');
-	}
-	else
+	} else
 	{
 		$datestart = date_format($start_date, 'Ymd');
 
@@ -597,15 +618,18 @@ 
 	$filecontents .= 'DTSTART' . (!empty($event['start_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $datestart . "\n";
 
 	// event has a duration
-	if ($event['start_iso_gmdate'] != $event['end_iso_gmdate'])
-		$filecontents .= 'DTEND' . (!empty($event['end_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $dateend . "\n";
+	if ($event['start_iso_gmdate'] != $event['end_iso_gmdate']) {
+			$filecontents .= 'DTEND' . (!empty($event['end_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $dateend . "\n";
+	}
 
 	// event has changed? advance the sequence for this UID
-	if ($event['sequence'] > 0)
-		$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	if ($event['sequence'] > 0) {
+			$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	}
 
-	if (!empty($event['location']))
-		$filecontents .= 'LOCATION:' . str_replace(',', '\,', $event['location']) . "\n";
+	if (!empty($event['location'])) {
+			$filecontents .= 'LOCATION:' . str_replace(',', '\,', $event['location']) . "\n";
+	}
 
 	$filecontents .= 'SUMMARY:' . implode('', $title);
 	$filecontents .= 'UID:' . $event['eventid'] . '@' . str_replace(' ', '-', $mbname) . "\n";
@@ -614,23 +638,26 @@ 
 
 	// Send some standard headers.
 	ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			ob_start();
+	}
 
 	// Send the file headers
 	header('pragma: ');
 	header('cache-control: no-cache');
-	if (!isBrowser('gecko'))
-		header('content-transfer-encoding: binary');
+	if (!isBrowser('gecko')) {
+			header('content-transfer-encoding: binary');
+	}
 	header('expires: ' . gmdate('D, d M Y H:i:s', time() + 525600 * 60) . ' GMT');
 	header('last-modified: ' . gmdate('D, d M Y H:i:s', time()) . 'GMT');
 	header('accept-ranges: bytes');
 	header('connection: close');
 	header('content-disposition: attachment; filename="' . $event['title'] . '.ics"');
-	if (empty($modSettings['enableCompressedOutput']))
-		header('content-length: ' . $smcFunc['strlen']($filecontents));
+	if (empty($modSettings['enableCompressedOutput'])) {
+			header('content-length: ' . $smcFunc['strlen']($filecontents));
+	}
 
 	// This is a calendar item!
 	header('content-type: text/calendar');
@@ -669,20 +696,17 @@ 
 		$context['sub_template'] = 'bcd';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock;bcd', 'name' => 'BCD');
 		$context['clockicons'] = $smcFunc['json_decode'](base64_decode('eyJoMSI6WzIsMV0sImgyIjpbOCw0LDIsMV0sIm0xIjpbNCwyLDFdLCJtMiI6WzgsNCwyLDFdLCJzMSI6WzQsMiwxXSwiczIiOls4LDQsMiwxXX0='), true);
-	}
-	elseif (!$omfg && !isset($_REQUEST['time']))
+	} elseif (!$omfg && !isset($_REQUEST['time']))
 	{
 		$context['sub_template'] = 'hms';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock', 'name' => 'Binary');
 		$context['clockicons'] = $smcFunc['json_decode'](base64_decode('eyJoIjpbMTYsOCw0LDIsMV0sIm0iOlszMiwxNiw4LDQsMiwxXSwicyI6WzMyLDE2LDgsNCwyLDFdfQ'), true);
-	}
-	elseif ($omfg)
+	} elseif ($omfg)
 	{
 		$context['sub_template'] = 'omfg';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock;omfg', 'name' => 'OMFG');
 		$context['clockicons'] = $smcFunc['json_decode'](base64_decode('eyJ5ZWFyIjpbNjQsMzIsMTYsOCw0LDIsMV0sIm1vbnRoIjpbOCw0LDIsMV0sImRheSI6WzE2LDgsNCwyLDFdLCJob3VyIjpbMTYsOCw0LDIsMV0sIm1pbiI6WzMyLDE2LDgsNCwyLDFdLCJzZWMiOlszMiwxNiw4LDQsMiwxXX0='), true);
-	}
-	elseif (isset($_REQUEST['time']))
+	} elseif (isset($_REQUEST['time']))
 	{
 		$context['sub_template'] = 'thetime';
 		$time = getdate($_REQUEST['time'] == 'now' ? time() : (int) $_REQUEST['time']);
@@ -736,12 +760,13 @@ 
 			),
 		);
 
-		foreach ($context['clockicons'] as $t => $vs)
-			foreach ($vs as $v => $dumb)
+		foreach ($context['clockicons'] as $t => $vs) {
+					foreach ($vs as $v => $dumb)
 			{
 				if ($$t >= $v)
 				{
 					$$t -= $v;
+		}
 					$context['clockicons'][$t][$v] = true;
 				}
 			}