elkarte / Elkarte

sources/SiteCombiner.class.php

Braces +36 added lines, -14 removed lines

@@ -168,7 +168,9 @@ 
 
 		// Nothing to do, then we are done
 		if (count($this->_combine_files) === 0)
-			return true;
+		{
+					return true;
+		}
 
 		// Create the archive name
 		$this->_buildName('.js');
@@ -226,7 +228,9 @@ 
 
 		// Nothing to do so return
 		if (count($this->_combine_files) === 0)
-			return true;
+		{
+					return true;
+		}
 
 		// Create the css archive name
 		$this->_buildName('.css');
@@ -373,7 +377,9 @@ 
 		foreach ($this->_combine_files as $file)
 		{
 			if ($file['filemtime'] > $filemtime)
-				return true;
+			{
+							return true;
+			}
 		}
 
 		return false;
@@ -390,7 +396,9 @@ 
 
 		// Create this groups archive name
 		foreach ($this->_combine_files as $file)
-			$this->_archive_filenames .= $file['basename'] . ' ';
+		{
+					$this->_archive_filenames .= $file['basename'] . ' ';
+		}
 
 		// Add in the actual theme url to make the sha1 unique to this hive
 		$this->_archive_filenames = $settings['actual_theme_url'] . '/' . trim($this->_archive_filenames);
@@ -400,7 +408,9 @@ 
 
 		// Create a unique cache stale for this hive ?x12345
 		if (!empty($this->_stales))
-			$this->_archive_stale = '?x' . hash('crc32b', implode(' ', $this->_stales));
+		{
+					$this->_archive_stale = '?x' . hash('crc32b', implode(' ', $this->_stales));
+		}
 	}
 
 	/**
@@ -445,9 +455,12 @@ 
 
 			// Add the file to the correct array for processing
 			if ($file['minimized'] === false)
-				$_cache[] = $tempfile;
-			else
-				$_min_cache[] = $tempfile;
+			{
+							$_cache[] = $tempfile;
+			}
+			else {
+							$_min_cache[] = $tempfile;
+			}
 		}
 
 		// Build out our combined file strings
@@ -463,7 +476,9 @@ 
 	{
 		// Add in the file header if available
 		if (!empty($this->_archive_header))
-			$this->_minified_cache = $this->_archive_header . $this->_minified_cache;
+		{
+					$this->_minified_cache = $this->_archive_header . $this->_minified_cache;
+		}
 
 		// First the plain text version
 		file_put_contents($this->_archive_dir . '/' . $this->_archive_name, $this->_minified_cache, LOCK_EX);
@@ -500,7 +515,9 @@ 
 			// To prevent a stack overflow segmentation fault, which silently kills Apache, we need to limit
 			// recursion on windows.  This may cause JSqueeze to fail, but at least its then catchable.
 			if (detectServer()->is('windows'))
-				@ini_set('pcre.recursion_limit', '524');
+			{
+							@ini_set('pcre.recursion_limit', '524');
+			}
 
 			require_once(EXTDIR . '/JSqueeze.php');
 			$jsqueeze = new Patchwork\JSqueeze;
@@ -509,7 +526,9 @@ 
 
 		// If we still have no data, then try the post js_code method to the closure compiler
 		if ($fetch_data === false || trim($fetch_data) == '')
-			$fetch_data = $this->_closure_js_code();
+		{
+					$fetch_data = $this->_closure_js_code();
+		}
 
 		// If we have nothing to return, use the original data
 		$fetch_data = ($fetch_data === false || trim($fetch_data) == '') ? $this->_cache : $fetch_data;
@@ -534,7 +553,9 @@ 
 		foreach ($this->_combine_files as $file)
 		{
 			if ($file['minimized'] === false)
-				$post_data .= '&code_url=' . urlencode($file['url'] . '/scripts/' . $file['basename'] . $this->_archive_stale);
+			{
+							$post_data .= '&code_url=' . urlencode($file['url'] . '/scripts/' . $file['basename'] . $this->_archive_stale);
+			}
 		}
 
 		return fetch_web_data($this->_url, $this->_post_header . $post_data);
@@ -558,8 +579,9 @@ 
 			$fetch_data = fetch_web_data($this->_url, $this->_post_header . $post_data);
 		}
 		// Simply to much data for a single post so break it down in to as few as possible
-		else
-			$fetch_data = $this->_closure_js_code_chunks();
+		else {
+					$fetch_data = $this->_closure_js_code_chunks();
+		}
 
 		return $fetch_data;
 	}

sources/Subs.php

Braces +375 added lines, -151 removed lines

@@ -97,7 +97,9 @@ 
 	$cache = Cache::instance();
 
 	if (empty($changeArray) || !is_array($changeArray))
-		return;
+	{
+			return;
+	}
 
 	// In some cases, this may be better and faster, but for large sets we don't want so many UPDATEs.
 	if ($update)
@@ -128,10 +130,14 @@ 
 	{
 		// Don't bother if it's already like that ;).
 		if (isset($modSettings[$variable]) && $modSettings[$variable] == $value)
-			continue;
+		{
+					continue;
+		}
 		// If the variable isn't set, but would only be set to nothing'ness, then don't bother setting it.
 		elseif (!isset($modSettings[$variable]) && empty($value))
-			continue;
+		{
+					continue;
+		}
 
 		$replaceArray[] = array($variable, $value);
 
@@ -139,7 +145,9 @@ 
 	}
 
 	if (empty($replaceArray))
-		return;
+	{
+			return;
+	}
 
 	$db->insert('replace',
 		'{db_prefix}settings',
@@ -164,10 +172,14 @@ 
 	$db = database();
 
 	if (empty($toRemove))
-		return;
+	{
+			return;
+	}
 
 	if (!is_array($toRemove))
-		$toRemove = array($toRemove);
+	{
+			$toRemove = array($toRemove);
+	}
 
 	// Remove the setting from the db
 	$db->query('', '
@@ -180,8 +192,10 @@ 
 
 	// Remove it from $modSettings now so it does not persist
 	foreach ($toRemove as $setting)
-		if (isset($modSettings[$setting]))
+	{
+			if (isset($modSettings[$setting]))
 			unset($modSettings[$setting]);
+	}
 
 	// Kill the cache - it needs redoing now, but we won't bother ourselves with that here.
 	Cache::instance()->remove('modSettings');
@@ -228,13 +242,18 @@ 
 
 	// Make sure $start is a proper variable - not less than 0.
 	if ($start_invalid)
-		$start = 0;
+	{
+			$start = 0;
+	}
 	// Not greater than the upper bound.
 	elseif ($start >= $max_value)
-		$start = max(0, (int) $max_value - (((int) $max_value % (int) $num_per_page) == 0 ? $num_per_page : ((int) $max_value % (int) $num_per_page)));
+	{
+			$start = max(0, (int) $max_value - (((int) $max_value % (int) $num_per_page) == 0 ? $num_per_page : ((int) $max_value % (int) $num_per_page)));
+	}
 	// And it has to be a multiple of $num_per_page!
-	else
-		$start = max(0, (int) $start - ((int) $start % (int) $num_per_page));
+	else {
+			$start = max(0, (int) $start - ((int) $start % (int) $num_per_page));
+	}
 
 	$context['current_page'] = $start / $num_per_page;
 
@@ -249,12 +268,16 @@ 
 		// Show all the pages.
 		$display_page = 1;
 		for ($counter = 0; $counter < $max_value; $counter += $num_per_page)
-			$pageindex .= $start == $counter && !$start_invalid && empty($show['all_selected']) ? sprintf($settings['page_index_template']['current_page'], $display_page++) : sprintf($base_link, $counter, $display_page++);
+		{
+					$pageindex .= $start == $counter && !$start_invalid && empty($show['all_selected']) ? sprintf($settings['page_index_template']['current_page'], $display_page++) : sprintf($base_link, $counter, $display_page++);
+		}
 
 		// Show the right arrow.
 		$display_page = ($start + $num_per_page) > $max_value ? $max_value : ($start + $num_per_page);
 		if ($start != $counter - $max_value && !$start_invalid && $show['prev_next'] && empty($show['all_selected']))
-			$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link, $display_page, str_replace('{next_txt}', $txt['next'], $settings['page_index_template']['next_page']));
+		{
+					$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link, $display_page, str_replace('{next_txt}', $txt['next'], $settings['page_index_template']['next_page']));
+		}
 	}
 	else
 	{
@@ -263,61 +286,84 @@ 
 
 		// Show the "prev page" link. (>prev page< 1 ... 6 7 [8] 9 10 ... 15 next page)
 		if (!empty($start) && $show['prev_next'])
-			$pageindex = sprintf($base_link, $start - $num_per_page, str_replace('{prev_txt}', $txt['prev'], $settings['page_index_template']['previous_page']));
-		else
-			$pageindex = '';
+		{
+					$pageindex = sprintf($base_link, $start - $num_per_page, str_replace('{prev_txt}', $txt['prev'], $settings['page_index_template']['previous_page']));
+		}
+		else {
+					$pageindex = '';
+		}
 
 		// Show the first page. (prev page >1< ... 6 7 [8] 9 10 ... 15)
 		if ($start > $num_per_page * $PageContiguous)
-			$pageindex .= sprintf($base_link, 0, '1');
+		{
+					$pageindex .= sprintf($base_link, 0, '1');
+		}
 
 		// Show the ... after the first page.  (prev page 1 >...< 6 7 [8] 9 10 ... 15 next page)
 		if ($start > $num_per_page * ($PageContiguous + 1))
-			$pageindex .= str_replace('{custom}', 'data-baseurl="' . htmlspecialchars(JavaScriptEscape(($flexible_start ? $base_url : strtr($base_url, array('%' => '%%')) . ';start=%1$d')), ENT_COMPAT, 'UTF-8') . '" data-perpage="' . $num_per_page . '" data-firstpage="' . $num_per_page . '" data-lastpage="' . ($start - $num_per_page * $PageContiguous) . '"', $settings['page_index_template']['expand_pages']);
+		{
+					$pageindex .= str_replace('{custom}', 'data-baseurl="' . htmlspecialchars(JavaScriptEscape(($flexible_start ? $base_url : strtr($base_url, array('%' => '%%')) . ';start=%1$d')), ENT_COMPAT, 'UTF-8') . '" data-perpage="' . $num_per_page . '" data-firstpage="' . $num_per_page . '" data-lastpage="' . ($start - $num_per_page * $PageContiguous) . '"', $settings['page_index_template']['expand_pages']);
+		}
 
 		// Show the pages before the current one. (prev page 1 ... >6 7< [8] 9 10 ... 15 next page)
 		for ($nCont = $PageContiguous; $nCont >= 1; $nCont--)
-			if ($start >= $num_per_page * $nCont)
+		{
+					if ($start >= $num_per_page * $nCont)
 			{
 				$tmpStart = $start - $num_per_page * $nCont;
+		}
 				$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
 			}
 
 		// Show the current page. (prev page 1 ... 6 7 >[8]< 9 10 ... 15 next page)
 		if (!$start_invalid && empty($show['all_selected']))
-			$pageindex .= sprintf($settings['page_index_template']['current_page'], ($start / $num_per_page + 1));
-		else
-			$pageindex .= sprintf($base_link, $start, $start / $num_per_page + 1);
+		{
+					$pageindex .= sprintf($settings['page_index_template']['current_page'], ($start / $num_per_page + 1));
+		}
+		else {
+					$pageindex .= sprintf($base_link, $start, $start / $num_per_page + 1);
+		}
 
 		// Show the pages after the current one... (prev page 1 ... 6 7 [8] >9 10< ... 15 next page)
 		$tmpMaxPages = (int) (($max_value - 1) / $num_per_page) * $num_per_page;
 		for ($nCont = 1; $nCont <= $PageContiguous; $nCont++)
-			if ($start + $num_per_page * $nCont <= $tmpMaxPages)
+		{
+					if ($start + $num_per_page * $nCont <= $tmpMaxPages)
 			{
 				$tmpStart = $start + $num_per_page * $nCont;
+		}
 				$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
 			}
 
 		// Show the '...' part near the end. (prev page 1 ... 6 7 [8] 9 10 >...< 15 next page)
 		if ($start + $num_per_page * ($PageContiguous + 1) < $tmpMaxPages)
-			$pageindex .= str_replace('{custom}', 'data-baseurl="' . htmlspecialchars(JavaScriptEscape(($flexible_start ? $base_url : strtr($base_url, array('%' => '%%')) . ';start=%1$d')), ENT_COMPAT, 'UTF-8') . '" data-perpage="' . $num_per_page . '" data-firstpage="' . ($start + $num_per_page * ($PageContiguous + 1)) . '" data-lastpage="' . $tmpMaxPages . '"', $settings['page_index_template']['expand_pages']);
+		{
+					$pageindex .= str_replace('{custom}', 'data-baseurl="' . htmlspecialchars(JavaScriptEscape(($flexible_start ? $base_url : strtr($base_url, array('%' => '%%')) . ';start=%1$d')), ENT_COMPAT, 'UTF-8') . '" data-perpage="' . $num_per_page . '" data-firstpage="' . ($start + $num_per_page * ($PageContiguous + 1)) . '" data-lastpage="' . $tmpMaxPages . '"', $settings['page_index_template']['expand_pages']);
+		}
 
 		// Show the last number in the list. (prev page 1 ... 6 7 [8] 9 10 ... >15<  next page)
 		if ($start + $num_per_page * $PageContiguous < $tmpMaxPages)
-			$pageindex .= sprintf($base_link, $tmpMaxPages, $tmpMaxPages / $num_per_page + 1);
+		{
+					$pageindex .= sprintf($base_link, $tmpMaxPages, $tmpMaxPages / $num_per_page + 1);
+		}
 
 		// Show the "next page" link. (prev page 1 ... 6 7 [8] 9 10 ... 15 >next page<)
 		if ($start != $tmpMaxPages && $show['prev_next'] && empty($show['all_selected']))
-			$pageindex .= sprintf($base_link, $start + $num_per_page, str_replace('{next_txt}', $txt['next'], $settings['page_index_template']['next_page']));
+		{
+					$pageindex .= sprintf($base_link, $start + $num_per_page, str_replace('{next_txt}', $txt['next'], $settings['page_index_template']['next_page']));
+		}
 	}
 
 	// The "all" button
 	if ($show['all'])
 	{
 		if (!empty($show['all_selected']))
-			$pageindex .= sprintf($settings['page_index_template']['current_page'], $txt['all']);
-		else
-			$pageindex .= sprintf(str_replace('%1$d', '%1$s', $base_link), '0;all', str_replace('{all_txt}', $txt['all'], $settings['page_index_template']['all']));
+		{
+					$pageindex .= sprintf($settings['page_index_template']['current_page'], $txt['all']);
+		}
+		else {
+					$pageindex .= sprintf(str_replace('%1$d', '%1$s', $base_link), '0;all', str_replace('{all_txt}', $txt['all'], $settings['page_index_template']['all']));
+		}
 	}
 
 	return $pageindex;
@@ -347,7 +393,9 @@ 
 	{
 		// Not set for whatever reason?
 		if (empty($txt['number_format']) || preg_match('~^1([^\d]*)?234([^\d]*)(0*?)$~', $txt['number_format'], $matches) != 1)
-			return $number;
+		{
+					return $number;
+		}
 
 		// Cache these each load...
 		$thousands_separator = $matches[1];
@@ -436,16 +484,23 @@ 
 
 	// Offset the time.
 	if (!$offset_type)
-		$time = $log_time + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+	{
+			$time = $log_time + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+	}
 	// Just the forum offset?
 	elseif ($offset_type === 'forum')
-		$time = $log_time + $modSettings['time_offset'] * 3600;
-	else
-		$time = $log_time;
+	{
+			$time = $log_time + $modSettings['time_offset'] * 3600;
+	}
+	else {
+			$time = $log_time;
+	}
 
 	// We can't have a negative date (on Windows, at least.)
 	if ($log_time < 0)
-		$log_time = 0;
+	{
+			$log_time = 0;
+	}
 
 	// Today and Yesterday?
 	if ($modSettings['todayMod'] >= 1 && $show_today === true)
@@ -463,16 +518,21 @@ 
 			$h = strpos($user_info['time_format'], '%l') === false ? '%I' : '%l';
 			$today_fmt = $h . ':%M' . $s . ' %p';
 		}
-		else
-			$today_fmt = '%H:%M' . $s;
+		else {
+					$today_fmt = '%H:%M' . $s;
+		}
 
 		// Same day of the year, same year.... Today!
 		if ($then['yday'] == $now['yday'] && $then['year'] == $now['year'])
-			return sprintf($txt['today'], standardTime($log_time, $today_fmt, $offset_type));
+		{
+					return sprintf($txt['today'], standardTime($log_time, $today_fmt, $offset_type));
+		}
 
 		// Day-of-year is one less and same year, or it's the first of the year and that's the last of the year...
 		if ($modSettings['todayMod'] == '2' && (($then['yday'] == $now['yday'] - 1 && $then['year'] == $now['year']) || ($now['yday'] == 0 && $then['year'] == $now['year'] - 1) && $then['mon'] == 12 && $then['mday'] == 31))
-			return sprintf($txt['yesterday'], standardTime($log_time, $today_fmt, $offset_type));
+		{
+					return sprintf($txt['yesterday'], standardTime($log_time, $today_fmt, $offset_type));
+		}
 	}
 
 	$str = !is_bool($show_today) ? $show_today : $user_info['time_format'];
@@ -480,28 +540,40 @@ 
 	if (setlocale(LC_TIME, $txt['lang_locale']))
 	{
 		if (!isset($non_twelve_hour))
-			$non_twelve_hour = trim(Util::strftime('%p')) === '';
+		{
+					$non_twelve_hour = trim(Util::strftime('%p')) === '';
+		}
 		if ($non_twelve_hour && strpos($str, '%p') !== false)
-			$str = str_replace('%p', (Util::strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		{
+					$str = str_replace('%p', (Util::strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		}
 
 		foreach (array('%a', '%A', '%b', '%B') as $token)
-			if (strpos($str, $token) !== false)
+		{
+					if (strpos($str, $token) !== false)
 				$str = str_replace($token, !empty($txt['lang_capitalize_dates']) ? Util::ucwords(Util::strftime($token, $time)) : Util::strftime($token, $time), $str);
+		}
 	}
 	else
 	{
 		// Do-it-yourself time localization.  Fun.
 		foreach (array('%a' => 'days_short', '%A' => 'days', '%b' => 'months_short', '%B' => 'months') as $token => $text_label)
-			if (strpos($str, $token) !== false)
+		{
+					if (strpos($str, $token) !== false)
 				$str = str_replace($token, $txt[$text_label][(int) Util::strftime($token === '%a' || $token === '%A' ? '%w' : '%m', $time)], $str);
+		}
 
 		if (strpos($str, '%p') !== false)
-			$str = str_replace('%p', (Util::strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		{
+					$str = str_replace('%p', (Util::strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		}
 	}
 
 	// Windows doesn't support %e; on some versions, Util::strftime fails altogether if used, so let's prevent that.
 	if ($support_e && strpos($str, '%e') !== false)
-		$str = str_replace('%e', ltrim(Util::strftime('%d', $time), '0'), $str);
+	{
+			$str = str_replace('%e', ltrim(Util::strftime('%d', $time), '0'), $str);
+	}
 
 	// Format any other characters..
 	return Util::strftime($str, $time);
@@ -519,7 +591,9 @@ 
 	global $txt, $context;
 
 	if (empty($timestamp))
-		return '';
+	{
+			return '';
+	}
 
 	$forumtime = forum_time(false, $timestamp);
 	$timestamp = forum_time(true, $timestamp);
@@ -547,9 +621,13 @@ 
 	global $user_info, $modSettings;
 
 	if ($timestamp === null)
-		$timestamp = time();
+	{
+			$timestamp = time();
+	}
 	elseif ($timestamp == 0)
-		return 0;
+	{
+			return 0;
+	}
 
 	return $timestamp + ($modSettings['time_offset'] + ($use_user_offset ? $user_info['time_offset'] : 0)) * 3600;
 }
@@ -568,7 +646,9 @@ 
 function un_htmlspecialchars($string)
 {
 	if (empty($string))
-		return $string;
+	{
+			return $string;
+	}
 
 	$string = htmlspecialchars_decode($string, ENT_QUOTES);
 	$string = str_replace('&nbsp;', ' ', $string);
@@ -609,7 +689,9 @@ 
 		$array[$j] = $temp;
 
 		for ($i = 1; $p[$i] == 0; $i++)
-			$p[$i] = $i;
+		{
+					$p[$i] = $i;
+		}
 
 		$orders[] = $array;
 	}
@@ -691,7 +773,9 @@ 
 {
 	// Don't waste cycles
 	if ($message === '')
-		return '';
+	{
+			return '';
+	}
 
 	$parser = \BBC\ParserWrapper::instance();
 
@@ -779,29 +863,40 @@ 
 
 	// In case we have mail to send, better do that - as obExit doesn't always quite make it...
 	if (!empty($context['flush_mail']))
-		// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
+	{
+			// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
 		AddMailQueue(true);
+	}
 
 	Notifications::instance()->send();
 
 	$add = preg_match('~^(ftp|http)[s]?://~', $setLocation) == 0 && substr($setLocation, 0, 6) != 'about:';
 
 	if ($add)
-		$setLocation = $scripturl . ($setLocation != '' ? '?' . $setLocation : '');
+	{
+			$setLocation = $scripturl . ($setLocation != '' ? '?' . $setLocation : '');
+	}
 
 	// Put the session ID in.
 	if (empty($_COOKIE) && defined('SID') && SID != '')
-		$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', $scripturl . '?' . SID . ';', $setLocation);
+	{
+			$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', $scripturl . '?' . SID . ';', $setLocation);
+	}
 	// Keep that debug in their for template debugging!
 	elseif (isset($_GET['debug']))
-		$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '\\??/', $scripturl . '?debug;', $setLocation);
+	{
+			$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '\\??/', $scripturl . '?debug;', $setLocation);
+	}
 
 	if (!empty($modSettings['queryless_urls']) && detectServer()->supportRewrite())
 	{
 		if (defined('SID') && SID != '')
-			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~', 'redirectexit_callback', $setLocation);
-		else
-			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~', 'redirectexit_callback', $setLocation);
+		{
+					$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~', 'redirectexit_callback', $setLocation);
+		}
+		else {
+					$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~', 'redirectexit_callback', $setLocation);
+		}
 	}
 
 	// Maybe integrations want to change where we are heading?
@@ -809,9 +904,12 @@ 
 
 	// We send a Refresh header only in special cases because Location looks better. (and is quicker...)
 	if ($refresh)
-		header('Refresh: 0; URL=' . strtr($setLocation, array(' ' => '%20')));
-	else
-		header('Location: ' . str_replace(' ', '%20', $setLocation));
+	{
+			header('Refresh: 0; URL=' . strtr($setLocation, array(' ' => '%20')));
+	}
+	else {
+			header('Location: ' . str_replace(' ', '%20', $setLocation));
+	}
 
 	// Debugging.
 	if ($db_show_debug === true)
@@ -837,10 +935,13 @@ 
 	global $scripturl;
 
 	if (defined('SID') && SID != '')
-		return $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html?' . SID . (isset($matches[2]) ? $matches[2] : '');
-	else
-		return $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html' . (isset($matches[2]) ? $matches[2] : '');
-}
+	{
+			return $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html?' . SID . (isset($matches[2]) ? $matches[2] : '');
+	}
+	else {
+			return $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html' . (isset($matches[2]) ? $matches[2] : '');
+	}
+	}
 
 /**
  * Ends execution.
@@ -868,10 +969,14 @@ 
 	// Attempt to prevent a recursive loop.
 	++$level;
 	if ($level > 1 && !$from_fatal_error && !$has_fatal_error)
-		exit;
+	{
+			exit;
+	}
 
 	if ($from_fatal_error)
-		$has_fatal_error = true;
+	{
+			$has_fatal_error = true;
+	}
 
 	// Clear out the stat cache.
 	trackStats();
@@ -880,19 +985,25 @@ 
 
 	// If we have mail to send, send it.
 	if (!empty($context['flush_mail']))
-		// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
+	{
+			// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
 		AddMailQueue(true);
+	}
 
 	$do_header = $header === null ? !$header_done : $header;
 	if ($do_footer === null)
-		$do_footer = $do_header;
+	{
+			$do_footer = $do_header;
+	}
 
 	// Has the template/header been done yet?
 	if ($do_header)
 	{
 		// Was the page title set last minute? Also update the HTML safe one.
 		if (!empty($context['page_title']) && empty($context['page_title_html_safe']))
-			$context['page_title_html_safe'] = Util::htmlspecialchars(un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+		{
+					$context['page_title_html_safe'] = Util::htmlspecialchars(un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+		}
 
 		// Start up the session URL fixer.
 		ob_start('ob_sessrewrite');
@@ -940,8 +1051,10 @@ 
 
 	// Don't exit if we're coming from index.php; that will pass through normally.
 	if (!$from_index)
-		exit;
-}
+	{
+			exit;
+	}
+	}
 
 function setOldUrl($index = 'old_url')
 {
@@ -978,19 +1091,28 @@ 
 {
 	// Set topic class depending on locked status and number of replies.
 	if ($topic_context['is_very_hot'])
-		$topic_context['class'] = 'veryhot';
+	{
+			$topic_context['class'] = 'veryhot';
+	}
 	elseif ($topic_context['is_hot'])
-		$topic_context['class'] = 'hot';
-	else
-		$topic_context['class'] = 'normal';
+	{
+			$topic_context['class'] = 'hot';
+	}
+	else {
+			$topic_context['class'] = 'normal';
+	}
 
 	$topic_context['class'] .= !empty($topic_context['is_poll']) ? '_poll' : '_post';
 
 	if ($topic_context['is_locked'])
-		$topic_context['class'] .= '_locked';
+	{
+			$topic_context['class'] .= '_locked';
+	}
 
 	if ($topic_context['is_sticky'])
-		$topic_context['class'] .= '_sticky';
+	{
+			$topic_context['class'] .= '_sticky';
+	}
 
 	// This is so old themes will still work.
 	// @deprecated since 1.0 do not rely on it
@@ -1180,16 +1302,24 @@ 
 		$ip_array = array();
 
 		if (count($ip_parts) != 8)
-			return array();
+		{
+					return array();
+		}
 
 		for ($i = 0; $i < 8; $i++)
 		{
 			if ($ip_parts[$i] == '*')
-				$ip_array[$i] = array('low' => '0', 'high' => hexdec('ffff'));
+			{
+							$ip_array[$i] = array('low' => '0', 'high' => hexdec('ffff'));
+			}
 			elseif (preg_match('/^([0-9A-Fa-f]{1,4})\-([0-9A-Fa-f]{1,4})$/', $ip_parts[$i], $range) == 1)
-				$ip_array[$i] = array('low' => hexdec($range[1]), 'high' => hexdec($range[2]));
+			{
+							$ip_array[$i] = array('low' => hexdec($range[1]), 'high' => hexdec($range[2]));
+			}
 			elseif (is_numeric(hexdec($ip_parts[$i])))
-				$ip_array[$i] = array('low' => hexdec($ip_parts[$i]), 'high' => hexdec($ip_parts[$i]));
+			{
+							$ip_array[$i] = array('low' => hexdec($ip_parts[$i]), 'high' => hexdec($ip_parts[$i]));
+			}
 		}
 
 		return $ip_array;
@@ -1197,22 +1327,32 @@ 
 
 	// Pretend that 'unknown' is 255.255.255.255. (since that can't be an IP anyway.)
 	if ($fullip == 'unknown')
-		$fullip = '255.255.255.255';
+	{
+			$fullip = '255.255.255.255';
+	}
 
 	$ip_parts = explode('.', $fullip);
 	$ip_array = array();
 
 	if (count($ip_parts) != 4)
-		return array();
+	{
+			return array();
+	}
 
 	for ($i = 0; $i < 4; $i++)
 	{
 		if ($ip_parts[$i] == '*')
-			$ip_array[$i] = array('low' => '0', 'high' => '255');
+		{
+					$ip_array[$i] = array('low' => '0', 'high' => '255');
+		}
 		elseif (preg_match('/^(\d{1,3})\-(\d{1,3})$/', $ip_parts[$i], $range) == 1)
-			$ip_array[$i] = array('low' => $range[1], 'high' => $range[2]);
+		{
+					$ip_array[$i] = array('low' => $range[1], 'high' => $range[2]);
+		}
 		elseif (is_numeric($ip_parts[$i]))
-			$ip_array[$i] = array('low' => $ip_parts[$i], 'high' => $ip_parts[$i]);
+		{
+					$ip_array[$i] = array('low' => $ip_parts[$i], 'high' => $ip_parts[$i]);
+		}
 	}
 
 	// Makes it simpler to work with.
@@ -1239,7 +1379,9 @@ 
 
 	$host = '';
 	if ($cache->getVar($host, 'hostlookup-' . $ip, 600) || empty($ip))
-		return $host;
+	{
+			return $host;
+	}
 
 	$t = microtime(true);
 
@@ -1294,11 +1436,15 @@ 
 
 	// This is the last try :/.
 	if (!isset($host) || $host === false)
-		$host = @gethostbyaddr($ip);
+	{
+			$host = @gethostbyaddr($ip);
+	}
 
 	// It took a long time, so let's cache it!
 	if (microtime(true) - $t > 0.5)
-		$cache->put('hostlookup-' . $ip, $host, 600);
+	{
+			$cache->put('hostlookup-' . $ip, $host, 600);
+	}
 
 	return $host;
 }
@@ -1338,7 +1484,9 @@ 
 
 				// Create an integer representation
 				for ($i = 0; $i < $max_chars; $i++)
-					$total += $possible_chars[ord($encrypted[$i])] * pow(63, $i);
+				{
+									$total += $possible_chars[ord($encrypted[$i])] * pow(63, $i);
+				}
 
 				// Return the value
 				$returned_ints[] = $max_chars == 4 ? min($total, 16777215) : $total;
@@ -1351,8 +1499,10 @@ 
 		// Trim characters before and after and add slashes for database insertion.
 		$returned_words = array();
 		foreach ($words as $word)
-			if (($word = trim($word, '-_\'')) !== '')
+		{
+					if (($word = trim($word, '-_\'')) !== '')
 				$returned_words[] = $max_chars === null ? $word : substr($word, 0, $max_chars);
+		}
 
 		// Filter out all words that occur more than once.
 		return array_unique($returned_words);
@@ -1378,15 +1528,22 @@ 
 
 	// Does the current loaded theme have this and we are not forcing the usage of this function?
 	if (function_exists('template_create_button') && !$force_use)
-		return template_create_button($name, $alt, $label = '', $custom = '');
+	{
+			return template_create_button($name, $alt, $label = '', $custom = '');
+	}
 
 	if (!$settings['use_image_buttons'])
-		return $txt[$alt];
+	{
+			return $txt[$alt];
+	}
 	elseif (!empty($settings['use_buttons']))
-		return '<img src="' . $settings['images_url'] . '/buttons/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . ' />' . ($label != '' ? '&nbsp;<strong>' . $txt[$label] . '</strong>' : '');
-	else
-		return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . ' />';
-}
+	{
+			return '<img src="' . $settings['images_url'] . '/buttons/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . ' />' . ($label != '' ? '&nbsp;<strong>' . $txt[$label] . '</strong>' : '');
+	}
+	else {
+			return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . ' />';
+	}
+	}
 
 /**
  * Sets up all of the top menu buttons
@@ -1413,8 +1570,10 @@ 
 
 	// Change the seed.
 	if (mt_rand(1, 250) == 69 || empty($modSettings['rand_seed']))
-		updateSettings(array('rand_seed' => mt_rand()));
-}
+	{
+			updateSettings(array('rand_seed' => mt_rand()));
+	}
+	}
 
 /**
  * Process functions of an integration hook.
@@ -1500,35 +1659,50 @@ 
 function replaceEntities__callback($matches)
 {
 	if (!isset($matches[2]))
-		return '';
+	{
+			return '';
+	}
 
 	$num = $matches[2][0] === 'x' ? hexdec(substr($matches[2], 1)) : (int) $matches[2];
 
 	// remove left to right / right to left overrides
 	if ($num === 0x202D || $num === 0x202E)
-		return '';
+	{
+			return '';
+	}
 
 	// Quote, Ampersand, Apostrophe, Less/Greater Than get html replaced
 	if (in_array($num, array(0x22, 0x26, 0x27, 0x3C, 0x3E)))
-		return '&#' . $num . ';';
+	{
+			return '&#' . $num . ';';
+	}
 
 	// <0x20 are control characters, 0x20 is a space, > 0x10FFFF is past the end of the utf8 character set
 	// 0xD800 >= $num <= 0xDFFF are surrogate markers (not valid for utf8 text)
 	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF))
-		return '';
+	{
+			return '';
+	}
 	// <0x80 (or less than 128) are standard ascii characters a-z A-Z 0-9 and punctuation
 	elseif ($num < 0x80)
-		return chr($num);
+	{
+			return chr($num);
+	}
 	// <0x800 (2048)
 	elseif ($num < 0x800)
-		return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+	{
+			return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+	}
 	// < 0x10000 (65536)
 	elseif ($num < 0x10000)
-		return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	{
+			return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	}
 	// <= 0x10FFFF (1114111)
-	else
-		return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
-}
+	else {
+			return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	}
+	}
 
 /**
  * Converts html entities to utf8 equivalents
@@ -1546,27 +1720,38 @@ 
 function fixchar__callback($matches)
 {
 	if (!isset($matches[1]))
-		return '';
+	{
+			return '';
+	}
 
 	$num = $matches[1][0] === 'x' ? hexdec(substr($matches[1], 1)) : (int) $matches[1];
 
 	// <0x20 are control characters, > 0x10FFFF is past the end of the utf8 character set
 	// 0xD800 >= $num <= 0xDFFF are surrogate markers (not valid for utf8 text), 0x202D-E are left to right overrides
 	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num === 0x202D || $num === 0x202E)
-		return '';
+	{
+			return '';
+	}
 	// <0x80 (or less than 128) are standard ascii characters a-z A-Z 0-9 and punctuation
 	elseif ($num < 0x80)
-		return chr($num);
+	{
+			return chr($num);
+	}
 	// <0x800 (2048)
 	elseif ($num < 0x800)
-		return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+	{
+			return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+	}
 	// < 0x10000 (65536)
 	elseif ($num < 0x10000)
-		return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	{
+			return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	}
 	// <= 0x10FFFF (1114111)
-	else
-		return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
-}
+	else {
+			return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	}
+	}
 
 /**
  * Strips out invalid html entities, replaces others with html style &#123; codes
@@ -1583,16 +1768,21 @@ 
 function entity_fix__callback($matches)
 {
 	if (!isset($matches[2]))
-		return '';
+	{
+			return '';
+	}
 
 	$num = $matches[2][0] === 'x' ? hexdec(substr($matches[2], 1)) : (int) $matches[2];
 
 	// We don't allow control characters, characters out of range, byte markers, etc
 	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num == 0x202D || $num == 0x202E)
-		return '';
-	else
-		return '&#' . $num . ';';
-}
+	{
+			return '';
+	}
+	else {
+			return '&#' . $num . ';';
+	}
+	}
 
 /**
  * Retrieve additional search engines, if there are any, as an array.
@@ -1608,7 +1798,9 @@ 
 	{
 		$search_engines = Util::unserialize($modSettings['additional_search_engines']);
 		foreach ($search_engines as $engine)
-			$engines[strtolower(preg_replace('~[^A-Za-z0-9 ]~', '', $engine['name']))] = $engine;
+		{
+					$engines[strtolower(preg_replace('~[^A-Za-z0-9 ]~', '', $engine['name']))] = $engine;
+		}
 	}
 
 	return $engines;
@@ -1634,11 +1826,15 @@ 
 
 	// Start from the beginning...
 	if ($reset)
-		return $db->data_seek($messages_request, 0);
+	{
+			return $db->data_seek($messages_request, 0);
+	}
 
 	// If the query has already returned false, get out of here
 	if (empty($messages_request))
-		return false;
+	{
+			return false;
+	}
 
 	// Attempt to get the next message.
 	$message = $db->fetch_assoc($messages_request);
@@ -1671,22 +1867,32 @@ 
 {
 	// Search for key names or values
 	if ($assoc)
-		$position = array_search($key, array_keys($input), $strict);
-	else
-		$position = array_search($key, $input, $strict);
+	{
+			$position = array_search($key, array_keys($input), $strict);
+	}
+	else {
+			$position = array_search($key, $input, $strict);
+	}
 
 	// If the key is not found, just insert it at the end
 	if ($position === false)
-		return array_merge($input, $insert);
+	{
+			return array_merge($input, $insert);
+	}
 
 	if ($where === 'after')
-		$position++;
+	{
+			$position++;
+	}
 
 	// Insert as first
 	if ($position === 0)
-		$input = array_merge($insert, $input);
-	else
-		$input = array_merge(array_slice($input, 0, $position), $insert, array_slice($input, $position));
+	{
+			$input = array_merge($insert, $input);
+	}
+	else {
+			$input = array_merge(array_slice($input, 0, $position), $insert, array_slice($input, $position));
+	}
 
 	return $input;
 }
@@ -1706,9 +1912,12 @@ 
 	global $modSettings;
 
 	if (!isset($modSettings['scheduleTaskImmediate']))
-		$scheduleTaskImmediate = array();
-	else
-		$scheduleTaskImmediate = Util::unserialize($modSettings['scheduleTaskImmediate']);
+	{
+			$scheduleTaskImmediate = array();
+	}
+	else {
+			$scheduleTaskImmediate = Util::unserialize($modSettings['scheduleTaskImmediate']);
+	}
 
 	// If it has not been scheduled, the do so now
 	if (!isset($scheduleTaskImmediate[$task]))
@@ -1739,9 +1948,12 @@ 
 
 	// Not on, bail
 	if (!isset($modSettings['scheduleTaskImmediate']))
-		return;
-	else
-		$scheduleTaskImmediate = Util::unserialize($modSettings['scheduleTaskImmediate']);
+	{
+			return;
+	}
+	else {
+			$scheduleTaskImmediate = Util::unserialize($modSettings['scheduleTaskImmediate']);
+	}
 
 	// Clear / remove the task if it was set
 	if (isset($scheduleTaskImmediate[$task]))
@@ -1845,10 +2057,13 @@ 
 	$time = trim(file_get_contents(BOARDDIR . '/db_last_error.txt'));
 
 	if (preg_match('~^\d{10}$~', $time) === 1)
-		return $time;
-	else
-		return 0;
-}
+	{
+			return $time;
+	}
+	else {
+			return 0;
+	}
+	}
 
 /**
  * This function has the only task to retrieve the correct prefix to be used
@@ -1867,7 +2082,9 @@ 
 	if ($response_prefix === null && (!$cache->getVar($response_prefix, 'response_prefix') || !$response_prefix))
 	{
 		if ($language === $user_info['language'])
-			$response_prefix = $txt['response_prefix'];
+		{
+					$response_prefix = $txt['response_prefix'];
+		}
 		else
 		{
 			loadLanguage('index', $language, false);
@@ -1895,10 +2112,13 @@ 
 {
 	$value = trim($value);
 	if (filter_var($value, FILTER_VALIDATE_EMAIL) && Util::strlen($value) < 255)
-		return $value;
-	else
-		return false;
-}
+	{
+			return $value;
+	}
+	else {
+			return false;
+	}
+	}
 
 /**
  * Adds a protocol (http/s, ftp/mailto) to the beginning of an url if missing
@@ -2042,7 +2262,9 @@ 
 
 	// Don't know any browser!
 	if (empty($context['browser']))
-		detectBrowser();
+	{
+			detectBrowser();
+	}
 
 	return !empty($context['browser'][$browser]) || !empty($context['browser']['is_' . $browser]) ? true : false;
 }
@@ -2114,7 +2336,9 @@ 
 	foreach ($button_strip as $key => $value)
 	{
 		if (!isset($value['test']) || !empty($context[$value['test']]))
-			return true;
+		{
+					return true;
+		}
 	}
 
 	return false;

Spacing +1 added lines, -1 removed lines

@@ -1918,7 +1918,7 @@
 	}
 	else
 	{
-		$pattern = '~^(' . implode('|', array_map(function ($val) {return preg_quote($val, '~');}, $protocols)) . ')~i';
+		$pattern = '~^(' . implode('|', array_map(function($val) {return preg_quote($val, '~'); }, $protocols)) . ')~i';
 	}
 
 	$found = false;

sources/ext/PasswordHash.php

Braces +82 added lines, -32 removed lines

@@ -25,7 +25,8 @@ 
 # requirements (there can be none), but merely suggestions.
 #
 
-class PasswordHash {
+class PasswordHash
+{
 	var $itoa64;
 	var $iteration_count_log2;
 	var $portable_hashes;
@@ -36,7 +37,9 @@ 
 		$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
 		if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
-			$iteration_count_log2 = 8;
+		{
+					$iteration_count_log2 = 8;
+		}
 		$this->iteration_count_log2 = $iteration_count_log2;
 
 		$this->portable_hashes = $portable_hashes;
@@ -49,25 +52,30 @@ 
 		$output = '';
 
 		// PHP >= 7
-		if (is_callable('random_bytes')) {
+		if (is_callable('random_bytes'))
+		{
 			$output = random_bytes($count);
 		}
 		// *nix
 		elseif (@is_readable('/dev/urandom') &&
-			($fh = @fopen('/dev/urandom', 'rb'))) {
+			($fh = @fopen('/dev/urandom', 'rb')))
+		{
 			$output = fread($fh, $count);
 			fclose($fh);
 		}
 		// This is much to slow on windows php < 5.3.4
 		elseif (function_exists('openssl_random_pseudo_bytes') &&
-			(substr(PHP_OS, 0, 3) !== 'WIN' || version_compare(PHP_VERSION, '5.3.4', '>='))) {
+			(substr(PHP_OS, 0, 3) !== 'WIN' || version_compare(PHP_VERSION, '5.3.4', '>=')))
+		{
 			$output = openssl_random_pseudo_bytes($count);
 		}
 
 		// Do it ourselves then
-		if (strlen($output) < $count) {
+		if (strlen($output) < $count)
+		{
 			$output = '';
-			for ($i = 0; $i < $count; $i += 16) {
+			for ($i = 0; $i < $count; $i += 16)
+			{
 				$this->random_state =
 					md5(microtime() . $this->random_state);
 				$output .=
@@ -83,19 +91,28 @@ 
 	{
 		$output = '';
 		$i = 0;
-		do {
+		do
+		{
 			$value = ord($input[$i++]);
 			$output .= $this->itoa64[$value & 0x3f];
 			if ($i < $count)
-				$value |= ord($input[$i]) << 8;
+			{
+							$value |= ord($input[$i]) << 8;
+			}
 			$output .= $this->itoa64[($value >> 6) & 0x3f];
 			if ($i++ >= $count)
-				break;
+			{
+							break;
+			}
 			if ($i < $count)
-				$value |= ord($input[$i]) << 16;
+			{
+							$value |= ord($input[$i]) << 16;
+			}
 			$output .= $this->itoa64[($value >> 12) & 0x3f];
 			if ($i++ >= $count)
-				break;
+			{
+							break;
+			}
 			$output .= $this->itoa64[($value >> 18) & 0x3f];
 		} while ($i < $count);
 
@@ -116,22 +133,30 @@ 
 	{
 		$output = '*0';
 		if (substr($setting, 0, 2) == $output)
-			$output = '*1';
+		{
+					$output = '*1';
+		}
 
 		$id = substr($setting, 0, 3);
 		# We use "$P$", phpBB3 uses "$H$" for the same thing
 		if ($id != '$P$' && $id != '$H$')
-			return $output;
+		{
+					return $output;
+		}
 
 		$count_log2 = strpos($this->itoa64, $setting[3]);
 		if ($count_log2 < 7 || $count_log2 > 30)
-			return $output;
+		{
+					return $output;
+		}
 
 		$count = 1 << $count_log2;
 
 		$salt = substr($setting, 4, 8);
 		if (strlen($salt) != 8)
-			return $output;
+		{
+					return $output;
+		}
 
 		# We're kind of forced to use MD5 here since it's the only
 		# cryptographic primitive available in all versions of PHP
@@ -139,14 +164,19 @@ 
 		# in PHP would result in much worse performance and
 		# consequently in lower iteration counts and hashes that are
 		# quicker to crack (by non-PHP code).
-		if (PHP_VERSION >= '5') {
+		if (PHP_VERSION >= '5')
+		{
 			$hash = md5($salt . $password, TRUE);
-			do {
+			do
+			{
 				$hash = md5($hash . $password, TRUE);
 			} while (--$count);
-		} else {
+		}
+		else
+		{
 			$hash = pack('H*', md5($salt . $password));
-			do {
+			do
+			{
 				$hash = pack('H*', md5($hash . $password));
 			} while (--$count);
 		}
@@ -193,11 +223,13 @@ 
 		$output .= '$';
 
 		$i = 0;
-		do {
+		do
+		{
 			$c1 = ord($input[$i++]);
 			$output .= $itoa64[$c1 >> 2];
 			$c1 = ($c1 & 0x03) << 4;
-			if ($i >= 16) {
+			if ($i >= 16)
+			{
 				$output .= $itoa64[$c1];
 				break;
 			}
@@ -219,34 +251,48 @@ 
 	public function HashPassword($password)
 	{
 		if ( strlen( $password ) > 4096 )
-			return '*';
+		{
+					return '*';
+		}
 
 		$random = '';
 
-		if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
+		if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes)
+		{
 			$random = $this->get_random_bytes(16);
 			$hash =
 				crypt($password, $this->gensalt_blowfish($random));
 			if (strlen($hash) == 60)
-				return $hash;
+			{
+							return $hash;
+			}
 		}
 
-		if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
+		if (CRYPT_EXT_DES == 1 && !$this->portable_hashes)
+		{
 			if (strlen($random) < 3)
-				$random = $this->get_random_bytes(3);
+			{
+							$random = $this->get_random_bytes(3);
+			}
 			$hash =
 				crypt($password, $this->gensalt_extended($random));
 			if (strlen($hash) == 20)
-				return $hash;
+			{
+							return $hash;
+			}
 		}
 
 		if (strlen($random) < 6)
-			$random = $this->get_random_bytes(6);
+		{
+					$random = $this->get_random_bytes(6);
+		}
 		$hash =
 			$this->crypt_private($password,
 				$this->gensalt_private($random));
 		if (strlen($hash) == 34)
-			return $hash;
+		{
+					return $hash;
+		}
 
 		# Returning '*' on error is safe here, but would _not_ be safe
 		# in a crypt(3)-like function used _both_ for generating new
@@ -257,11 +303,15 @@ 
 	public function CheckPassword($password, $stored_hash)
 	{
 		if ( strlen( $password ) > 4096 )
-			return false;
+		{
+					return false;
+		}
 
 		$hash = $this->crypt_private($password, $stored_hash);
 		if ($hash[0] == '*')
-			$hash = crypt($password, $stored_hash);
+		{
+					$hash = crypt($password, $stored_hash);
+		}
 
 		return $this->_hash_equals($hash, $stored_hash);
 	}

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 
 		$this->portable_hashes = $portable_hashes;
 
-		$this->random_state = microtime() . uniqid(rand(), TRUE);
+		$this->random_state = microtime() . uniqid(rand(), true);
 	}
 
 	private function get_random_bytes($count)
@@ -140,9 +140,9 @@ 
 		# consequently in lower iteration counts and hashes that are
 		# quicker to crack (by non-PHP code).
 		if (PHP_VERSION >= '5') {
-			$hash = md5($salt . $password, TRUE);
+			$hash = md5($salt . $password, true);
 			do {
-				$hash = md5($hash . $password, TRUE);
+				$hash = md5($hash . $password, true);
 			} while (--$count);
 		} else {
 			$hash = pack('H*', md5($salt . $password));

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 	var $portable_hashes;
 	var $random_state;
 
-	public function __construct( $iteration_count_log2, $portable_hashes )
+	public function __construct($iteration_count_log2, $portable_hashes)
 	{
 		$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
@@ -218,7 +218,7 @@ 
 
 	public function HashPassword($password)
 	{
-		if ( strlen( $password ) > 4096 )
+		if (strlen($password) > 4096)
 			return '*';
 
 		$random = '';
@@ -256,7 +256,7 @@ 
 
 	public function CheckPassword($password, $stored_hash)
 	{
-		if ( strlen( $password ) > 4096 )
+		if (strlen($password) > 4096)
 			return false;
 
 		$hash = $this->crypt_private($password, $stored_hash);

sources/ext/bad-behavior/bad-behavior/roundtripdns.inc.php

Braces +16 added lines, -4 removed lines

@@ -1,4 +1,7 @@ 
-<?php if (!defined('BB2_CORE')) die("I said no cheating!");
+<?php if (!defined('BB2_CORE'))
+{
+	die("I said no cheating!");
+}
 
 # Round trip DNS verification
 
@@ -9,12 +12,21 @@ 
 # between no records and error condition
 function bb2_roundtripdns($ip,$domain)
 {
-	if (@is_ipv6($ip)) return $ip;
+	if (@is_ipv6($ip))
+	{
+		return $ip;
+	}
 
 	$host = gethostbyaddr($ip);
 	$host_result = strpos(strrev($host), strrev($domain));
-	if ($host_result === false || $host_result > 0) return false;
+	if ($host_result === false || $host_result > 0)
+	{
+		return false;
+	}
 	$addrs = gethostbynamel($host);
-	if (in_array($ip, $addrs)) return true;
+	if (in_array($ip, $addrs))
+	{
+		return true;
+	}
 	return false;
 }

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 # TODO: Not IPv6 safe
 # FIXME: Returns false on DNS server failure; PHP provides no distinction
 # between no records and error condition
-function bb2_roundtripdns($ip,$domain)
+function bb2_roundtripdns($ip, $domain)
 {
 	if (@is_ipv6($ip)) return $ip;
 

sources/ext/bad-behavior/bad-behavior/whitelist.inc.php

Braces +38 added lines, -14 removed lines

@@ -1,33 +1,57 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+<?php if (!defined('BB2_CORE'))
+{
+	die('I said no cheating!');
+}
 
 function bb2_run_whitelist($package)
 {
 	# FIXME: Transitional, until port maintainters implement bb2_read_whitelist
-	if (function_exists('bb2_read_whitelist')) {
+	if (function_exists('bb2_read_whitelist'))
+	{
 		$whitelists = bb2_read_whitelist();
-	} else {
+	}
+	else
+	{
 		$whitelists = @parse_ini_file(dirname(BB2_CORE) . "/whitelist.ini");
 	}
 
-	if (@!empty($whitelists['ip'])) {
-		foreach (array_filter($whitelists['ip']) as $range) {
-			if (match_cidr($package['ip'], $range)) return true;
+	if (@!empty($whitelists['ip']))
+	{
+		foreach (array_filter($whitelists['ip']) as $range)
+		{
+			if (match_cidr($package['ip'], $range))
+			{
+				return true;
+			}
 		}
 	}
-	if (@!empty($whitelists['useragent'])) {
-		foreach (array_filter($whitelists['useragent']) as $user_agent) {
-			if (!strcmp($package['headers_mixed']['User-Agent'], $user_agent)) return true;
+	if (@!empty($whitelists['useragent']))
+	{
+		foreach (array_filter($whitelists['useragent']) as $user_agent)
+		{
+			if (!strcmp($package['headers_mixed']['User-Agent'], $user_agent))
+			{
+				return true;
+			}
 		}
 	}
-	if (@!empty($whitelists['url'])) {
-		if (strpos($package['request_uri'], "?") === FALSE) {
+	if (@!empty($whitelists['url']))
+	{
+		if (strpos($package['request_uri'], "?") === FALSE)
+		{
 			$request_uri = $package['request_uri'];
-		} else {
+		}
+		else
+		{
 			$request_uri = substr($package['request_uri'], 0, strpos($package['request_uri'], "?"));
 		}
-		foreach (array_filter($whitelists['url']) as $url) {
+		foreach (array_filter($whitelists['url']) as $url)
+		{
 			$pos = strpos($request_uri, $url);
-			if ($pos !== false && $pos == 0) return true;
+			if ($pos !== false && $pos == 0)
+			{
+				return true;
+			}
 		}
 	}
 	return false;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 		}
 	}
 	if (@!empty($whitelists['url'])) {
-		if (strpos($package['request_uri'], "?") === FALSE) {
+		if (strpos($package['request_uri'], "?") === false) {
 			$request_uri = $package['request_uri'];
 		} else {
 			$request_uri = substr($package['request_uri'], 0, strpos($package['request_uri'], "?"));

sources/ext/bad-behavior/bad-behavior/core.inc.php

Braces +185 added lines, -61 removed lines

@@ -1,4 +1,7 @@ 
-<?php if (!defined('BB2_CWD')) die("I said no cheating!");
+<?php if (!defined('BB2_CWD'))
+{
+	die("I said no cheating!");
+}
 define('BB2_VERSION', "2.2.22");
 
 // Bad Behavior entry point is bb2_start()
@@ -18,7 +21,8 @@ 
 	require_once(BB2_CORE . "/banned.inc.php");
 	bb2_display_denial($settings, $package, $key, $previous_key);
 	bb2_log_denial($settings, $package, $key, $previous_key);
-	if (is_callable('bb2_banned_callback')) {
+	if (is_callable('bb2_banned_callback'))
+	{
 		bb2_banned_callback($settings, $package, $key);
 	}
 	// Penalize the spammers some more
@@ -29,12 +33,14 @@ 
 function bb2_approved($settings, $package)
 {
 	// Dirk wanted this
-	if (is_callable('bb2_approved_callback')) {
+	if (is_callable('bb2_approved_callback'))
+	{
 		bb2_approved_callback($settings, $package);
 	}
 
 	// Decide what to log on approved requests.
-	if (($settings['verbose'] && $settings['logging']) || empty($package['user_agent'])) {
+	if (($settings['verbose'] && $settings['logging']) || empty($package['user_agent']))
+	{
 		bb2_db_query(bb2_insert($settings, $package, "00000000"));
 	}
 }
@@ -44,21 +50,29 @@ 
 {
 	# Detect if option is on when it should be off
 	$header = uc_all($settings['reverse_proxy_header']);
-	if (!array_key_exists($header, $headers_mixed)) {
+	if (!array_key_exists($header, $headers_mixed))
+	{
 		return false;
 	}
 	
 	$addrs = @array_reverse(preg_split("/[\s,]+/", $headers_mixed[$header]));
 	# Skip our known reverse proxies and private addresses
-	if (!empty($settings['reverse_proxy_addresses'])) {
-		foreach ($addrs as $addr) {
-			if (!match_cidr($addr, $settings['reverse_proxy_addresses']) && !is_rfc1918($addr)) {
+	if (!empty($settings['reverse_proxy_addresses']))
+	{
+		foreach ($addrs as $addr)
+		{
+			if (!match_cidr($addr, $settings['reverse_proxy_addresses']) && !is_rfc1918($addr))
+			{
 				return $addr;
 			}
 		}
-	} else {
-		foreach ($addrs as $addr) {
-			if (!is_rfc1918($addr)) {
+	}
+	else
+	{
+		foreach ($addrs as $addr)
+		{
+			if (!is_rfc1918($addr))
+			{
 				return $addr;
 			}
 		}
@@ -71,10 +85,13 @@ 
 function bb2_unpack_php_post_array($key, $value)
 {
 	$unpacked = array();
-	foreach ($value as $k => $v) {
+	foreach ($value as $k => $v)
+	{
 		$i = $key. '[' . $k . ']';
 		if (is_array($v))
-			$v = bb2_unpack_php_post_array($i, $v);
+		{
+					$v = bb2_unpack_php_post_array($i, $v);
+		}
 		$unpacked[$i] = $v;
 	}
 	return $unpacked;
@@ -88,7 +105,8 @@ 
 	// Postprocess the headers to mixed-case
 	// TODO: get the world to stop using PHP as CGI
 	$headers_mixed = array();
-	foreach ($headers as $h => $v) {
+	foreach ($headers as $h => $v)
+	{
 		$headers_mixed[uc_all($h)] = $v;
 	}
 
@@ -97,9 +115,12 @@ 
 
 	// Reconstruct the HTTP entity, if present.
 	$request_entity = array();
-	if (isset($_SERVER['REQUEST_METHOD']) && (!strcasecmp($_SERVER['REQUEST_METHOD'], "POST") || !strcasecmp($_SERVER['REQUEST_METHOD'], "PUT"))) {
-		foreach ($_POST as $h => $v) {
-			if (is_array($v)) {
+	if (isset($_SERVER['REQUEST_METHOD']) && (!strcasecmp($_SERVER['REQUEST_METHOD'], "POST") || !strcasecmp($_SERVER['REQUEST_METHOD'], "PUT")))
+	{
+		foreach ($_POST as $h => $v)
+		{
+			if (is_array($v))
+			{
 				# Workaround, see Bug #12
 				$v = "Array";
 			}
@@ -108,19 +129,29 @@ 
 	}
 
 	$request_uri = $_SERVER["REQUEST_URI"];
-	if (!$request_uri) $request_uri = $_SERVER['SCRIPT_NAME'];	# IIS
+	if (!$request_uri)
+	{
+		$request_uri = $_SERVER['SCRIPT_NAME'];
+	}
+	# IIS
 
-	if ($settings['reverse_proxy'] && $ip = bb2_reverse_proxy($settings, $headers_mixed)) {
+	if ($settings['reverse_proxy'] && $ip = bb2_reverse_proxy($settings, $headers_mixed))
+	{
 		$headers['X-Bad-Behavior-Remote-Address'] = $_SERVER['REMOTE_ADDR'];
 		$headers_mixed['X-Bad-Behavior-Remote-Address'] = $_SERVER['REMOTE_ADDR'];
-	} else {
+	}
+	else
+	{
 		$ip = $_SERVER['REMOTE_ADDR'];
 	}
 
 	@$package = array('ip' => $ip, 'headers' => $headers, 'headers_mixed' => $headers_mixed, 'request_method' => $_SERVER['REQUEST_METHOD'], 'request_uri' => $request_uri, 'server_protocol' => $_SERVER['SERVER_PROTOCOL'], 'request_entity' => $request_entity, 'user_agent' => $_SERVER['HTTP_USER_AGENT'], 'is_browser' => false,);
 
 	$result = bb2_screen($settings, $package);
-	if ($result && !defined('BB2_TEST')) bb2_banned($settings, $package, $result);
+	if ($result && !defined('BB2_TEST'))
+	{
+		bb2_banned($settings, $package, $result);
+	}
 	return $result;
 }
 
@@ -131,102 +162,195 @@ 
 
 	// CloudFlare-specific checks not handled by reverse proxy code
 	// Thanks to butchs at Simple Machines
-	if (array_key_exists('Cf-Connecting-Ip', $package['headers_mixed'])) {
+	if (array_key_exists('Cf-Connecting-Ip', $package['headers_mixed']))
+	{
 		require_once(BB2_CORE . "/cloudflare.inc.php");
 		$r = bb2_cloudflare($package);
-		if ($r !== false && $r != $package['ip']) return $r;
+		if ($r !== false && $r != $package['ip'])
+		{
+			return $r;
+		}
 	}
 
 	// First check the whitelist
 	require_once(BB2_CORE . "/whitelist.inc.php");
-	if (!bb2_run_whitelist($package)) {
+	if (!bb2_run_whitelist($package))
+	{
 		// Now check the blacklist
 		require_once(BB2_CORE . "/blacklist.inc.php");
-		if ($r = bb2_blacklist($package)) return $r;
+		if ($r = bb2_blacklist($package))
+		{
+			return $r;
+		}
 
 		// Check the http:BL
 		require_once(BB2_CORE . "/blackhole.inc.php");
-		if ($r = bb2_httpbl($settings, $package)) {
-			if ($r == 1) return false;	# whitelisted
+		if ($r = bb2_httpbl($settings, $package))
+		{
+			if ($r == 1)
+			{
+				return false;
+			}
+			# whitelisted
 			return $r;
 		}
 
 		// Check for common stuff
 		require_once(BB2_CORE . "/common_tests.inc.php");
-		if ($r = bb2_protocol($settings, $package)) return $r;
-		if ($r = bb2_cookies($settings, $package)) return $r;
-		if ($r = bb2_misc_headers($settings, $package)) return $r;
+		if ($r = bb2_protocol($settings, $package))
+		{
+			return $r;
+		}
+		if ($r = bb2_cookies($settings, $package))
+		{
+			return $r;
+		}
+		if ($r = bb2_misc_headers($settings, $package))
+		{
+			return $r;
+		}
 
 		// Specific checks
 		@$ua = $package['user_agent'];
 		// Search engine checks come first
-		if (stripos($ua, "bingbot") !== FALSE || stripos($ua, "msnbot") !== FALSE || stripos($ua, "MS Search") !== FALSE) {
+		if (stripos($ua, "bingbot") !== FALSE || stripos($ua, "msnbot") !== FALSE || stripos($ua, "MS Search") !== FALSE)
+		{
 			require_once(BB2_CORE . "/searchengine.inc.php");
-			if ($r = bb2_msnbot($package)) {
-				if ($r == 1) return false;	# whitelisted
+			if ($r = bb2_msnbot($package))
+			{
+				if ($r == 1)
+				{
+					return false;
+				}
+				# whitelisted
 				return $r;
 			}
 			return false;
-		} elseif (stripos($ua, "Googlebot") !== FALSE || stripos($ua, "Mediapartners-Google") !== FALSE || stripos($ua, "Google Web Preview") !== FALSE) {
+		}
+		elseif (stripos($ua, "Googlebot") !== FALSE || stripos($ua, "Mediapartners-Google") !== FALSE || stripos($ua, "Google Web Preview") !== FALSE)
+		{
 			require_once(BB2_CORE . "/searchengine.inc.php");
-			if ($r = bb2_google($package)) {
-				if ($r == 1) return false;	# whitelisted
+			if ($r = bb2_google($package))
+			{
+				if ($r == 1)
+				{
+					return false;
+				}
+				# whitelisted
 				return $r;
 			}
 			return false;
-		} elseif (stripos($ua, "Yahoo! Slurp") !== FALSE || stripos($ua, "Yahoo! SearchMonkey") !== FALSE) {
+		}
+		elseif (stripos($ua, "Yahoo! Slurp") !== FALSE || stripos($ua, "Yahoo! SearchMonkey") !== FALSE)
+		{
 			require_once(BB2_CORE . "/searchengine.inc.php");
-			if ($r = bb2_yahoo($package)) {
-				if ($r == 1) return false;	# whitelisted
+			if ($r = bb2_yahoo($package))
+			{
+				if ($r == 1)
+				{
+					return false;
+				}
+				# whitelisted
 				return $r;
 			}
 			return false;
-		} elseif (stripos($ua, "Baidu") !== FALSE) {
+		}
+		elseif (stripos($ua, "Baidu") !== FALSE)
+		{
 			require_once(BB2_CORE . "/searchengine.inc.php");
-			if ($r = bb2_baidu($package)) {
-				if ($r == 1) return false;	# whitelisted
+			if ($r = bb2_baidu($package))
+			{
+				if ($r == 1)
+				{
+					return false;
+				}
+				# whitelisted
 				return $r;
 			}
 			return false;
 		}
 		// MSIE checks
-		if (stripos($ua, "; MSIE") !== FALSE) {
+		if (stripos($ua, "; MSIE") !== FALSE)
+		{
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
-			if (stripos($ua, "Opera") !== FALSE) {
-				if ($r = bb2_opera($package)) return $r;
-			} else {
-				if ($r = bb2_msie($package)) return $r;
+			if (stripos($ua, "Opera") !== FALSE)
+			{
+				if ($r = bb2_opera($package))
+				{
+					return $r;
+				}
 			}
-		} elseif (stripos($ua, "Konqueror") !== FALSE) {
+			else
+			{
+				if ($r = bb2_msie($package))
+				{
+					return $r;
+				}
+			}
+		}
+		elseif (stripos($ua, "Konqueror") !== FALSE)
+		{
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
-			if ($r = bb2_konqueror($package)) return $r;
-		} elseif (stripos($ua, "Opera") !== FALSE) {
+			if ($r = bb2_konqueror($package))
+			{
+				return $r;
+			}
+		}
+		elseif (stripos($ua, "Opera") !== FALSE)
+		{
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
-			if ($r = bb2_opera($package)) return $r;
-		} elseif (stripos($ua, "Safari") !== FALSE) {
+			if ($r = bb2_opera($package))
+			{
+				return $r;
+			}
+		}
+		elseif (stripos($ua, "Safari") !== FALSE)
+		{
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
-			if ($r = bb2_safari($package)) return $r;
-		} elseif (stripos($ua, "Lynx") !== FALSE) {
+			if ($r = bb2_safari($package))
+			{
+				return $r;
+			}
+		}
+		elseif (stripos($ua, "Lynx") !== FALSE)
+		{
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
-			if ($r = bb2_lynx($package)) return $r;
-		} elseif (stripos($ua, "MovableType") !== FALSE) {
+			if ($r = bb2_lynx($package))
+			{
+				return $r;
+			}
+		}
+		elseif (stripos($ua, "MovableType") !== FALSE)
+		{
 			require_once(BB2_CORE . "/movabletype.inc.php");
-			if ($r = bb2_movabletype($package)) return $r;
-		} elseif (stripos($ua, "Mozilla") !== FALSE && stripos($ua, "Mozilla") == 0) {
+			if ($r = bb2_movabletype($package))
+			{
+				return $r;
+			}
+		}
+		elseif (stripos($ua, "Mozilla") !== FALSE && stripos($ua, "Mozilla") == 0)
+		{
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
-			if ($r = bb2_mozilla($package)) return $r;
+			if ($r = bb2_mozilla($package))
+			{
+				return $r;
+			}
 		}
 
 		// More intensive screening applies to POST requests
-		if (!strcasecmp('POST', $package['request_method'])) {
+		if (!strcasecmp('POST', $package['request_method']))
+		{
 			require_once(BB2_CORE . "/post.inc.php");
-			if ($r = bb2_post($settings, $package)) return $r;
+			if ($r = bb2_post($settings, $package))
+			{
+				return $r;
+			}
 		}
 	}
 

Upper-Lower-Casing +12 added lines, -12 removed lines

@@ -160,28 +160,28 @@ 
 		// Specific checks
 		@$ua = $package['user_agent'];
 		// Search engine checks come first
-		if (stripos($ua, "bingbot") !== FALSE || stripos($ua, "msnbot") !== FALSE || stripos($ua, "MS Search") !== FALSE) {
+		if (stripos($ua, "bingbot") !== false || stripos($ua, "msnbot") !== false || stripos($ua, "MS Search") !== false) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_msnbot($package)) {
 				if ($r == 1) return false;	# whitelisted
 				return $r;
 			}
 			return false;
-		} elseif (stripos($ua, "Googlebot") !== FALSE || stripos($ua, "Mediapartners-Google") !== FALSE || stripos($ua, "Google Web Preview") !== FALSE) {
+		} elseif (stripos($ua, "Googlebot") !== false || stripos($ua, "Mediapartners-Google") !== false || stripos($ua, "Google Web Preview") !== false) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_google($package)) {
 				if ($r == 1) return false;	# whitelisted
 				return $r;
 			}
 			return false;
-		} elseif (stripos($ua, "Yahoo! Slurp") !== FALSE || stripos($ua, "Yahoo! SearchMonkey") !== FALSE) {
+		} elseif (stripos($ua, "Yahoo! Slurp") !== false || stripos($ua, "Yahoo! SearchMonkey") !== false) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_yahoo($package)) {
 				if ($r == 1) return false;	# whitelisted
 				return $r;
 			}
 			return false;
-		} elseif (stripos($ua, "Baidu") !== FALSE) {
+		} elseif (stripos($ua, "Baidu") !== false) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_baidu($package)) {
 				if ($r == 1) return false;	# whitelisted
@@ -190,34 +190,34 @@ 
 			return false;
 		}
 		// MSIE checks
-		if (stripos($ua, "; MSIE") !== FALSE) {
+		if (stripos($ua, "; MSIE") !== false) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
-			if (stripos($ua, "Opera") !== FALSE) {
+			if (stripos($ua, "Opera") !== false) {
 				if ($r = bb2_opera($package)) return $r;
 			} else {
 				if ($r = bb2_msie($package)) return $r;
 			}
-		} elseif (stripos($ua, "Konqueror") !== FALSE) {
+		} elseif (stripos($ua, "Konqueror") !== false) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
 			if ($r = bb2_konqueror($package)) return $r;
-		} elseif (stripos($ua, "Opera") !== FALSE) {
+		} elseif (stripos($ua, "Opera") !== false) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
 			if ($r = bb2_opera($package)) return $r;
-		} elseif (stripos($ua, "Safari") !== FALSE) {
+		} elseif (stripos($ua, "Safari") !== false) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
 			if ($r = bb2_safari($package)) return $r;
-		} elseif (stripos($ua, "Lynx") !== FALSE) {
+		} elseif (stripos($ua, "Lynx") !== false) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
 			if ($r = bb2_lynx($package)) return $r;
-		} elseif (stripos($ua, "MovableType") !== FALSE) {
+		} elseif (stripos($ua, "MovableType") !== false) {
 			require_once(BB2_CORE . "/movabletype.inc.php");
 			if ($r = bb2_movabletype($package)) return $r;
-		} elseif (stripos($ua, "Mozilla") !== FALSE && stripos($ua, "Mozilla") == 0) {
+		} elseif (stripos($ua, "Mozilla") !== false && stripos($ua, "Mozilla") == 0) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
 			if ($r = bb2_mozilla($package)) return $r;

Spacing +8 added lines, -8 removed lines

@@ -10,7 +10,7 @@ 
 require_once(BB2_CORE . "/functions.inc.php");
 
 // Kill 'em all!
-function bb2_banned($settings, $package, $key, $previous_key=false)
+function bb2_banned($settings, $package, $key, $previous_key = false)
 {
 	// Some spambots hit too hard. Slow them down a bit.
 	sleep(2);
@@ -72,7 +72,7 @@ 
 {
 	$unpacked = array();
 	foreach ($value as $k => $v) {
-		$i = $key. '[' . $k . ']';
+		$i = $key . '[' . $k . ']';
 		if (is_array($v))
 			$v = bb2_unpack_php_post_array($i, $v);
 		$unpacked[$i] = $v;
@@ -108,7 +108,7 @@ 
 	}
 
 	$request_uri = $_SERVER["REQUEST_URI"];
-	if (!$request_uri) $request_uri = $_SERVER['SCRIPT_NAME'];	# IIS
+	if (!$request_uri) $request_uri = $_SERVER['SCRIPT_NAME']; # IIS
 
 	if ($settings['reverse_proxy'] && $ip = bb2_reverse_proxy($settings, $headers_mixed)) {
 		$headers['X-Bad-Behavior-Remote-Address'] = $_SERVER['REMOTE_ADDR'];
@@ -147,7 +147,7 @@ 
 		// Check the http:BL
 		require_once(BB2_CORE . "/blackhole.inc.php");
 		if ($r = bb2_httpbl($settings, $package)) {
-			if ($r == 1) return false;	# whitelisted
+			if ($r == 1) return false; # whitelisted
 			return $r;
 		}
 
@@ -163,28 +163,28 @@ 
 		if (stripos($ua, "bingbot") !== FALSE || stripos($ua, "msnbot") !== FALSE || stripos($ua, "MS Search") !== FALSE) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_msnbot($package)) {
-				if ($r == 1) return false;	# whitelisted
+				if ($r == 1) return false; # whitelisted
 				return $r;
 			}
 			return false;
 		} elseif (stripos($ua, "Googlebot") !== FALSE || stripos($ua, "Mediapartners-Google") !== FALSE || stripos($ua, "Google Web Preview") !== FALSE) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_google($package)) {
-				if ($r == 1) return false;	# whitelisted
+				if ($r == 1) return false; # whitelisted
 				return $r;
 			}
 			return false;
 		} elseif (stripos($ua, "Yahoo! Slurp") !== FALSE || stripos($ua, "Yahoo! SearchMonkey") !== FALSE) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_yahoo($package)) {
-				if ($r == 1) return false;	# whitelisted
+				if ($r == 1) return false; # whitelisted
 				return $r;
 			}
 			return false;
 		} elseif (stripos($ua, "Baidu") !== FALSE) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_baidu($package)) {
-				if ($r == 1) return false;	# whitelisted
+				if ($r == 1) return false; # whitelisted
 				return $r;
 			}
 			return false;

sources/ext/bad-behavior/bad-behavior/searchengine.inc.php

Braces +32 added lines, -9 removed lines

@@ -1,4 +1,7 @@ 
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+<?php if (!defined('BB2_CORE'))
+{
+	die('I said no cheating!');
+}
 
 require_once(BB2_CORE . "/roundtripdns.inc.php");
 
@@ -6,8 +9,13 @@ 
 
 function bb2_google($package)
 {
-	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("66.249.64.0/19", "64.233.160.0/19", "72.14.192.0/18", "203.208.32.0/19", "74.125.0.0/16", "216.239.32.0/19", "209.85.128.0/17")) === FALSE) {
+	if (@is_ipv6($package['ip']))
+	{
+		return false;
+	}
+	# TODO
+	if (match_cidr($package['ip'], array("66.249.64.0/19", "64.233.160.0/19", "72.14.192.0/18", "203.208.32.0/19", "74.125.0.0/16", "216.239.32.0/19", "209.85.128.0/17")) === FALSE)
+	{
 		return false;	# Soft fail, must pass other screening
 		#return "f1182195";	# Hard fail
 	}
@@ -22,8 +30,13 @@ 
 
 function bb2_msnbot($package)
 {
-	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("207.46.0.0/16", "65.52.0.0/14", "207.68.128.0/18", "207.68.192.0/20", "64.4.0.0/18", "157.54.0.0/15", "157.60.0.0/16", "157.56.0.0/14", "131.253.21.0/24", "131.253.22.0/23", "131.253.24.0/21", "131.253.32.0/20", "40.76.0.0/14")) === FALSE) {
+	if (@is_ipv6($package['ip']))
+	{
+		return false;
+	}
+	# TODO
+	if (match_cidr($package['ip'], array("207.46.0.0/16", "65.52.0.0/14", "207.68.128.0/18", "207.68.192.0/20", "64.4.0.0/18", "157.54.0.0/15", "157.60.0.0/16", "157.56.0.0/14", "131.253.21.0/24", "131.253.22.0/23", "131.253.24.0/21", "131.253.32.0/20", "40.76.0.0/14")) === FALSE)
+	{
 		return false;	# Soft fail, must pass other screening
 		#return "e4de0453";	# Hard fail
 	}
@@ -38,8 +51,13 @@ 
 
 function bb2_yahoo($package)
 {
-	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("202.160.176.0/20", "67.195.0.0/16", "203.209.252.0/24", "72.30.0.0/16", "98.136.0.0/14", "74.6.0.0/16")) === FALSE) {
+	if (@is_ipv6($package['ip']))
+	{
+		return false;
+	}
+	# TODO
+	if (match_cidr($package['ip'], array("202.160.176.0/20", "67.195.0.0/16", "203.209.252.0/24", "72.30.0.0/16", "98.136.0.0/14", "74.6.0.0/16")) === FALSE)
+	{
 		return false;	# Soft fail, must pass other screening
 		#return '71436a15';	# Hard fail
 	}
@@ -54,8 +72,13 @@ 
 
 function bb2_baidu($package)
 {
-	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("119.63.192.0/21", "123.125.71.0/24", "180.76.0.0/16", "220.181.0.0/16")) === FALSE) {
+	if (@is_ipv6($package['ip']))
+	{
+		return false;
+	}
+	# TODO
+	if (match_cidr($package['ip'], array("119.63.192.0/21", "123.125.71.0/24", "180.76.0.0/16", "220.181.0.0/16")) === FALSE)
+	{
 		return false;	# Soft fail, must pass other screening
 	}
 	return 1;	# Real Baidu bot; bypass all other checks

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
 function bb2_google($package)
 {
 	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("66.249.64.0/19", "64.233.160.0/19", "72.14.192.0/18", "203.208.32.0/19", "74.125.0.0/16", "216.239.32.0/19", "209.85.128.0/17")) === FALSE) {
+	if (match_cidr($package['ip'], array("66.249.64.0/19", "64.233.160.0/19", "72.14.192.0/18", "203.208.32.0/19", "74.125.0.0/16", "216.239.32.0/19", "209.85.128.0/17")) === false) {
 		return false;	# Soft fail, must pass other screening
 		#return "f1182195";	# Hard fail
 	}
@@ -23,7 +23,7 @@ 
 function bb2_msnbot($package)
 {
 	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("207.46.0.0/16", "65.52.0.0/14", "207.68.128.0/18", "207.68.192.0/20", "64.4.0.0/18", "157.54.0.0/15", "157.60.0.0/16", "157.56.0.0/14", "131.253.21.0/24", "131.253.22.0/23", "131.253.24.0/21", "131.253.32.0/20", "40.76.0.0/14")) === FALSE) {
+	if (match_cidr($package['ip'], array("207.46.0.0/16", "65.52.0.0/14", "207.68.128.0/18", "207.68.192.0/20", "64.4.0.0/18", "157.54.0.0/15", "157.60.0.0/16", "157.56.0.0/14", "131.253.21.0/24", "131.253.22.0/23", "131.253.24.0/21", "131.253.32.0/20", "40.76.0.0/14")) === false) {
 		return false;	# Soft fail, must pass other screening
 		#return "e4de0453";	# Hard fail
 	}
@@ -39,7 +39,7 @@ 
 function bb2_yahoo($package)
 {
 	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("202.160.176.0/20", "67.195.0.0/16", "203.209.252.0/24", "72.30.0.0/16", "98.136.0.0/14", "74.6.0.0/16")) === FALSE) {
+	if (match_cidr($package['ip'], array("202.160.176.0/20", "67.195.0.0/16", "203.209.252.0/24", "72.30.0.0/16", "98.136.0.0/14", "74.6.0.0/16")) === false) {
 		return false;	# Soft fail, must pass other screening
 		#return '71436a15';	# Hard fail
 	}
@@ -55,7 +55,7 @@ 
 function bb2_baidu($package)
 {
 	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("119.63.192.0/21", "123.125.71.0/24", "180.76.0.0/16", "220.181.0.0/16")) === FALSE) {
+	if (match_cidr($package['ip'], array("119.63.192.0/21", "123.125.71.0/24", "180.76.0.0/16", "220.181.0.0/16")) === false) {
 		return false;	# Soft fail, must pass other screening
 	}
 	return 1;	# Real Baidu bot; bypass all other checks

Spacing +12 added lines, -12 removed lines

@@ -6,57 +6,57 @@
 
 function bb2_google($package)
 {
-	if (@is_ipv6($package['ip'])) return false;	# TODO
+	if (@is_ipv6($package['ip'])) return false; # TODO
 	if (match_cidr($package['ip'], array("66.249.64.0/19", "64.233.160.0/19", "72.14.192.0/18", "203.208.32.0/19", "74.125.0.0/16", "216.239.32.0/19", "209.85.128.0/17")) === FALSE) {
-		return false;	# Soft fail, must pass other screening
+		return false; # Soft fail, must pass other screening
 		#return "f1182195";	# Hard fail
 	}
 #	Disabled due to http://bugs.php.net/bug.php?id=53092
 #	if (!bb2_roundtripdns($package['ip'], "googlebot.com")) {
 #		return "f1182195";
 #	}
-	return 1;	# Real Googlebot; bypass all other checks
+	return 1; # Real Googlebot; bypass all other checks
 }
 
 // Analyze user agents claiming to be msnbot
 
 function bb2_msnbot($package)
 {
-	if (@is_ipv6($package['ip'])) return false;	# TODO
+	if (@is_ipv6($package['ip'])) return false; # TODO
 	if (match_cidr($package['ip'], array("207.46.0.0/16", "65.52.0.0/14", "207.68.128.0/18", "207.68.192.0/20", "64.4.0.0/18", "157.54.0.0/15", "157.60.0.0/16", "157.56.0.0/14", "131.253.21.0/24", "131.253.22.0/23", "131.253.24.0/21", "131.253.32.0/20", "40.76.0.0/14")) === FALSE) {
-		return false;	# Soft fail, must pass other screening
+		return false; # Soft fail, must pass other screening
 		#return "e4de0453";	# Hard fail
 	}
 #	Disabled due to http://bugs.php.net/bug.php?id=53092
 #	if (!bb2_roundtripdns($package['ip'], "msn.com")) {
 #		return "e4de0453";
 #	}
-	return 1;	# Real msnbot; bypass all other checks
+	return 1; # Real msnbot; bypass all other checks
 }
 
 // Analyze user agents claiming to be Yahoo!
 
 function bb2_yahoo($package)
 {
-	if (@is_ipv6($package['ip'])) return false;	# TODO
+	if (@is_ipv6($package['ip'])) return false; # TODO
 	if (match_cidr($package['ip'], array("202.160.176.0/20", "67.195.0.0/16", "203.209.252.0/24", "72.30.0.0/16", "98.136.0.0/14", "74.6.0.0/16")) === FALSE) {
-		return false;	# Soft fail, must pass other screening
+		return false; # Soft fail, must pass other screening
 		#return '71436a15';	# Hard fail
 	}
 #	Disabled due to http://bugs.php.net/bug.php?id=53092
 #	if (!bb2_roundtripdns($package['ip'], "crawl.yahoo.net")) {
 #		return "71436a15";
 #	}
-	return 1;	# Real Yahoo bot; bypass all other checks
+	return 1; # Real Yahoo bot; bypass all other checks
 }
 
 // Analyze user agents claiming to be Baidu
 
 function bb2_baidu($package)
 {
-	if (@is_ipv6($package['ip'])) return false;	# TODO
+	if (@is_ipv6($package['ip'])) return false; # TODO
 	if (match_cidr($package['ip'], array("119.63.192.0/21", "123.125.71.0/24", "180.76.0.0/16", "220.181.0.0/16")) === FALSE) {
-		return false;	# Soft fail, must pass other screening
+		return false; # Soft fail, must pass other screening
 	}
-	return 1;	# Real Baidu bot; bypass all other checks
+	return 1; # Real Baidu bot; bypass all other checks
 }

sources/ext/bad-behavior/bad-behavior/responses.inc.php

Braces +10 added lines, -3 removed lines

@@ -1,8 +1,12 @@ 
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+<?php if (!defined('BB2_CORE'))
+{
+	die('I said no cheating!');
+}
 
 // Defines the responses which Bad Behavior might return.
 
-function bb2_get_response($key) {
+function bb2_get_response($key)
+{
 	$bb2_responses = array(
 		'00000000' => array('response' => 200, 'explanation' => '', 'log' => 'Permitted'),
 		'136673cd' => array('response' => 403, 'explanation' => 'Your Internet Protocol address is listed on a blacklist of addresses involved in malicious or illegal activity. See the listing below for more details on specific blacklists and removal procedures.', 'log' => 'IP address found on external blacklist'),
@@ -47,6 +51,9 @@ 
 		'f9f2b8b9' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. This may be caused by a malfunctioning proxy server or browser privacy software.', 'log' => 'A User-Agent is required but none was provided.'),
 	);
 
-	if (array_key_exists($key, $bb2_responses)) return $bb2_responses[$key];
+	if (array_key_exists($key, $bb2_responses))
+	{
+		return $bb2_responses[$key];
+	}
 	return array('00000000');
 }

sources/ext/bad-behavior/bad-behavior/post.inc.php

Braces +26 added lines, -12 removed lines

@@ -1,15 +1,20 @@ 
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+<?php if (!defined('BB2_CORE'))
+{
+	die('I said no cheating!');
+}
 
 // Specialized screening for trackbacks
 function bb2_trackback($package)
 {
 	// Web browsers don't send trackbacks
-	if ($package['is_browser']) {
+	if ($package['is_browser'])
+	{
 		return 'f0dcb3fd';
 	}
 
 	// Proxy servers don't send trackbacks either
-	if (array_key_exists('Via', $package['headers_mixed']) || array_key_exists('Max-Forwards', $package['headers_mixed']) || array_key_exists('X-Forwarded-For', $package['headers_mixed']) || array_key_exists('Client-Ip', $package['headers_mixed'])) {
+	if (array_key_exists('Via', $package['headers_mixed']) || array_key_exists('Max-Forwards', $package['headers_mixed']) || array_key_exists('X-Forwarded-For', $package['headers_mixed']) || array_key_exists('Client-Ip', $package['headers_mixed']))
+	{
 		return 'd60b87c7';
 	}
 
@@ -17,8 +22,10 @@ 
 	// Real ones do not contain Accept:, and have a charset defined
 	// Real WP trackbacks may contain Accept: depending on the HTTP
 	// transport being used by the sending host
-	if (strpos($package['headers_mixed']['User-Agent'], "WordPress/") !== FALSE) {
-		if (strpos($package['headers_mixed']['Content-Type'], "charset=") === FALSE) {
+	if (strpos($package['headers_mixed']['User-Agent'], "WordPress/") !== FALSE)
+	{
+		if (strpos($package['headers_mixed']['Content-Type'], "charset=") === FALSE)
+		{
 			return 'e3990b47';
 		}
 	}
@@ -33,34 +40,41 @@ 
 	// if ($r = bb2_blackhole($package)) return $r;
 
 	// MovableType needs specialized screening
-	if (stripos($package['headers_mixed']['User-Agent'], "MovableType") !== FALSE) {
-		if (strcmp($package['headers_mixed']['Range'], "bytes=0-99999")) {
+	if (stripos($package['headers_mixed']['User-Agent'], "MovableType") !== FALSE)
+	{
+		if (strcmp($package['headers_mixed']['Range'], "bytes=0-99999"))
+		{
 			return "7d12528e";
 		}
 	}
 
 	// Trackbacks need special screening
 	$request_entity = $package['request_entity'];
-	if (isset($request_entity['title']) && isset($request_entity['url']) && isset($request_entity['blog_name'])) {
+	if (isset($request_entity['title']) && isset($request_entity['url']) && isset($request_entity['blog_name']))
+	{
 		return bb2_trackback($package);
 	}
 
 	// Catch a few completely broken spambots
-	foreach ($request_entity as $key => $value) {
+	foreach ($request_entity as $key => $value)
+	{
 		$pos = strpos($key, "	document.write");
-		if ($pos !== FALSE) {
+		if ($pos !== FALSE)
+		{
 			return "dfd9b1ad";
 		}
 	}
 
 	// If Referer exists, it should refer to a page on our site
-	if (!$settings['offsite_forms'] && array_key_exists('Referer', $package['headers_mixed'])) {
+	if (!$settings['offsite_forms'] && array_key_exists('Referer', $package['headers_mixed']))
+	{
 		$url = parse_url($package['headers_mixed']['Referer']);
 		$url['host'] = preg_replace('|^www\.|', '', $url['host']);
 		$host = preg_replace('|^www\.|', '', $package['headers_mixed']['Host']);
 		# Strip port
 		$host = preg_replace('|:\d+$|', '', $host);
-		if (strcasecmp($host, $url['host'])) {
+		if (strcasecmp($host, $url['host']))
+		{
 			return "cd361abb";
 		}
 	}

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -17,8 +17,8 @@ 
 	// Real ones do not contain Accept:, and have a charset defined
 	// Real WP trackbacks may contain Accept: depending on the HTTP
 	// transport being used by the sending host
-	if (strpos($package['headers_mixed']['User-Agent'], "WordPress/") !== FALSE) {
-		if (strpos($package['headers_mixed']['Content-Type'], "charset=") === FALSE) {
+	if (strpos($package['headers_mixed']['User-Agent'], "WordPress/") !== false) {
+		if (strpos($package['headers_mixed']['Content-Type'], "charset=") === false) {
 			return 'e3990b47';
 		}
 	}
@@ -33,7 +33,7 @@ 
 	// if ($r = bb2_blackhole($package)) return $r;
 
 	// MovableType needs specialized screening
-	if (stripos($package['headers_mixed']['User-Agent'], "MovableType") !== FALSE) {
+	if (stripos($package['headers_mixed']['User-Agent'], "MovableType") !== false) {
 		if (strcmp($package['headers_mixed']['Range'], "bytes=0-99999")) {
 			return "7d12528e";
 		}
@@ -48,7 +48,7 @@ 
 	// Catch a few completely broken spambots
 	foreach ($request_entity as $key => $value) {
 		$pos = strpos($key, "	document.write");
-		if ($pos !== FALSE) {
+		if ($pos !== false) {
 			return "dfd9b1ad";
 		}
 	}