elkarte / Elkarte

themes/default/BoardIndex.template.php

Braces +39 added lines, -13 removed lines

@@ -36,7 +36,9 @@ 
 	{
 		// If there are no parent boards we can see, avoid showing an empty category (unless its collapsed).
 		if (empty($category['boards']) && !$category['is_collapsed'])
-			continue;
+		{
+					continue;
+		}
 
 		// @todo - Invent nifty class name for boardindex header bars.
 		echo '
@@ -45,8 +47,10 @@ 
 
 		// If this category even can collapse, show a link to collapse it.
 		if ($category['can_collapse'])
-			echo '
+		{
+					echo '
 			<a class="chevricon i-chevron-', $category['is_collapsed'] ? 'down' : 'up', '" href="', $category['collapse_href'], '" title="', $category['is_collapsed'] ? $txt['show'] : $txt['hide'], '"></a>';
+		}
 
 		// The "category link" is only a link for logged in members. Guests just get the name.
 		echo '
@@ -56,7 +60,9 @@ 
 
 		// Assuming the category hasn't been collapsed...
 		if (!$category['is_collapsed'])
-			template_list_boards($category['boards'], 'category_' . $category['id'] . '_boards');
+		{
+					template_list_boards($category['boards'], 'category_' . $category['id'] . '_boards');
+		}
 
 		echo '
 		</section>';
@@ -99,12 +105,16 @@ 
 
 	// Show the mark all as read button?
 	if ($settings['show_mark_read'] && !$context['user']['is_guest'] && !empty($context['categories']))
-		echo '
+	{
+			echo '
 			', template_button_strip($context['mark_read_button'], 'right');
+	}
 
 	if ($context['user']['is_logged'])
-		echo '
+	{
+			echo '
 			<p title="', $txt['new_posts'], '"><i class="icon i-board-new"></i>', $txt['new_posts'], '</p>';
+	}
 
 	echo '
 			<p title="', $txt['old_posts'], '"><i class="icon i-board-off"></i>', $txt['old_posts'], '</p>
@@ -252,8 +262,10 @@ 
 
 	// Holidays like "Christmas", "Hanukkah", and "We Love [Unknown] Day" :P.
 	if (!empty($context['calendar_holidays']))
-		echo '
+	{
+			echo '
 				<p class="inline holiday">', $txt['calendar_prompt'], ' ', implode(', ', $context['calendar_holidays']), '</p>';
+	}
 
 	// People's birthdays. Like mine. And yours, I guess. Kidding.
 	if (!empty($context['calendar_birthdays']))
@@ -264,8 +276,10 @@ 
 
 		// Each member in calendar_birthdays has: id, name (person), age (if they have one set?), is_last. (last in list?), and is_today (birthday is today?)
 		foreach ($context['calendar_birthdays'] as $member)
-			echo '
+		{
+					echo '
 					<a href="', $scripturl, '?action=profile;u=', $member['id'], '">', $member['is_today'] ? '<strong>' : '', $member['name'], $member['is_today'] ? '</strong>' : '', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', $member['is_last'] ? '' : ', ';
+		}
 
 		echo '
 				</p>';
@@ -281,8 +295,10 @@ 
 		// Each event in calendar_events should have:
 		// title, href, is_last, can_edit (are they allowed?), modify_href, and is_today.
 		foreach ($context['calendar_events'] as $event)
-			echo '
+		{
+					echo '
 					', $event['can_edit'] ? '<a href="' . $event['modify_href'] . '" title="' . $txt['calendar_edit'] . '" class="icon i-modify"></a> ' : '', $event['href'] == '' ? '' : '<a href="' . $event['href'] . '">', $event['is_today'] ? '<strong>' . $event['title'] . '</strong>' : $event['title'], $event['href'] == '' ? '' : '</a>', $event['is_last'] ? '<br />' : ', ';
+		}
 
 		echo '
 				</p>';
@@ -328,16 +344,24 @@ 
 	// Handle hidden users and buddies.
 	$bracketList = array();
 	if ($context['show_buddies'])
-		$bracketList[] = comma_format($context['num_buddies']) . ' ' . ($context['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
+	{
+			$bracketList[] = comma_format($context['num_buddies']) . ' ' . ($context['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
+	}
 
 	if (!empty($context['num_spiders']))
-		$bracketList[] = comma_format($context['num_spiders']) . ' ' . ($context['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
+	{
+			$bracketList[] = comma_format($context['num_spiders']) . ' ' . ($context['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
+	}
 
 	if (!empty($context['num_users_hidden']))
-		$bracketList[] = comma_format($context['num_users_hidden']) . ' ' . ($context['num_users_hidden'] == 1 ? $txt['hidden'] : $txt['hidden_s']);
+	{
+			$bracketList[] = comma_format($context['num_users_hidden']) . ' ' . ($context['num_users_hidden'] == 1 ? $txt['hidden'] : $txt['hidden_s']);
+	}
 
 	if (!empty($bracketList))
-		echo ' (' . implode(', ', $bracketList) . ')';
+	{
+			echo ' (' . implode(', ', $bracketList) . ')';
+	}
 
 	echo $context['show_who'] ? '</a>' : '', '
 				</h3>';
@@ -350,8 +374,10 @@ 
 
 		// Showing membergroups?
 		if (!empty($settings['show_group_key']) && !empty($context['membergroups']))
-			echo '
+		{
+					echo '
 				<p class="inline membergroups">[' . implode(',&nbsp;', $context['membergroups']) . ']</p>';
+		}
 	}
 	echo '
 			</li>';

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/admin/ManagePaid.controller.php

Braces +63 added lines, -22 removed lines

@@ -154,7 +154,9 @@ 
 				$validator->text_replacements(array('paid_email_to' => $txt['paid_email_to']));
 
 				if ($validator->validate($this->_req->post))
-					$this->_req->post->paid_email_to = $validator->validation_data('paid_email_to');
+				{
+									$this->_req->post->paid_email_to = $validator->validation_data('paid_email_to');
+				}
 				else
 				{
 					// That's not an email, lets set it back in the form to be fixed and let them know its wrong
@@ -162,7 +164,9 @@ 
 					$context['error_type'] = 'minor';
 					$context['settings_message'] = array();
 					foreach ($validator->validation_errors() as $id => $error)
-						$context['settings_message'][] = $error;
+					{
+											$context['settings_message'][] = $error;
+					}
 				}
 			}
 
@@ -201,7 +205,9 @@ 
 		// If the currency is set to something different then we need to set it to other for this to work and set it back shortly.
 		$modSettings['paid_currency'] = !empty($modSettings['paid_currency_code']) ? $modSettings['paid_currency_code'] : '';
 		if (!empty($modSettings['paid_currency_code']) && !in_array($modSettings['paid_currency_code'], array('usd', 'eur', 'gbp')))
-			$modSettings['paid_currency'] = 'other';
+		{
+					$modSettings['paid_currency'] = 'other';
+		}
 
 		// These are all the default settings.
 		$config_vars = array(
@@ -257,7 +263,9 @@ 
 
 		// Not made the settings yet?
 		if (empty($modSettings['paid_currency_symbol']))
-			throw new Elk_Exception('paid_not_set_currency', false, array($scripturl . '?action=admin;area=paidsubscribe;sa=settings'));
+		{
+					throw new Elk_Exception('paid_not_set_currency', false, array($scripturl . '?action=admin;area=paidsubscribe;sa=settings'));
+		}
 
 		// Some basic stuff.
 		$context['page_title'] = $txt['paid_subs_view'];
@@ -460,7 +468,9 @@ 
 
 				// There needs to be something.
 				if (empty($this->_req->post->span_value) || empty($this->_req->post->cost))
-					throw new Elk_Exception('paid_no_cost_value');
+				{
+									throw new Elk_Exception('paid_no_cost_value');
+				}
 			}
 			// Flexible is harder but more fun ;)
 			else
@@ -475,7 +485,9 @@ 
 				);
 
 				if (empty($this->_req->post->cost_day) && empty($this->_req->post->cost_week) && empty($this->_req->post->cost_month) && empty($this->_req->post->cost_year))
-					throw new Elk_Exception('paid_all_freq_blank');
+				{
+									throw new Elk_Exception('paid_all_freq_blank');
+				}
 			}
 
 			$cost = serialize($cost);
@@ -485,7 +497,9 @@ 
 			if (!empty($this->_req->post->addgroup))
 			{
 				foreach ($this->_req->post->addgroup as $id => $dummy)
-					$addGroups[] = (int) $id;
+				{
+									$addGroups[] = (int) $id;
+				}
 			}
 			$addGroups = implode(',', $addGroups);
 
@@ -813,16 +827,22 @@ 
 
 		// If we haven't been passed the subscription ID get it.
 		if ($context['log_id'] && !$context['sub_id'])
-			$context['sub_id'] = validateSubscriptionID($context['log_id']);
+		{
+					$context['sub_id'] = validateSubscriptionID($context['log_id']);
+		}
 
 		if (!isset($context['subscriptions'][$context['sub_id']]))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		$context['current_subscription'] = $context['subscriptions'][$context['sub_id']];
 
 		// Searching?
 		if (isset($this->_req->post->ssearch))
-			return $this->action_viewsub();
+		{
+					return $this->action_viewsub();
+		}
 		// Saving?
 		elseif (isset($this->_req->post->save_sub))
 		{
@@ -843,14 +863,20 @@ 
 				$member = getMemberByName($this->_req->post->name);
 
 				if (empty($member))
-					throw new Elk_Exception('error_member_not_found');
+				{
+									throw new Elk_Exception('error_member_not_found');
+				}
 
 				if (alreadySubscribed($context['sub_id'], $member['id_member']))
-					throw new Elk_Exception('member_already_subscribed');
+				{
+									throw new Elk_Exception('member_already_subscribed');
+				}
 
 				// Actually put the subscription in place.
 				if ($status == 1)
-					addSubscription($context['sub_id'], $member['id_member'], 0, $starttime, $endtime);
+				{
+									addSubscription($context['sub_id'], $member['id_member'], 0, $starttime, $endtime);
+				}
 				else
 				{
 					$details = array(
@@ -872,10 +898,14 @@ 
 
 				// Pick the right permission stuff depending on what the status is changing from/to.
 				if ($subscription_status['old_status'] == 1 && $status != 1)
-					removeSubscription($context['sub_id'], $subscription_status['id_member']);
+				{
+									removeSubscription($context['sub_id'], $subscription_status['id_member']);
+				}
 
 				elseif ($status == 1 && $subscription_status['old_status'] != 1)
-					addSubscription($context['sub_id'], $subscription_status['id_member'], 0, $starttime, $endtime);
+				{
+									addSubscription($context['sub_id'], $subscription_status['id_member'], 0, $starttime, $endtime);
+				}
 
 				else
 				{
@@ -902,12 +932,16 @@ 
 			{
 				$toDelete = array();
 				foreach ($this->_req->post->delsub as $id => $dummy)
-					$toDelete[] = (int) $id;
+				{
+									$toDelete[] = (int) $id;
+				}
 
 				$deletes = prepareDeleteSubscriptions($toDelete);
 
 				foreach ($deletes as $id_subscribe => $id_member)
-					removeSubscription($id_subscribe, $id_member, isset($this->_req->post->delete));
+				{
+									removeSubscription($id_subscribe, $id_member, isset($this->_req->post->delete));
+				}
 			}
 			redirectexit('action=admin;area=paidsubscribe;sa=viewsub;sid=' . $context['sub_id']);
 		}
@@ -946,15 +980,18 @@ 
 				$result = getBasicMemberData((int) $this->_req->query->uid);
 				$context['sub']['username'] = $result['real_name'];
 			}
-			else
-				$context['sub']['username'] = '';
+			else {
+							$context['sub']['username'] = '';
+			}
 		}
 		// Otherwise load the existing info.
 		else
 		{
 			$row = getPendingSubscriptions($context['log_id']);
 			if (empty($row))
-				throw new Elk_Exception('no_access', false);
+			{
+							throw new Elk_Exception('no_access', false);
+			}
 
 			// Any pending payments?
 			$context['pending_payments'] = array();
@@ -974,9 +1011,11 @@ 
 							foreach ($costs as $duration => $cost)
 							{
 								if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2])
-									$context['pending_payments'][$id] = array(
+								{
+																	$context['pending_payments'][$id] = array(
 										'desc' => sprintf($modSettings['paid_currency_symbol'], $cost . '/' . $txt[$duration]),
 									);
+								}
 							}
 						}
 						elseif ($costs['fixed'] == $pending[1])
@@ -998,7 +1037,9 @@ 
 						{
 							// Flexible?
 							if (isset($this->_req->query->accept))
-								addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] === 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+							{
+															addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] === 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+							}
 							unset($pending_details[$id]);
 
 							$new_details = serialize($pending_details);

Spacing +11 added lines, -11 removed lines

@@ -270,13 +270,13 @@ 
 			'items_per_page' => 20,
 			'base_href' => $scripturl . '?action=admin;area=paidsubscribe;sa=view',
 			'get_items' => array(
-				'function' => function () {
+				'function' => function() {
 					global $context;
 					return $context['subscriptions'];
 				},
 			),
 			'get_count' => array(
-				'function' => function () {
+				'function' => function() {
 					global $context;
 					return count($context['subscriptions']);
 				},
@@ -289,7 +289,7 @@ 
 						'style' => 'width: 30%;',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							return sprintf('<a href="%1$s?action=admin;area=paidsubscribe;sa=viewsub;sid=%2$s">%3$s</a>', $scripturl, $rowData['id'], $rowData['name']);
@@ -301,7 +301,7 @@ 
 						'value' => $txt['paid_cost'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							return $rowData['flexible'] ? '<em>' . $txt['flexible'] . '</em>' : $rowData['cost'] . ' / ' . $rowData['length'];
@@ -338,7 +338,7 @@ 
 						'value' => $txt['paid_is_active'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							return '<span class="' . ($rowData['active'] ? 'success' : 'alert') . '">' . ($rowData['active'] ? $txt['yes'] : $txt['no']) . '</span>';
@@ -350,7 +350,7 @@ 
 						'value' => $txt['subscribers'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl, $txt;
 
 							return '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=viewsub;sid=' . $rowData['id'] . '"><i class="icon i-view" title="' . $txt['view'] . '"></i></a>';
@@ -363,7 +363,7 @@ 
 						'value' => $txt['modify'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt, $scripturl;
 
 							return '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=modify;sid=' . $rowData['id'] . '"><i class="icon i-modify" title="' . $txt['modify'] . '"></i></a>';
@@ -376,7 +376,7 @@ 
 						'value' => $txt['remove']
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt, $scripturl;
 
 							return '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=modify;delete;sid=' . $rowData['id'] . '"><i class="icon i-delete" title="' . $txt['delete'] . '"></i></a>';
@@ -636,7 +636,7 @@ 
 						'style' => 'width: 20%;',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt, $scripturl;
 
 							return $rowData['id_member'] == 0 ? $txt['guest'] : '<a href="' . $scripturl . '?action=profile;u=' . $rowData['id_member'] . '">' . $rowData['name'] . '</a>';
@@ -708,7 +708,7 @@ 
 						'value' => $txt['edit_subscriber'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt, $scripturl;
 
 							return '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=modifyuser;lid=' . $rowData['id'] . '">' . $txt['modify'] . '</a>';
@@ -722,7 +722,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return '<input type="checkbox" name="delsub[' . $rowData['id'] . ']" class="input_check" />';
 						},
 						'class' => 'centertext',

sources/admin/ManageFeatures.controller.php

Braces +80 added lines, -28 removed lines

@@ -168,7 +168,9 @@ 
 
 			// Prevent absurd boundaries here - make it a day tops.
 			if (isset($this->_req->post->lastActive))
-				$this->_req->post->lastActive = min((int) $this->_req->post->lastActive, 1440);
+			{
+							$this->_req->post->lastActive = min((int) $this->_req->post->lastActive, 1440);
+			}
 
 			call_integration_hook('integrate_save_basic_settings');
 
@@ -420,7 +422,9 @@ 
 
 					// Something like enableModule('mentions', array('post', 'display');
 					foreach ($modules as $key => $val)
-						$function($key, $val);
+					{
+											$function($key, $val);
+					}
 				}
 			}
 
@@ -499,7 +503,9 @@ 
 
 		// Temporarily make each setting a modSetting!
 		foreach ($context['signature_settings'] as $key => $value)
-			$modSettings['signature_' . $key] = $value;
+		{
+					$modSettings['signature_' . $key] = $value;
+		}
 
 		// Make sure we check the right tags!
 		$modSettings['bbc_disabled_signature_bbc'] = $disabledTags;
@@ -514,17 +520,25 @@ 
 			$bbcTags = $codes->getTags();
 
 			if (!isset($this->_req->post->signature_bbc_enabledTags))
-				$this->_req->post->signature_bbc_enabledTags = array();
+			{
+							$this->_req->post->signature_bbc_enabledTags = array();
+			}
 			elseif (!is_array($this->_req->post->signature_bbc_enabledTags))
-				$this->_req->post->signature_bbc_enabledTags = array($this->_req->post->signature_bbc_enabledTags);
+			{
+							$this->_req->post->signature_bbc_enabledTags = array($this->_req->post->signature_bbc_enabledTags);
+			}
 
 			$sig_limits = array();
 			foreach ($context['signature_settings'] as $key => $value)
 			{
 				if ($key == 'allow_smileys')
-					continue;
+				{
+									continue;
+				}
 				elseif ($key == 'max_smileys' && empty($this->_req->post->signature_allow_smileys))
-					$sig_limits[] = -1;
+				{
+									$sig_limits[] = -1;
+				}
 				else
 				{
 					$current_key = $this->_req->getPost('signature_' . $key, 'intval');
@@ -606,7 +620,9 @@ 
 				foreach ($this->_req->post->reg as $value)
 				{
 					if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
-						$reg_fields[] = $value;
+					{
+											$reg_fields[] = $value;
+					}
 				}
 			}
 
@@ -614,7 +630,9 @@ 
 			$changes['registration_fields'] = empty($reg_fields) ? '' : implode(',', $reg_fields);
 
 			if (!empty($changes))
-				updateSettings($changes);
+			{
+							updateSettings($changes);
+			}
 		}
 
 		createToken('admin-scp');
@@ -874,7 +892,9 @@ 
 			loadLanguage('Errors');
 
 			if (isset($txt['custom_option_' . $this->_req->query->msg]))
-				$context['custom_option__error'] = $txt['custom_option_' . $this->_req->query->msg];
+			{
+							$context['custom_option__error'] = $txt['custom_option_' . $this->_req->query->msg];
+			}
 		}
 
 		// Load the profile language for section names.
@@ -928,9 +948,12 @@ 
 
 			// Enable and disable custom fields as required.
 			$enabled = array(0);
-			if(isset($this->_req->post->cust) && is_array($this->_req->post->cust)) {
+			if(isset($this->_req->post->cust) && is_array($this->_req->post->cust))
+			{
 				foreach ($this->_req->post->cust as $id)
-					$enabled[] = (int) $id;
+				{
+									$enabled[] = (int) $id;
+				}
 			}
 
 			updateRenamedProfileStatus($enabled);
@@ -943,11 +966,15 @@ 
 
 			// Everyone needs a name - even the (bracket) unknown...
 			if (trim($this->_req->post->field_name) == '')
-				redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $this->_req->query->fid . ';msg=need_name');
+			{
+							redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $this->_req->query->fid . ';msg=need_name');
+			}
 
 			// Regex you say?  Do a very basic test to see if the pattern is valid
 			if (!empty($this->_req->post->regex) && @preg_match($this->_req->post->regex, 'dummy') === false)
-				redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $this->_req->query->fid . ';msg=regex_error');
+			{
+							redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $this->_req->query->fid . ';msg=regex_error');
+			}
 
 			$this->_req->post->field_name = $this->_req->getPost('field_name', 'Util::htmlspecialchars');
 			$this->_req->post->field_desc = $this->_req->getPost('field_desc', 'Util::htmlspecialchars');
@@ -968,7 +995,9 @@ 
 			// Some masking stuff...
 			$mask = $this->_req->getPost('mask', 'strval', '');
 			if ($mask == 'regex' && isset($this->_req->post->regex))
-				$mask .= $this->_req->post->regex;
+			{
+							$mask .= $this->_req->post->regex;
+			}
 
 			$field_length = $this->_req->getPost('max_length', 'intval', 255);
 			$enclose = $this->_req->getPost('enclose', 'strval', '');
@@ -998,7 +1027,9 @@ 
 
 							// Nada, zip, etc...
 							if (trim($v) == '')
-								continue;
+							{
+															continue;
+							}
 
 							// Otherwise, save it boy.
 							$field_options .= $v . ',';
@@ -1014,7 +1045,9 @@ 
 						}
 
 						if (isset($_POST['default_select']) && $_POST['default_select'] == 'no_default')
-							$default = 'no_default';
+						{
+													$default = 'no_default';
+						}
 
 						$field_options = substr($field_options, 0, -1);
 					}
@@ -1035,15 +1068,20 @@ 
 
 				// If there is nothing to the name, then let's start our own - for foreign languages etc.
 				if (isset($matches[1]))
-					$colname = $initial_colname = 'cust_' . strtolower($matches[1]);
-				else
-					$colname = $initial_colname = 'cust_' . mt_rand(1, 999999);
+				{
+									$colname = $initial_colname = 'cust_' . strtolower($matches[1]);
+				}
+				else {
+									$colname = $initial_colname = 'cust_' . mt_rand(1, 999999);
+				}
 
 				$unique = ensureUniqueProfileField($colname, $initial_colname);
 
 				// Still not a unique column name? Leave it up to the user, then.
 				if (!$unique)
-					throw new Elk_Exception('custom_option_not_unique');
+				{
+									throw new Elk_Exception('custom_option_not_unique');
+				}
 
 				// And create a new field
 				$new_field = array(
@@ -1091,7 +1129,9 @@ 
 					foreach ($context['field']['options'] as $k => $option)
 					{
 						if (trim($option) == '')
-							continue;
+						{
+													continue;
+						}
 
 						// Still exists?
 						if (in_array($option, $newOptions))
@@ -1106,7 +1146,9 @@ 
 					{
 						// Just been renamed?
 						if (!in_array($k, $takenKeys) && !empty($newOptions[$k]))
-							updateRenamedProfileField($k, $newOptions, $context['field']['colname'], $option);
+						{
+													updateRenamedProfileField($k, $newOptions, $context['field']['colname'], $option);
+						}
 					}
 				}
 				// @todo Maybe we should adjust based on new text length limits?
@@ -1139,7 +1181,9 @@ 
 
 				// Just clean up any old selects - these are a pain!
 				if (($this->_req->post->field_type == 'select' || $this->_req->post->field_type == 'radio') && !empty($newOptions))
-					deleteOldProfileFieldSelects($newOptions, $context['field']['colname']);
+				{
+									deleteOldProfileFieldSelects($newOptions, $context['field']['colname']);
+				}
 			}
 		}
 		// Deleting?
@@ -1197,7 +1241,9 @@ 
 			foreach ($context['pm_limits'] as $group_id => $group)
 			{
 				if (isset($this->_req->post->group[$group_id]) && $this->_req->post->group[$group_id] != $group['max_messages'])
-					updateMembergroupProperties(array('current_group' => $group_id, 'max_messages' => $this->_req->post->group[$group_id]));
+				{
+									updateMembergroupProperties(array('current_group' => $group_id, 'max_messages' => $this->_req->post->group[$group_id]));
+				}
 			}
 
 			call_integration_hook('integrate_save_pmsettings_settings');
@@ -1260,12 +1306,16 @@ 
 		// Get all the time zones.
 		$all_zones = timezone_identifiers_list();
 		if ($all_zones === false)
-			unset($config_vars['default_timezone']);
+		{
+					unset($config_vars['default_timezone']);
+		}
 		else
 		{
 			// Make sure we set the value to the same as the printed value.
 			foreach ($all_zones as $zone)
-				$config_vars['default_timezone'][2][$zone] = $zone;
+			{
+							$config_vars['default_timezone'][2][$zone] = $zone;
+			}
 		}
 
 		call_integration_hook('integrate_modify_basic_settings', array(&$config_vars));
@@ -1565,7 +1615,9 @@ 
 
 	// Have we exhausted all the time we allowed?
 	if (time() - array_sum(explode(' ', $sig_start)) < 3)
-		return;
+	{
+			return;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=featuresettings;sa=sig;apply;step=' . $applied_sigs . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];

Spacing +7 added lines, -7 removed lines

@@ -657,7 +657,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							$isChecked = $rowData['disabled'] ? '' : ' checked="checked"';
 							$onClickHandler = $rowData['can_show_register'] ? sprintf('onclick="document.getElementById(\'reg_%1$s\').disabled = !this.checked;"', $rowData['id']) : '';
 							return sprintf('<input type="checkbox" name="active[]" id="active_%1$s" value="%1$s" class="input_check" %2$s %3$s />', $rowData['id'], $isChecked, $onClickHandler);
@@ -672,7 +672,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							$isChecked = $rowData['on_register'] && !$rowData['disabled'] ? ' checked="checked"' : '';
 							$isDisabled = $rowData['can_show_register'] ? '' : ' disabled="disabled"';
 							return sprintf('<input type="checkbox" name="reg[]" id="reg_%1$s" value="%1$s" class="input_check" %2$s %3$s />', $rowData['id'], $isChecked, $isDisabled);
@@ -734,7 +734,7 @@ 
 						'value' => $txt['custom_profile_fieldname'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							return sprintf('<a href="%1$s?action=admin;area=featuresettings;sa=profileedit;fid=%2$d">%3$s</a><div class="smalltext">%4$s</div>', $scripturl, $rowData['id_field'], $rowData['field_name'], $rowData['field_desc']);
@@ -751,7 +751,7 @@ 
 						'value' => $txt['custom_profile_fieldtype'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							$textKey = sprintf('custom_profile_type_%1$s', $rowData['field_type']);
@@ -770,7 +770,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							$isChecked = $rowData['active'] ? ' checked="checked"' : '';
 							return sprintf('<input type="checkbox" name="cust[]" id="cust_%1$s" value="%1$s" class="input_check"%2$s />', $rowData['id_field'], $isChecked);
 						},
@@ -787,7 +787,7 @@ 
 						'value' => $txt['custom_profile_placement'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 							$placement = 'custom_profile_placement_';
 
@@ -939,7 +939,7 @@ 
 
 			// Enable and disable custom fields as required.
 			$enabled = array(0);
-			if(isset($this->_req->post->cust) && is_array($this->_req->post->cust)) {
+			if (isset($this->_req->post->cust) && is_array($this->_req->post->cust)) {
 				foreach ($this->_req->post->cust as $id)
 					$enabled[] = (int) $id;
 			}

sources/admin/ManageBoards.controller.php

Braces +126 added lines, -49 removed lines

@@ -147,18 +147,21 @@ 
 
 			// Top is special, its the top!
 			if ($this->_req->query->move_to === 'top')
-				$boardOptions = array(
+			{
+							$boardOptions = array(
 					'move_to' => $this->_req->query->move_to,
 					'target_category' => (int) $this->_req->query->target_cat,
 					'move_first_child' => true,
 				);
+			}
 			// Moving it after another board
-			else
-				$boardOptions = array(
+			else {
+							$boardOptions = array(
 					'move_to' => $this->_req->query->move_to,
 					'target_board' => (int) $this->_req->query->target_board,
 					'move_first_child' => true,
 				);
+			}
 
 			// Use modifyBoard to perform the action
 			modifyBoard((int) $this->_req->query->src_board, $boardOptions);
@@ -210,14 +213,17 @@ 
 				foreach ($boardList[$catid] as $boardid)
 				{
 					if (!isset($context['categories'][$catid]['move_link']))
-						$context['categories'][$catid]['move_link'] = array(
+					{
+											$context['categories'][$catid]['move_link'] = array(
 							'child_level' => 0,
 							'label' => $txt['mboards_order_before'] . ' \'' . htmlspecialchars($boards[$boardid]['name'], ENT_COMPAT, 'UTF-8') . '\'',
 							'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_board=' . $boardid . ';move_to=before;' . $security,
 						);
+					}
 
 					if (!$context['categories'][$catid]['boards'][$boardid]['move'])
-					$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
+					{
+										$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
 						array(
 							'child_level' => $boards[$boardid]['level'],
 							'label' => $txt['mboards_order_after'] . '\'' . htmlspecialchars($boards[$boardid]['name'], ENT_COMPAT, 'UTF-8') . '\'',
@@ -229,18 +235,25 @@ 
 							'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_board=' . $boardid . ';move_to=child;' . $security,
 						),
 					);
+					}
 
 					$difference = $boards[$boardid]['level'] - $prev_child_level;
 					if ($difference == 1)
-						array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
+					{
+											array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
+					}
 					elseif ($difference < 0)
 					{
 						if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-							$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
+						{
+													$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
+						}
 
 						for ($i = 0; $i < -$difference; $i++)
-							if (($temp = array_pop($stack)) !== null)
+						{
+													if (($temp = array_pop($stack)) !== null)
 								array_unshift($context['categories'][$catid]['boards'][$prev_board]['move_links'], $temp);
+						}
 					}
 
 					$prev_board = $boardid;
@@ -249,16 +262,22 @@ 
 				}
 
 				if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-					$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
+				{
+									$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
+				}
 				elseif (!empty($stack))
-					$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+				{
+									$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+				}
 
 				if (empty($boardList[$catid]))
-					$context['categories'][$catid]['move_link'] = array(
+				{
+									$context['categories'][$catid]['move_link'] = array(
 						'child_level' => 0,
 						'label' => $txt['mboards_order_before'] . ' \'' . htmlspecialchars($tree['node']['name'], ENT_COMPAT, 'UTF-8') . '\'',
 						'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_cat=' . $catid . ';move_to=top;' . $security,
 					);
+				}
 			}
 		}
 
@@ -317,7 +336,9 @@ 
 		}
 		// Category doesn't exist, man... sorry.
 		elseif (!isset($cat_tree[$this->cat]))
-			redirectexit('action=admin;area=manageboards');
+		{
+					redirectexit('action=admin;area=manageboards');
+		}
 		else
 		{
 			$context['category'] = array(
@@ -330,21 +351,27 @@ 
 			);
 
 			foreach ($boardList[$this->cat] as $child_board)
-				$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+			{
+							$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+			}
 		}
 
 		$prevCat = 0;
 		foreach ($cat_tree as $catid => $tree)
 		{
 			if ($catid == $this->cat && $prevCat > 0)
-				$context['category_order'][$prevCat]['selected'] = true;
+			{
+							$context['category_order'][$prevCat]['selected'] = true;
+			}
 			elseif ($catid != $this->cat)
-				$context['category_order'][$catid] = array(
+			{
+							$context['category_order'][$catid] = array(
 					'id' => $catid,
 					'name' => $txt['mboards_order_after'] . $tree['node']['name'],
 					'selected' => false,
 					'true_name' => $tree['node']['name']
 				);
+			}
 
 			$prevCat = $catid;
 		}
@@ -393,7 +420,9 @@ 
 			$catOptions = array();
 
 			if (isset($this->_req->post->cat_order))
-				$catOptions['move_after'] = (int) $this->_req->post->cat_order;
+			{
+							$catOptions['move_after'] = (int) $this->_req->post->cat_order;
+			}
 
 			// Change "This & That" to "This &amp; That" but don't change "&cent" to "&amp;cent;"...
 			$catOptions['cat_name'] = preg_replace('~[&]([^;]{8}|[^;]{0,8}$)~', '&amp;$1', $this->_req->post->cat_name);
@@ -401,9 +430,12 @@ 
 			$catOptions['is_collapsible'] = isset($this->_req->post->collapse);
 
 			if (isset($this->_req->post->add))
-				createCategory($catOptions);
-			else
-				modifyCategory($this->cat, $catOptions);
+			{
+							createCategory($catOptions);
+			}
+			else {
+							modifyCategory($this->cat, $catOptions);
+			}
 		}
 		// If they want to delete - first give them confirmation.
 		elseif (isset($this->_req->post->delete) && !isset($this->_req->post->confirmation) && !isset($this->_req->post->empty))
@@ -418,12 +450,15 @@ 
 			if (isset($this->_req->post->delete_action) && $this->_req->post->delete_action == 1)
 			{
 				if (empty($this->_req->post->cat_to))
-					throw new Elk_Exception('mboards_delete_error');
+				{
+									throw new Elk_Exception('mboards_delete_error');
+				}
 
 				deleteCategories(array($this->cat), (int) $this->_req->post->cat_to);
 			}
-			else
-				deleteCategories(array($this->cat));
+			else {
+							deleteCategories(array($this->cat));
+			}
 		}
 
 		redirectexit('action=admin;area=manageboards');
@@ -470,7 +505,9 @@ 
 
 			// Category doesn't exist, man... sorry.
 			if (empty($this->cat))
-				redirectexit('action=admin;area=manageboards');
+			{
+							redirectexit('action=admin;area=manageboards');
+			}
 
 			// Some things that need to be setup for a new board.
 			$curBoard = array(
@@ -534,7 +571,9 @@ 
 
 		// Category doesn't exist, man... sorry.
 		if (!isset($boardList[$curBoard['category']]))
-			redirectexit('action=admin;area=manageboards');
+		{
+					redirectexit('action=admin;area=manageboards');
+		}
 
 		foreach ($boardList[$curBoard['category']] as $boardid)
 		{
@@ -566,24 +605,30 @@ 
 			$context['can_move_children'] = false;
 			$context['children'] = $boards[$this->boardid]['tree']['children'];
 			foreach ($context['board_order'] as $board)
-				if ($board['is_child'] === false && $board['selected'] === false)
+			{
+							if ($board['is_child'] === false && $board['selected'] === false)
 					$context['can_move_children'] = true;
+			}
 		}
 
 		// Get other available categories.
 		$context['categories'] = array();
 		foreach ($cat_tree as $catID => $tree)
-			$context['categories'][] = array(
+		{
+					$context['categories'][] = array(
 				'id' => $catID == $curBoard['category'] ? 0 : $catID,
 				'name' => $tree['node']['name'],
 				'selected' => $catID == $curBoard['category']
 			);
+		}
 
 		$context['board']['moderators'] = getBoardModerators($this->boardid);
 		$context['board']['moderator_list'] = empty($context['board']['moderators']) ? '' : '&quot;' . implode('&quot;, &quot;', $context['board']['moderators']) . '&quot;';
 
 		if (!empty($context['board']['moderators']))
-			list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+		{
+					list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+		}
 
 		$context['themes'] = getAllThemes();
 
@@ -646,7 +691,9 @@ 
 			elseif (!empty($this->_req->post->placement) && !empty($this->_req->post->board_order))
 			{
 				if (!in_array($this->_req->post->placement, array('before', 'after', 'child')))
-					throw new Elk_Exception('mangled_post', false);
+				{
+									throw new Elk_Exception('mangled_post', false);
+				}
 
 				$boardOptions['move_to'] = $this->_req->post->placement;
 				$boardOptions['target_board'] = (int) $this->_req->post->board_order;
@@ -664,14 +711,20 @@ 
 				foreach ($this->_req->post->groups as $group => $action)
 				{
 					if ($action == 'allow')
-						$boardOptions['access_groups'][] = (int) $group;
+					{
+											$boardOptions['access_groups'][] = (int) $group;
+					}
 					elseif ($action == 'deny')
-						$boardOptions['deny_groups'][] = (int) $group;
+					{
+											$boardOptions['deny_groups'][] = (int) $group;
+					}
 				}
 			}
 
 			if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255)
-				throw new Elk_Exception('too_many_groups', false);
+			{
+							throw new Elk_Exception('too_many_groups', false);
+			}
 
 			// Change '1 & 2' to '1 &amp; 2', but not '&amp;' to '&amp;amp;'...
 			$boardOptions['board_name'] = preg_replace('~[&]([^;]{8}|[^;]{0,8}$)~', '&amp;$1', $this->_req->post->board_name);
@@ -685,7 +738,9 @@ 
 			{
 				$moderators = array();
 				foreach ($this->_req->post->moderator_list as $moderator)
-					$moderators[(int) $moderator] = (int) $moderator;
+				{
+									$moderators[(int) $moderator] = (int) $moderator;
+				}
 
 				$boardOptions['moderators'] = $moderators;
 			}
@@ -704,13 +759,19 @@ 
 
 				// If we're turning redirection on check the board doesn't have posts in it - if it does don't make it a redirection board.
 				if ($boardOptions['redirect'] && empty($properties['oldRedirect']) && $properties['numPosts'])
-					unset($boardOptions['redirect']);
+				{
+									unset($boardOptions['redirect']);
+				}
 				// Reset the redirection count when switching on/off.
 				elseif (empty($boardOptions['redirect']) != empty($properties['oldRedirect']))
-					$boardOptions['num_posts'] = 0;
+				{
+									$boardOptions['num_posts'] = 0;
+				}
 				// Resetting the count?
 				elseif ($boardOptions['redirect'] && !empty($this->_req->post->reset_redirect))
-					$boardOptions['num_posts'] = 0;
+				{
+									$boardOptions['num_posts'] = 0;
+				}
 			}
 
 			call_integration_hook('integrate_save_board', array($board_id, &$boardOptions));
@@ -720,22 +781,29 @@ 
 			{
 				// New boards by default go to the bottom of the category.
 				if (empty($this->_req->post->new_cat))
-					$boardOptions['target_category'] = (int) $this->_req->post->cur_cat;
+				{
+									$boardOptions['target_category'] = (int) $this->_req->post->cur_cat;
+				}
 				if (!isset($boardOptions['move_to']))
-					$boardOptions['move_to'] = 'bottom';
+				{
+									$boardOptions['move_to'] = 'bottom';
+				}
 
 				createBoard($boardOptions);
 			}
 			// ...or update an existing board.
-			else
-				modifyBoard($board_id, $boardOptions);
+			else {
+							modifyBoard($board_id, $boardOptions);
+			}
 		}
 		elseif (isset($this->_req->post->delete) && !isset($this->_req->post->confirmation) && !isset($this->_req->post->no_children))
 		{
-			if ($posts) {
+			if ($posts)
+			{
 				throw new Elk_Exception('mboards_delete_board_has_posts');
 			}
-			else {
+			else
+			{
 				$this->action_board();
 			}
 			return;
@@ -743,25 +811,32 @@ 
 		elseif (isset($this->_req->post->delete))
 		{
 			// First, check if our board still has posts or topics.
-			if ($posts) {
+			if ($posts)
+			{
 				throw new Elk_Exception('mboards_delete_board_has_posts');
 			}
 			else if (isset($this->_req->post->delete_action) && $this->_req->post->delete_action == 1)
 			{
 				// Check if we are moving all the current sub-boards first - before we start deleting!
 				if (empty($this->_req->post->board_to))
-					throw new Elk_Exception('mboards_delete_board_error');
+				{
+									throw new Elk_Exception('mboards_delete_board_error');
+				}
 
 				deleteBoards(array($board_id), (int) $this->_req->post->board_to);
 			}
-			else
-				deleteBoards(array($board_id), 0);
+			else {
+							deleteBoards(array($board_id), 0);
+			}
 		}
 
 		if (isset($this->_req->query->rid) && $this->_req->query->rid == 'permissions')
-			redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
-		else
-			redirectexit('action=admin;area=manageboards');
+		{
+					redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
+		}
+		else {
+					redirectexit('action=admin;area=manageboards');
+		}
 	}
 
 	/**
@@ -826,7 +901,9 @@ 
 		$boards = getBoardList(array('override_permissions' => true, 'not_redirection' => true), true);
 		$recycle_boards = array('');
 		foreach ($boards as $board)
-			$recycle_boards[$board['id_board']] = $board['cat_name'] . ' - ' . $board['board_name'];
+		{
+					$recycle_boards[$board['id_board']] = $board['cat_name'] . ' - ' . $board['board_name'];
+		}
 
 		// Here and the board settings...
 		$config_vars = array(

sources/admin/ManageCalendarModule.controller.php

Braces +15 added lines, -7 removed lines

@@ -242,14 +242,19 @@ 
 			$this->_req->post->holiday = $this->_req->getPost('holiday', 'intval', 0);
 
 			if (isset($this->_req->post->delete))
-				removeHolidays($this->_req->post->holiday);
+			{
+							removeHolidays($this->_req->post->holiday);
+			}
 			else
 			{
 				$date = Util::strftime($this->_req->post->year <= 4 ? '0004-%m-%d' : '%Y-%m-%d', mktime(0, 0, 0, $this->_req->post->month, $this->_req->post->day, $this->_req->post->year));
 				if (isset($this->_req->post->edit))
-					editHoliday($this->_req->post->holiday, $date, $this->_req->post->title);
-				else
-					insertHoliday($date, $this->_req->post->title);
+				{
+									editHoliday($this->_req->post->holiday, $date, $this->_req->post->title);
+				}
+				else {
+									insertHoliday($date, $this->_req->post->title);
+				}
 			}
 
 			redirectexit('action=admin;area=managecalendar;sa=holidays');
@@ -267,8 +272,9 @@ 
 			);
 		}
 		// If it's not new load the data.
-		else
-			$context['holiday'] = getHoliday($this->_req->query->holiday);
+		else {
+					$context['holiday'] = getHoliday($this->_req->query->holiday);
+		}
 
 		// Last day for the drop down?
 		$context['holiday']['last_day'] = (int) Util::strftime('%d', mktime(0, 0, 0, $context['holiday']['month'] == 12 ? 1 : $context['holiday']['month'] + 1, 0, $context['holiday']['month'] == 12 ? $context['holiday']['year'] + 1 : $context['holiday']['year']));
@@ -337,7 +343,9 @@ 
 		$boards_list = getBoardList(array('override_permissions' => true, 'not_redirection' => true), true);
 		$boards = array('');
 		foreach ($boards_list as $board)
-			$boards[$board['id_board']] = $board['cat_name'] . ' - ' . $board['board_name'];
+		{
+					$boards[$board['id_board']] = $board['cat_name'] . ' - ' . $board['board_name'];
+		}
 
 		// Look, all the calendar settings - of which there are many!
 		$config_vars = array(

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 			'settings' => array(
 				'cal_enabled' => 1,
 			),
-			'setting_callback' => function ($value) {
+			'setting_callback' => function($value) {
 				if ($value)
 				{
 					enableModules('calendar', array('admin', 'post', 'boardindex', 'display'));
@@ -164,7 +164,7 @@ 
 						'value' => $txt['date'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							// Recurring every year or just a single year?

sources/admin/PackageServers.controller.php

Braces +111 added lines, -44 removed lines

@@ -113,7 +113,9 @@ 
 		$context['package_download_broken'] = !is_writable(BOARDDIR . '/packages') || !is_writable(BOARDDIR . '/packages/installed.list');
 
 		if ($context['package_download_broken'])
-			$this->ftp_connect();
+		{
+					$this->ftp_connect();
+		}
 	}
 
 	/**
@@ -130,11 +132,14 @@ 
 
 		// Browsing the packages from a server
 		if (isset($this->_req->query->server))
-			list($name, $url, $server) = $this->_package_server();
+		{
+					list($name, $url, $server) = $this->_package_server();
+		}
 
 		// Minimum required parameter did not exist so dump out.
-		else
-			throw new Elk_Exception('couldnt_connect', false);
+		else {
+					throw new Elk_Exception('couldnt_connect', false);
+		}
 
 		// Might take some time.
 		detectServer()->setTimeLimit(60);
@@ -159,11 +164,15 @@ 
 			// Look through the list of installed mods and get version information for the compare
 			$installed_adds = array();
 			foreach ($instadds as $installed_add)
-				$installed_adds[$installed_add['package_id']] = $installed_add['version'];
+			{
+							$installed_adds[$installed_add['package_id']] = $installed_add['version'];
+			}
 
 			$the_version = strtr(FORUM_VERSION, array('ElkArte ' => ''));
 			if (!empty($_SESSION['version_emulate']))
-				$the_version = $_SESSION['version_emulate'];
+			{
+							$the_version = $_SESSION['version_emulate'];
+			}
 
 			// Parse the json file, each section contains a category of addons
 			$packageNum = 0;
@@ -352,12 +361,15 @@ 
 			// not always accurate, especially when dealing with repos.  So for now just put in in no conflict mode
 			// and do the save.
 			if ($this->_req->getQuery('area') === 'packageservers' && $this->_req->getQuery('sa') === 'download')
-				$this->_req->query->auto = true;
+			{
+							$this->_req->query->auto = true;
+			}
 
 			return str_replace($invalid, '_', $newname) . $matches[6];
 		}
-		else
-			return basename($name);
+		else {
+					return basename($name);
+		}
 	}
 
 	/**
@@ -384,13 +396,18 @@ 
 
 		// Security is good...
 		if (isset($this->_req->query->server))
-			checkSession('get');
-		else
-			checkSession();
+		{
+					checkSession('get');
+		}
+		else {
+					checkSession();
+		}
 
 		// To download something, we need either a valid server or url.
 		if (empty($this->_req->query->server) && (!empty($this->_req->query->get) && !empty($this->_req->post->package)))
-			throw new Elk_Exception('package_get_error_is_zero', false);
+		{
+					throw new Elk_Exception('package_get_error_is_zero', false);
+		}
 
 		// Start off with nothing
 		$server = '';
@@ -418,8 +435,9 @@ 
 				$url = isset($path_url['dirname']) ? $path_url['dirname'] . '/' : '';
 			}
 			// Not found or some monkey business
-			else
-				throw new Elk_Exception('package_cant_download', false);
+			else {
+							throw new Elk_Exception('package_cant_download', false);
+			}
 		}
 		// Entered a url and optional filename
 		elseif (isset($this->_req->post->byurl) && !empty($this->_req->post->filename))
@@ -443,13 +461,16 @@ 
 				$ext = substr($package_name, strrpos(substr($package_name, 0, -3), '.'));
 				$package_name = substr($package_name, 0, strrpos(substr($package_name, 0, -3), '.')) . '_';
 			}
-			else
-				$ext = '';
+			else {
+							$ext = '';
+			}
 
 			// Find the first available free name
 			$i = 1;
 			while (file_exists(BOARDDIR . '/packages/' . $package_name . $i . $ext))
-				$i++;
+			{
+							$i++;
+			}
 
 			$package_name = $package_name . $i . $ext;
 		}
@@ -458,7 +479,9 @@ 
 		$packageInfo = getPackageInfo($url . $package_id);
 
 		if (!is_array($packageInfo))
-			throw new Elk_Exception($packageInfo);
+		{
+					throw new Elk_Exception($packageInfo);
+		}
 
 		// Save the package to disk, use FTP if necessary
 		create_chmod_control(
@@ -473,7 +496,9 @@ 
 
 		// Done!  Did we get this package automatically?
 		if (preg_match('~^http://[\w_\-]+\.elkarte\.net/~', $package_id) == 1 && strpos($package_id, 'dlattach') === false && isset($this->_req->query->auto))
-			redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+		{
+					redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+		}
 
 		// You just downloaded a addon from SERVER_NAME_GOES_HERE.
 		$context['package_server'] = $server;
@@ -482,16 +507,25 @@ 
 		$context['package'] = getPackageInfo($package_name);
 
 		if (!is_array($context['package']))
-			throw new Elk_Exception('package_cant_download', false);
+		{
+					throw new Elk_Exception('package_cant_download', false);
+		}
 
 		if ($context['package']['type'] === 'modification' || $context['package']['type'] === 'addon')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['install_mod'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['install_mod'] . '</a>';
+		}
 		elseif ($context['package']['type'] === 'avatar')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['use_avatars'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['use_avatars'] . '</a>';
+		}
 		elseif ($context['package']['type'] === 'language')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
-		else
-			$context['package']['install']['link'] = '';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
+		}
+		else {
+					$context['package']['install']['link'] = '';
+		}
 
 		$context['package']['list_files']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $context['package']['filename'] . '">' . $txt['list_files'] . '</a>';
 
@@ -519,7 +553,9 @@ 
 		if (isset($this->_req->query->server))
 		{
 			if ($this->_req->query->server == '')
-				redirectexit('action=admin;area=packageservers');
+			{
+							redirectexit('action=admin;area=packageservers');
+			}
 
 			$server = $this->_req->getQuery('server', 'intval');
 
@@ -530,7 +566,9 @@ 
 
 			// If server does not exist then dump out.
 			if (empty($url))
-				throw new Elk_Exception('couldnt_connect', false);
+			{
+							throw new Elk_Exception('couldnt_connect', false);
+			}
 		}
 
 		return array($name, $url, $server);
@@ -551,15 +589,21 @@ 
 		// @todo Use FTP if the packages directory is not writable.
 		// Check the file was even sent!
 		if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '')
-			throw new Elk_Exception('package_upload_error_nofile');
+		{
+					throw new Elk_Exception('package_upload_error_nofile');
+		}
 		elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name'])))
-			throw new Elk_Exception('package_upload_error_failed');
+		{
+					throw new Elk_Exception('package_upload_error_failed');
+		}
 
 		// Make sure it has a sane filename.
 		$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
 
 		if (strtolower(substr($_FILES['package']['name'], -4)) !== '.zip' && strtolower(substr($_FILES['package']['name'], -4)) !== '.tgz' && strtolower(substr($_FILES['package']['name'], -7)) !== '.tar.gz')
-			throw new Elk_Exception('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
+		{
+					throw new Elk_Exception('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
+		}
 
 		// We only need the filename...
 		$packageName = basename($_FILES['package']['name']);
@@ -569,7 +613,9 @@ 
 
 		// @todo Maybe just roll it like we do for downloads?
 		if (file_exists($destination))
-			throw new Elk_Exception('package_upload_error_exists');
+		{
+					throw new Elk_Exception('package_upload_error_exists');
+		}
 
 		// Now move the file.
 		move_uploaded_file($_FILES['package']['tmp_name'], $destination);
@@ -601,12 +647,16 @@ 
 				{
 					// No need to check these
 					if ($package->getFilename() == $packageName)
-						continue;
+					{
+											continue;
+					}
 
 					// Read package info for the archive we found
 					$packageInfo = getPackageInfo($package->getFilename());
 					if (!is_array($packageInfo))
-						continue;
+					{
+											continue;
+					}
 
 					// If it was already uploaded under another name don't upload it again.
 					if ($packageInfo['id'] == $context['package']['id'] && compareVersions($packageInfo['version'], $context['package']['version']) == 0)
@@ -624,13 +674,20 @@ 
 		}
 
 		if ($context['package']['type'] === 'modification' || $context['package']['type'] === 'addon')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['install_mod'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['install_mod'] . '</a>';
+		}
 		elseif ($context['package']['type'] === 'avatar')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['use_avatars'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['use_avatars'] . '</a>';
+		}
 		elseif ($context['package']['type'] === 'language')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
-		else
-			$context['package']['install']['link'] = '';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
+		}
+		else {
+					$context['package']['install']['link'] = '';
+		}
 
 		$context['package']['list_files']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $context['package']['filename'] . '">' . $txt['list_files'] . '</a>';
 
@@ -654,7 +711,9 @@ 
 
 		// If they put a slash on the end, get rid of it.
 		if (substr($this->_req->post->serverurl, -1) === '/')
-			$this->_req->post->serverurl = substr($this->_req->post->serverurl, 0, -1);
+		{
+					$this->_req->post->serverurl = substr($this->_req->post->serverurl, 0, -1);
+		}
 
 		// Are they both nice and clean?
 		$servername = trim(Util::htmlspecialchars($this->_req->post->servername));
@@ -712,7 +771,9 @@ 
 
 		// Give FTP a chance...
 		if ($context['package_download_broken'])
-			$this->ftp_connect();
+		{
+					$this->ftp_connect();
+		}
 	}
 
 	/**
@@ -769,15 +830,21 @@ 
 				}
 				// ...or we failed
 				elseif ($ftp->error !== false && !isset($ftp_error))
-					$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
+				{
+									$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
+				}
 
 				list ($username, $detect_path, $found_path) = $ftp->detect_path(BOARDDIR);
 
 				if ($found_path || !isset($this->_req->post->ftp_path))
-					$this->_req->post->ftp_path = $detect_path;
+				{
+									$this->_req->post->ftp_path = $detect_path;
+				}
 
 				if (!isset($this->_req->post->ftp_username))
-					$this->_req->post->ftp_username = $username;
+				{
+									$this->_req->post->ftp_username = $username;
+				}
 
 				// Fill the boxes for a FTP connection with data from the previous attempt too, if any
 				$context['package_ftp'] = array(

sources/admin/Admin.controller.php

Braces +21 added lines, -8 removed lines

@@ -82,7 +82,9 @@ 
 
 		// Now - finally - call the right place!
 		if (isset($admin_include_data['file']))
-			require_once($admin_include_data['file']);
+		{
+					require_once($admin_include_data['file']);
+		}
 
 		callMenu($admin_include_data);
 	}
@@ -612,16 +614,20 @@ 
 		);
 
 		if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index')
-			$context['linktree'][] = array(
+		{
+					$context['linktree'][] = array(
 				'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'name' => $admin_include_data['label'],
 			);
+		}
 
 		if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label'])
-			$context['linktree'][] = array(
+		{
+					$context['linktree'][] = array(
 				'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';sa=' . $admin_include_data['current_subsection'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'name' => $admin_include_data['subsections'][$admin_include_data['current_subsection']][0],
 			);
+		}
 	}
 
 	/**
@@ -779,9 +785,12 @@ 
 
 		// You did remember to enter something to search for, otherwise its easy
 		if ($context['search_term'] === '')
-			$context['search_results'] = array();
-		else
-			$action->dispatch($subAction);
+		{
+					$context['search_results'] = array();
+		}
+		else {
+					$action->dispatch($subAction);
+		}
 	}
 
 	/**
@@ -925,7 +934,9 @@ 
 
 		// Encode the search data.
 		foreach ($postVars as $k => $v)
-			$postVars[$k] = urlencode($v);
+		{
+					$postVars[$k] = urlencode($v);
+		}
 
 		// This is what we will send.
 		$postVars = implode('+', $postVars);
@@ -938,7 +949,9 @@ 
 
 		// If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded?
 		if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) !== 1)
-			throw new Elk_Exception('cannot_connect_doc_site');
+		{
+					throw new Elk_Exception('cannot_connect_doc_site');
+		}
 
 		$search_results = !empty($matches[1]) ? $matches[1] : '';