elkarte / Elkarte

sources/subs/Util.class.php

Braces +132 added lines, -51 removed lines

@@ -30,9 +30,12 @@ 
 
 		// 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 . ';';
+		}
 	}
 
 	/**
@@ -49,12 +52,17 @@ 
 		global $modSettings;
 
 		if (empty($string))
-			return $string;
+		{
+					return $string;
+		}
 
 		if (empty($modSettings['disableEntityCheck']))
-			$check = preg_replace_callback('~(&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', htmlspecialchars($string, $quote_style, $charset, $double));
-		else
-			$check = htmlspecialchars($string, $quote_style, $charset, $double);
+		{
+					$check = preg_replace_callback('~(&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', htmlspecialchars($string, $quote_style, $charset, $double));
+		}
+		else {
+					$check = htmlspecialchars($string, $quote_style, $charset, $double);
+		}
 
 		return $check;
 	}
@@ -130,7 +138,9 @@ 
 			{
 				$offset += $result;
 				if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr)
-					return $right ? ($count - $offset - $needle_size + 1) : $offset;
+				{
+									return $right ? ($count - $offset - $needle_size + 1) : $offset;
+				}
 
 				$result = array_search($needle_arr[0], array_slice($haystack_arr, ++$offset));
 			}
@@ -153,9 +163,12 @@ 
 		global $modSettings;
 
 		if (empty($modSettings['disableEntityCheck']))
-			$ent_arr = preg_split('~(&#\d{1,7};|&quot;|&amp;|&lt;|&gt;|&nbsp;|.)~u', preg_replace_callback(self::$_entity_check_reg, 'entity_fix__callback', $string), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-		else
-			$ent_arr = preg_split('~(&#021;|&quot;|&amp;|&lt;|&gt;|&nbsp;|.)~u', $string, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+		{
+					$ent_arr = preg_split('~(&#\d{1,7};|&quot;|&amp;|&lt;|&gt;|&nbsp;|.)~u', preg_replace_callback(self::$_entity_check_reg, 'entity_fix__callback', $string), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+		}
+		else {
+					$ent_arr = preg_split('~(&#021;|&quot;|&amp;|&lt;|&gt;|&nbsp;|.)~u', $string, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+		}
 
 		return $length === null ? implode('', array_slice($ent_arr, $start)) : implode('', array_slice($ent_arr, $start, $length));
 	}
@@ -170,7 +183,9 @@ 
 	public static function strtolower($string)
 	{
 		if (function_exists('mb_strtolower'))
-			return mb_strtolower($string, 'UTF-8');
+		{
+					return mb_strtolower($string, 'UTF-8');
+		}
 		else
 		{
 			require_once(SUBSDIR . '/Charset.subs.php');
@@ -188,7 +203,9 @@ 
 	public static function strtoupper($string)
 	{
 		if (function_exists('mb_strtoupper'))
-			return mb_strtoupper($string, 'UTF-8');
+		{
+					return mb_strtoupper($string, 'UTF-8');
+		}
 		else
 		{
 			require_once(SUBSDIR . '/Charset.subs.php');
@@ -214,12 +231,16 @@ 
 		$ent_list = empty($modSettings['disableEntityCheck']) ? '&(#\d{1,7}|quot|amp|lt|gt|nbsp);' : '&(#021|quot|amp|lt|gt|nbsp);';
 
 		if (empty($modSettings['disableEntityCheck']))
-			$string = preg_replace_callback(self::$_entity_check_reg, 'entity_fix__callback', $string);
+		{
+					$string = preg_replace_callback(self::$_entity_check_reg, 'entity_fix__callback', $string);
+		}
 
 		preg_match('~^(' . $ent_list . '|.){' . self::strlen(substr($string, 0, $length)) . '}~u', $string, $matches);
 		$string = $matches[0];
 		while (strlen($string) > $length)
-			$string = preg_replace('~(?:' . $ent_list . '|.)$~u', '', $string);
+		{
+					$string = preg_replace('~(?:' . $ent_list . '|.)$~u', '', $string);
+		}
 
 		return $string;
 	}
@@ -261,12 +282,15 @@ 
 
 				// Always one clown in the audience who likes long words or not using the spacebar
 				if (!empty($space_pos) && ($length - $space_pos <= $buffer))
-					$string = self::substr($string, 0, $space_pos);
+				{
+									$string = self::substr($string, 0, $space_pos);
+				}
 
 				$string = rtrim($string) . ($ellipsis ? $ellipsis : '');
 			}
-			else
-				$string = self::substr($string, 0, $length - $ending) . ($ellipsis ? $ellipsis : '');
+			else {
+							$string = self::substr($string, 0, $length - $ending) . ($ellipsis ? $ellipsis : '');
+			}
 		}
 
 		return $string;
@@ -288,7 +312,9 @@ 
 	{
 		// If its shorter than the maximum length, while accounting for html tags, simply return
 		if (self::strlen(preg_replace('~<.*?>~', '', $string)) <= $length)
-			return $string;
+		{
+					return $string;
+		}
 
 		// Start off empty
 		$total_length = $exact ? self::strlen($ellipsis) : 0;
@@ -306,14 +332,18 @@ 
 			{
 				// Opening tag add the closing tag to the top of the stack
 				if (preg_match('~<[\w]+[^>]*>~s', $tag[0]))
-					array_unshift($open_tags, $tag[2]);
+				{
+									array_unshift($open_tags, $tag[2]);
+				}
 				// Closing tag
 				elseif (preg_match('~<\/([\w]+)[^>]*>~s', $tag[0], $close_tag))
 				{
 					// Remove its starting tag
 					$pos = array_search($close_tag[1], $open_tags);
 					if ($pos !== false)
-						array_splice($open_tags, $pos, 1);
+					{
+											array_splice($open_tags, $pos, 1);
+					}
 				}
 			}
 
@@ -340,7 +370,9 @@ 
 
 			// Are we there yet?
 			if ($total_length >= $length)
-				break;
+			{
+							break;
+			}
 		}
 
 		// Our truncated string up to the last space
@@ -374,13 +406,17 @@ 
 				foreach ($dropped_tags as $closing_tag)
 				{
 					if (!in_array($closing_tag[1], $open_tags))
-						array_unshift($open_tags, $closing_tag[1]);
+					{
+											array_unshift($open_tags, $closing_tag[1]);
+					}
 				}
 			}
 			else
 			{
 				foreach ($dropped_tags as $closing_tag)
-					$open_tags[] = $closing_tag[1];
+				{
+									$open_tags[] = $closing_tag[1];
+				}
 			}
 		}
 
@@ -392,7 +428,9 @@ 
 
 		// Finally close any html tags that were left open
 		foreach ($open_tags as $tag)
-			$truncate .= '</' . $tag . '>';
+		{
+					$truncate .= '</' . $tag . '>';
+		}
 
 		return $truncate;
 	}
@@ -416,7 +454,9 @@ 
 	{
 		$words = preg_split('~([\s\r\n\t]+)~', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
 		for ($i = 0, $n = count($words); $i < $n; $i += 2)
-			$words[$i] = self::ucfirst($words[$i]);
+		{
+					$words[$i] = self::ucfirst($words[$i]);
+		}
 		return implode('', $words);
 	}
 
@@ -438,9 +478,12 @@ 
 		{
 			$ent_list = '&(#\d{1,7}|quot|amp|lt|gt|nbsp);';
 			if (function_exists('mb_strlen'))
-				return mb_strlen(preg_replace('~' . $ent_list . '|.~u', '_', $string), 'UTF-8');
-			else
-				return strlen(preg_replace('~' . $ent_list . '|.~u', '_', preg_replace_callback(self::$_entity_check_reg, 'entity_fix__callback', $string)));
+			{
+							return mb_strlen(preg_replace('~' . $ent_list . '|.~u', '_', $string), 'UTF-8');
+			}
+			else {
+							return strlen(preg_replace('~' . $ent_list . '|.~u', '_', preg_replace_callback(self::$_entity_check_reg, 'entity_fix__callback', $string)));
+			}
 		}
 		else
 		{
@@ -468,14 +511,18 @@ 
 	public static function stripslashes_recursive($var, $level = 0)
 	{
 		if (!is_array($var))
-			return stripslashes($var);
+		{
+					return stripslashes($var);
+		}
 
 		// Reindex the array without slashes, this time.
 		$new_var = array();
 
 		// Strip the slashes from every element.
 		foreach ($var as $k => $v)
-			$new_var[stripslashes($k)] = $level > 25 ? null : self::stripslashes_recursive($v, $level + 1);
+		{
+					$new_var[stripslashes($k)] = $level > 25 ? null : self::stripslashes_recursive($v, $level + 1);
+		}
 
 		return $new_var;
 	}
@@ -499,14 +546,18 @@ 
 	public static function urldecode_recursive($var, $level = 0)
 	{
 		if (!is_array($var))
-			return urldecode($var);
+		{
+					return urldecode($var);
+		}
 
 		// Reindex the array...
 		$new_var = array();
 
 		// Add the htmlspecialchars to every element.
 		foreach ($var as $k => $v)
-			$new_var[urldecode($k)] = $level > 25 ? null : self::urldecode_recursive($v, $level + 1);
+		{
+					$new_var[urldecode($k)] = $level > 25 ? null : self::urldecode_recursive($v, $level + 1);
+		}
 
 		return $new_var;
 	}
@@ -531,14 +582,18 @@ 
 		$db = database();
 
 		if (!is_array($var))
-		return $db->unescape_string($var);
+		{
+				return $db->unescape_string($var);
+		}
 
 		// Reindex the array without slashes, this time.
 		$new_var = array();
 
 		// Strip the slashes from every element.
 		foreach ($var as $k => $v)
-			$new_var[$db->unescape_string($k)] = self::unescapestring_recursive($v);
+		{
+					$new_var[$db->unescape_string($k)] = self::unescapestring_recursive($v);
+		}
 
 		return $new_var;
 	}
@@ -593,10 +648,14 @@ 
 	public static function strftime(string $format, int $timestamp = null)
 	{
 		if (function_exists('strftime') && (PHP_VERSION_ID < 80100))
-			return \strftime($format, $timestamp);
+		{
+					return \strftime($format, $timestamp);
+		}
 
 		if (is_null($timestamp))
-			$timestamp = time();
+		{
+					$timestamp = time();
+		}
 
 		$date_equivalents = array (
 			'%a' => 'D',
@@ -671,7 +730,9 @@ 
 	public static function gmstrftime(string $format, int $timestamp = null)
 	{
 		if (function_exists('gmstrftime') && (PHP_VERSION_ID < 80100))
-			return \gmstrftime($format, $timestamp);
+		{
+					return \gmstrftime($format, $timestamp);
+		}
 
 		return self::strftime($format, $timestamp);
 	}
@@ -688,7 +749,9 @@ 
 		global $modSettings;
 
 		if (!empty($modSettings['using_utf8mb4']))
-			return $string;
+		{
+					return $string;
+		}
 
 		$result = $string;
 
@@ -713,14 +776,18 @@ 
 					$entity = self::uniord(chr($ord[$i]) . chr($ord[$i + 1]) . chr($ord[$i + 2]) . chr($ord[$i + 3]));
 
 					if ($entity === false)
-						$result .= "\xEF\xBF\xBD";
-					else
-						$result .= '&#x' . dechex($entity) . ';';
+					{
+											$result .= "\xEF\xBF\xBD";
+					}
+					else {
+											$result .= '&#x' . dechex($entity) . ';';
+					}
 
 					$i += 3;
 				}
-				else
-					$result .= $string[$i];
+				else {
+									$result .= $string[$i];
+				}
 			}
 		}
 
@@ -739,25 +806,39 @@ 
 	static function uniord($c)
 	{
 		if (ord($c[0]) >= 0 && ord($c[0]) <= 127)
-			return ord($c[0]);
+		{
+					return ord($c[0]);
+		}
 
 		if (ord($c[0]) >= 192 && ord($c[0]) <= 223)
-			return (ord($c[0]) - 192) * 64 + (ord($c[1]) - 128);
+		{
+					return (ord($c[0]) - 192) * 64 + (ord($c[1]) - 128);
+		}
 
 		if (ord($c[0]) >= 224 && ord($c[0]) <= 239)
-			return (ord($c[0]) - 224) * 4096 + (ord($c[1]) - 128) * 64 + (ord($c[2]) - 128);
+		{
+					return (ord($c[0]) - 224) * 4096 + (ord($c[1]) - 128) * 64 + (ord($c[2]) - 128);
+		}
 
 		if (ord($c[0]) >= 240 && ord($c[0]) <= 247)
-			return (ord($c[0]) - 240) * 262144 + (ord($c[1]) - 128) * 4096 + (ord($c[2]) - 128) * 64 + (ord($c[3]) - 128);
+		{
+					return (ord($c[0]) - 240) * 262144 + (ord($c[1]) - 128) * 4096 + (ord($c[2]) - 128) * 64 + (ord($c[3]) - 128);
+		}
 
 		if (ord($c[0]) >= 248 && ord($c[0]) <= 251)
-			return (ord($c[0]) - 248) * 16777216 + (ord($c[1]) - 128) * 262144 + (ord($c[2]) - 128) * 4096 + (ord($c[3]) - 128) * 64 + (ord($c[4]) - 128);
+		{
+					return (ord($c[0]) - 248) * 16777216 + (ord($c[1]) - 128) * 262144 + (ord($c[2]) - 128) * 4096 + (ord($c[3]) - 128) * 64 + (ord($c[4]) - 128);
+		}
 
 		if (ord($c[0]) >= 252 && ord($c[0]) <= 253)
-			return (ord($c[0]) - 252) * 1073741824 + (ord($c[1]) - 128) * 16777216 + (ord($c[2]) - 128) * 262144 + (ord($c[3]) - 128) * 4096 + (ord($c[4]) - 128) * 64 + (ord($c[5]) - 128);
+		{
+					return (ord($c[0]) - 252) * 1073741824 + (ord($c[1]) - 128) * 16777216 + (ord($c[2]) - 128) * 262144 + (ord($c[3]) - 128) * 4096 + (ord($c[4]) - 128) * 64 + (ord($c[5]) - 128);
+		}
 
 		if (ord($c[0]) >= 254 && ord($c[0]) <= 255)
-			return false;
+		{
+					return false;
+		}
 
 		return 0;
 	}

Spacing +1 added lines, -1 removed lines

@@ -598,7 +598,7 @@
 		if (is_null($timestamp))
 			$timestamp = time();
 
-		$date_equivalents = array (
+		$date_equivalents = array(
 			'%a' => 'D',
 			'%A' => 'l',
 			'%d' => 'd',

themes/default/index.template.php

Braces +88 added lines, -30 removed lines

@@ -110,13 +110,17 @@ 
 function call_template_callbacks($id, $array)
 {
 	if (empty($array))
-		return;
+	{
+			return;
+	}
 
 	foreach ($array as $callback)
 	{
 		$func = 'template_' . $id . '_' . $callback;
 		if (function_exists($func))
-			$func();
+		{
+					$func();
+		}
 	}
 }
 
@@ -137,8 +141,10 @@ 
 	// Tell IE to render the page in standards not compatibility mode. really for ie >= 8
 	// Note if this is not in the first 4k, its ignored, that's why its here
 	if (isBrowser('ie'))
-		echo '
+	{
+			echo '
 	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />';
+	}
 
 	echo '
 	<meta name="viewport" content="width=device-width" />
@@ -147,13 +153,17 @@ 
 
 	// OpenID enabled? Advertise the location of our endpoint using YADIS protocol.
 	if (!empty($modSettings['enableOpenID']))
-		echo '
+	{
+			echo '
 	<meta http-equiv="x-xrds-location" content="' . $scripturl . '?action=xrds" />';
+	}
 
 	// Please don't index these Mr Robot.
 	if (!empty($context['robot_no_index']))
-		echo '
+	{
+			echo '
 	<meta name="robots" content="noindex" />';
+	}
 
 	// If we have any Open Graph data, here is where is inserted.
 	if (!empty($context['open_graph']))
@@ -167,8 +177,10 @@ 
 
 	// Present a canonical url for search engines to prevent duplicate content in their indices.
 	if (!empty($context['canonical_url']))
-		echo '
+	{
+			echo '
 	<link rel="canonical" href="', $context['canonical_url'], '" />';
+	}
 
 	// Show all the relative links, such as help, search, contents, and the like.
 	echo '
@@ -320,8 +332,10 @@ 
 						<input type="hidden" name="', $context['login_token_var'], '" value="', $context['login_token'], '" />';
 
 	if (!empty($modSettings['enableOpenID']))
-		echo '
+	{
+			echo '
 						<a class="icon icon-margin i-openid" href="', $scripturl, '?action=login;openid" title="' . $txt['openid'] . '"><s>' . $txt['openid'] . '"</s></a>';
+	}
 	echo '
 					</div>
 				</form>
@@ -353,18 +367,24 @@ 
 
 		// Can't limit it to a specific topic if we are not in one
 		if (!empty($context['current_topic']))
-			echo '
+		{
+					echo '
 					<option value="topic"', ($selected == 'current_topic' ? ' selected="selected"' : ''), '>', $txt['search_thistopic'], '</option>';
+		}
 
 		// Can't limit it to a specific board if we are not in one
 		if (!empty($context['current_board']))
-			echo '
+		{
+					echo '
 					<option value="board"', ($selected == 'current_board' ? ' selected="selected"' : ''), '>', $txt['search_thisbrd'], '</option>';
+		}
 
 		if (!empty($context['additional_dropdown_search']))
-			foreach ($context['additional_dropdown_search'] as $name => $engine)
+		{
+					foreach ($context['additional_dropdown_search'] as $name => $engine)
 				echo '
 					<option value="', $name, '">', $engine['name'], '</option>';
+		}
 
 		echo '
 					<option value="members"', ($selected == 'members' ? ' selected="selected"' : ''), '>', $txt['search_members'], ' </option>
@@ -374,12 +394,16 @@ 
 
 	// Search within current topic?
 	if (!empty($context['current_topic']))
-		echo '
+	{
+			echo '
 				<input type="hidden" name="', (!empty($modSettings['search_dropdown']) ? 'sd_topic' : 'topic'), '" value="', $context['current_topic'], '" />';
+	}
 	// If we're on a certain board, limit it to this board ;).
 	if (!empty($context['current_board']))
-		echo '
+	{
+			echo '
 				<input type="hidden" name="', (!empty($modSettings['search_dropdown']) ? 'sd_brd[' : 'brd['), $context['current_board'], ']"', ' value="', $context['current_board'], '" />';
+	}
 
 	echo '
 				<button type="submit" name="search;sa=results" class="', (!empty($modSettings['search_dropdown'])) ? 'with_select' : '', '"><i class="icon i-search icon-shade"></i></button>
@@ -435,9 +459,11 @@ 
 
 	// Show the load time?
 	if ($context['show_load_time'])
-		echo '
+	{
+			echo '
 			<p>', sprintf($txt['page_created_full'], $context['load_time'], $context['load_queries']), '</p>';
-}
+	}
+	}
 
 /**
  * Section down the page, at closing html tag
@@ -473,7 +499,9 @@ 
 
 	// Anything special to put out?
 	if (!empty($context['insert_after_template']))
-		echo $context['insert_after_template'];
+	{
+			echo $context['insert_after_template'];
+	}
 
 	echo '
 </body>
@@ -493,7 +521,9 @@ 
 
 	// If linktree is empty, just return - also allow an override.
 	if (empty($context[$default]))
-		return;
+	{
+			return;
+	}
 
 	// @todo - Look at changing markup here slightly. Need to incorporate relevant aria roles.
 	echo '
@@ -511,14 +541,18 @@ 
 		// Dividers moved to pseudo-elements in CSS.
 		// Show something before the link?
 		if (isset($tree['extra_before']))
-			echo $tree['extra_before'];
+		{
+					echo $tree['extra_before'];
+		}
 
 		// Show the link, including a URL if it should have one.
 		echo $settings['linktree_link'] && isset($tree['url']) ? '<a href="' . $tree['url'] . '">' . ($pos == 0 ? '<i class="icon i-home"><s>' . $txt['home'] . '</s></i>' : $tree['name']) . '</a>' : $tree['name'];
 
 		// Show something after the link...?
 		if (isset($tree['extra_after']))
-			echo $tree['extra_after'];
+		{
+					echo $tree['extra_after'];
+		}
 
 		echo '
 						</span>
@@ -575,10 +609,12 @@ 
 									<ul class="menulevel3" role="menu">';
 
 					foreach ($childbutton['sub_buttons'] as $grandchildact => $grandchildbutton)
-						echo '
+					{
+											echo '
 										<li id="button_', $grandchildact, '" class="listlevel3">
 											<a class="linklevel3" href="', $grandchildbutton['href'], '" ', isset($grandchildbutton['target']) ? 'target="' . $grandchildbutton['target'] . '"' : '', '>', $grandchildbutton['title'], '</a>
 										</li>';
+					}
 
 					echo '
 									</ul>';
@@ -647,23 +683,31 @@ 
 
 	// Not sure if this can happen, but people can misuse functions very efficiently
 	if (empty($button_strip))
-		return '';
+	{
+			return '';
+	}
 
 	if (!is_array($strip_options))
-		$strip_options = array();
+	{
+			$strip_options = array();
+	}
 
 	// Create the buttons... now with cleaner markup (yay!).
 	$buttons = array();
 	foreach ($button_strip as $key => $value)
 	{
 		if (!isset($value['test']) || !empty($context[$value['test']]))
-			$buttons[] = '
+		{
+					$buttons[] = '
 								<li role="menuitem"><a' . (isset($value['id']) ? ' id="button_strip_' . $value['id'] . '"' : '') . ' class="linklevel1 button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . '" href="' . $value['url'] . '"' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . $txt[$value['text']] . '</a></li>';
+		}
 	}
 
 	// No buttons? No button strip either.
 	if (empty($buttons))
-		return '';
+	{
+			return '';
+	}
 
 	echo '
 							<ul role="menubar" class="buttonlist', !empty($direction) ? ' float' . $direction : '', (empty($buttons) ? ' hide"' : '"'), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"' : ''), '>
@@ -777,7 +821,9 @@ 
 	global $context;
 
 	if (empty($error_id))
-		return;
+	{
+			return;
+	}
 
 	$error = isset($context[$error_id]) ? $context[$error_id] : array();
 
@@ -786,12 +832,14 @@ 
 
 	// Optional title for our results
 	if (!empty($error['title']))
-		echo '
+	{
+			echo '
 						<dl>
 							<dt>
 								<strong id="', $error_id, '_title">', $error['title'], '</strong>
 							</dt>
 							<dd>';
+	}
 
 	// Everything that went wrong, or correctly :)
 	if (!empty($error['errors']))
@@ -800,17 +848,21 @@ 
 								<ul', (isset($error['type']) ? ' class="error"' : ''), ' id="', $error_id, '_list">';
 
 		foreach ($error['errors'] as $key => $err)
-			echo '
+		{
+					echo '
 									<li id="', $error_id, '_', $key, '">', $err, '</li>';
+		}
 		echo '
 								</ul>';
 	}
 
 	// All done
 	if (!empty($error['title']))
-		echo '
+	{
+			echo '
 							</dd>
 						</dl>';
+	}
 
 	echo '
 					</div>';
@@ -851,16 +903,22 @@ 
 	// Hmmm. I'm a tad wary of having floatleft here but anyway............
 	// @todo - Try using table-cell display here. Should do auto rtl support. Less markup, less css. :)
 	if (!empty($options['page_index_markup']))
-		$pages = '<ul ' . (isset($options['page_index_id']) ? 'id="' . $options['page_index_id'] . '" ' : '') . 'class="pagelinks floatleft" role="menubar">' . $options['page_index_markup'] . '</ul>';
+	{
+			$pages = '<ul ' . (isset($options['page_index_id']) ? 'id="' . $options['page_index_id'] . '" ' : '') . 'class="pagelinks floatleft" role="menubar">' . $options['page_index_markup'] . '</ul>';
+	}
 	else
 	{
 		if (!isset($options['page_index']))
-			$options['page_index'] = 'page_index';
+		{
+					$options['page_index'] = 'page_index';
+		}
 		$pages = empty($context[$options['page_index']]) ? '' : '<ul ' . (isset($options['page_index_id']) ? 'id="' . $options['page_index_id'] . '" ' : '') . 'class="pagelinks floatleft" role="menubar">' . $context[$options['page_index']] . '</ul>';
 	}
 
 	if (!isset($options['extra']))
-		$options['extra'] = '';
+	{
+			$options['extra'] = '';
+	}
 
 	echo '
 			<nav class="pagesection">

sources/subs/BBC/SmileyParser.php

Spacing +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
 				ORDER BY LENGTH(code) DESC',
 				array(
 				),
-				function ($row) use (&$smileysfrom, &$smileysto, &$smileysdescs)
+				function($row) use (&$smileysfrom, &$smileysto, &$smileysdescs)
 				{
 					$smileysfrom[] = $row['code'];
 					$smileysto[] = htmlspecialchars($row['filename']);

sources/subs/BBC/Codes.php

Spacing +9 added lines, -9 removed lines

@@ -358,7 +358,7 @@ 
 				self::ATTR_TAG => 'code',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
 				self::ATTR_CONTENT => '<div class="codeheader">' . $txt['code'] . ': <a href="#" onclick="return elkSelectText(this);" class="codeoperation">' . $txt['code_select'] . '</a></div><pre class="bbc_code prettyprint">$1</pre>',
-				self::ATTR_VALIDATE => $this->isDisabled('code') ? null : function (&$tag, &$data) {
+				self::ATTR_VALIDATE => $this->isDisabled('code') ? null : function(&$tag, &$data) {
 					$data = tabToHtmlTab(strtr($data, array('[' => '&#91;', ']' => '&#93;')));
 				},
 				self::ATTR_BLOCK_LEVEL => true,
@@ -369,7 +369,7 @@ 
 				self::ATTR_TAG => 'code',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_EQUALS_CONTENT,
 				self::ATTR_CONTENT => '<div class="codeheader">' . $txt['code'] . ': ($2) <a href="#" onclick="return elkSelectText(this);" class="codeoperation">' . $txt['code_select'] . '</a></div><pre class="bbc_code prettyprint">$1</pre>',
-				self::ATTR_VALIDATE => $this->isDisabled('code') ? null : function (&$tag, &$data) {
+				self::ATTR_VALIDATE => $this->isDisabled('code') ? null : function(&$tag, &$data) {
 					$data[0] = tabToHtmlTab(strtr($data[0], array('[' => '&#91;', ']' => '&#93;')));
 				},
 				self::ATTR_BLOCK_LEVEL => true,
@@ -479,7 +479,7 @@ 
 					),
 				),
 				self::ATTR_CONTENT => '<img src="$1" title="{title}" alt="{alt}" style="{width}{height}" class="bbc_img resized" />',
-				self::ATTR_VALIDATE => function (&$tag, &$data) {
+				self::ATTR_VALIDATE => function(&$tag, &$data) {
 					$data = addProtocol($data);
 				},
 				self::ATTR_DISABLED_CONTENT => '($1)',
@@ -491,7 +491,7 @@ 
 				self::ATTR_TAG => 'img',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
 				self::ATTR_CONTENT => '<img src="$1" alt="" class="bbc_img" />',
-				self::ATTR_VALIDATE => function (&$tag, &$data) {
+				self::ATTR_VALIDATE => function(&$tag, &$data) {
 					$data = addProtocol($data);
 				},
 				self::ATTR_DISABLED_CONTENT => '($1)',
@@ -503,7 +503,7 @@ 
 				self::ATTR_TAG => 'iurl',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
 				self::ATTR_CONTENT => '<a href="$1" class="bbc_link">$1</a>',
-				self::ATTR_VALIDATE => function (&$tag, &$data) {
+				self::ATTR_VALIDATE => function(&$tag, &$data) {
 					//$data = removeBr($data);
 					$data = addProtocol($data);
 				},
@@ -516,7 +516,7 @@ 
 				self::ATTR_TYPE => self::TYPE_UNPARSED_EQUALS,
 				self::ATTR_BEFORE => '<a href="$1" class="bbc_link">',
 				self::ATTR_AFTER => '</a>',
-				self::ATTR_VALIDATE => function (&$tag, &$data) {
+				self::ATTR_VALIDATE => function(&$tag, &$data) {
 					if ($data[0] === '#')
 					{
 						$data = '#post_' . substr($data, 1);
@@ -730,7 +730,7 @@ 
 				self::ATTR_TEST => '[1-7]{1}',
 				self::ATTR_BEFORE => '<span style="font-size: $1;" class="bbc_size">',
 				self::ATTR_AFTER => '</span>',
-				self::ATTR_VALIDATE => function (&$tag, &$data) {
+				self::ATTR_VALIDATE => function(&$tag, &$data) {
 					$sizes = array(1 => 0.7, 2 => 1.0, 3 => 1.35, 4 => 1.45, 5 => 2.0, 6 => 2.65, 7 => 3.95);
 					$data = $sizes[(int) $data] . 'em';
 				},
@@ -867,7 +867,7 @@ 
 				self::ATTR_TAG => 'url',
 				self::ATTR_TYPE => self::TYPE_UNPARSED_CONTENT,
 				self::ATTR_CONTENT => '<a href="$1" class="bbc_link" target="_blank" rel="noopener noreferrer">$1</a>',
-				self::ATTR_VALIDATE => function (&$tag, &$data) {
+				self::ATTR_VALIDATE => function(&$tag, &$data) {
 					$data = addProtocol($data);
 				},
 				self::ATTR_BLOCK_LEVEL => false,
@@ -879,7 +879,7 @@ 
 				self::ATTR_TYPE => self::TYPE_UNPARSED_EQUALS,
 				self::ATTR_BEFORE => '<a href="$1" class="bbc_link" target="_blank" rel="noopener noreferrer">',
 				self::ATTR_AFTER => '</a>',
-				self::ATTR_VALIDATE => function (&$tag, &$data) {
+				self::ATTR_VALIDATE => function(&$tag, &$data) {
 					$data = addProtocol($data);
 				},
 				self::ATTR_DISALLOW_CHILDREN => array(

sources/subs/Mail.subs.php

Spacing +3 added lines, -3 removed lines

@@ -1017,7 +1017,7 @@ 
 			'sort' => $sort,
 			'items_per_page' => $items_per_page,
 		),
-		function ($row) use ($txt)
+		function($row) use ($txt)
 		{
 			// Private PM/email subjects and similar shouldn't be shown in the mailbox area.
 			if (!empty($row['private']))
@@ -1241,7 +1241,7 @@ 
 		LIMIT ' . $number,
 		array(
 		),
-		function ($row) use(&$ids, &$emails)
+		function($row) use(&$ids, &$emails)
 		{
 			// Just get the data and go.
 			$ids[] = $row['id_mail'];
@@ -1427,7 +1427,7 @@ 
 
 			// If it sent, keep a record so we can save it in our allowed to reply log
 			if (!empty($unq_head) && $result)
-				$sent[] = array_merge($unq_head_array, array(time(),$email['to']));
+				$sent[] = array_merge($unq_head_array, array(time(), $email['to']));
 
 			// Track total emails sent
 			if ($result && !empty($modSettings['trackStats']))

Braces +231 added lines, -88 removed lines

@@ -80,14 +80,18 @@ 
 
 		// Call this function recursively for the hotmail addresses.
 		if (!empty($hotmail_to))
-			$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_type . $message_id, $send_html, $priority, true, $is_private, $from_wrapper, $reference);
+		{
+					$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_type . $message_id, $send_html, $priority, true, $is_private, $from_wrapper, $reference);
+		}
 
 		// The remaining addresses no longer need the fix.
 		$hotmail_fix = false;
 
 		// No other addresses left? Return instantly.
 		if (empty($to_array))
-			return $mail_result;
+		{
+					return $mail_result;
+		}
 	}
 
 	// Get rid of entities.
@@ -111,22 +115,29 @@ 
 		// Be sure there is never an email in the from name if using maillist styles
 		$dmarc_from = $from;
 		if (filter_var($dmarc_from, FILTER_VALIDATE_EMAIL))
-			$dmarc_from = str_replace(strstr($dmarc_from, '@'), '', $dmarc_from);
+		{
+					$dmarc_from = str_replace(strstr($dmarc_from, '@'), '', $dmarc_from);
+		}
 
 		// Add in the 'via' if desired, helps prevent email clients from learning/replacing legit names/emails
 		if (!empty($modSettings['maillist_sitename']) && empty($modSettings['dmarc_spec_standard']))
-			// @memo (2014) "via" is still a draft, and it's not yet clear if it will be localized or not.
+		{
+					// @memo (2014) "via" is still a draft, and it's not yet clear if it will be localized or not.
 			// To play safe, we are keeping it hard-coded, but the string is available for translation.
 			$from = $dmarc_from . ' ' . /* $txt['via'] */ 'via' . ' ' . $modSettings['maillist_sitename'];
-		else
-			$from = $dmarc_from;
+		}
+		else {
+					$from = $dmarc_from;
+		}
 	}
 
 	// Take care of from / subject encodings
 	list (, $from_name, $from_encoding) = mimespecialchars(addcslashes($from !== null ? $from : (!empty($modSettings['maillist_sitename']) ? $modSettings['maillist_sitename'] : $context['forum_name']), '<>()\'\\"'), true, $hotmail_fix, $line_break);
 	list (, $subject) = mimespecialchars($subject, true, $hotmail_fix, $line_break);
 	if ($from_encoding !== 'base64')
-		$from_name = '"' . $from_name . '"';
+	{
+			$from_name = '"' . $from_name . '"';
+	}
 
 	// Construct the from / replyTo mail headers, based on if we showing a users name
 	if ($from_wrapper !== null)
@@ -136,7 +147,9 @@ 
 		// If they reply where is it going to be sent?
 		$headers .= 'Reply-To: "' . (!empty($modSettings['maillist_sitename']) ? $modSettings['maillist_sitename'] : $context['forum_name']) . '" <' . (!empty($modSettings['maillist_sitename_address']) ? $modSettings['maillist_sitename_address'] : (empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'])) . '>' . $line_break;
 		if ($reference !== null)
-			$headers .= 'References: <' . $reference . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>' . $line_break;
+		{
+					$headers .= 'References: <' . $reference . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>' . $line_break;
+		}
 	}
 	else
 	{
@@ -150,7 +163,9 @@ 
 
 	// Return path, date, mailer
 	if ($use_sendmail)
-		$headers .= 'Return-Path: <' . $return_path . '>' . $line_break;
+	{
+			$headers .= 'Return-Path: <' . $return_path . '>' . $line_break;
+	}
 	$headers .= 'Date: ' . gmdate('D, d M Y H:i:s') . ' -0000' . $line_break;
 	$headers .= 'X-Mailer: ELK' . $line_break;
 
@@ -170,7 +185,9 @@ 
 
 	// Pass this to the integration before we start modifying the output -- it'll make it easier later.
 	if (in_array(false, call_integration_hook('integrate_outgoing_email', array(&$subject, &$message, &$headers)), true))
-		return false;
+	{
+			return false;
+	}
 
 	// Save the original message...
 	$orig_message = $message;
@@ -223,15 +240,20 @@ 
 
 	// Are we using the mail queue, if so this is where we butt in...
 	if (!empty($modSettings['mail_queue']) && $priority != 0)
-		return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private, $message_type . $message_id);
+	{
+			return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private, $message_type . $message_id);
+	}
 	// If it's a priority mail, send it now - note though that this should NOT be used for sending many at once.
 	elseif (!empty($modSettings['mail_queue']) && !empty($modSettings['mail_period_limit']))
 	{
 		list ($last_mail_time, $mails_this_minute) = @explode('|', $modSettings['mail_recent']);
 		if (empty($mails_this_minute) || time() > (int) $last_mail_time + 60)
-			$new_queue_stat = time() . '|' . 1;
-		else
-			$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		{
+					$new_queue_stat = time() . '|' . 1;
+		}
+		else {
+					$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		}
 
 		updateSettings(array('mail_recent' => $new_queue_stat));
 	}
@@ -265,7 +287,9 @@ 
 				$message = mail_insert_key($message, $unq_head, $line_break);
 			}
 			elseif (empty($modSettings['mail_no_message_id']))
-				$unq_id = ($need_break ? $line_break : '') . 'Message-ID: <' . md5($boardurl . microtime()) . '-' . $message_id . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>';
+			{
+							$unq_id = ($need_break ? $line_break : '') . 'Message-ID: <' . md5($boardurl . microtime()) . '-' . $message_id . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>';
+			}
 
 			// This is frequently not set, or not set according to the needs of PBE and bounce detection
 			// We have to use ini_set, since "-f <address>" doesn't work on windows systems, so we need both
@@ -287,7 +311,9 @@ 
 
 				// Track total emails sent
 				if (!empty($modSettings['trackStats']))
-					trackStats(array('email' => '+'));
+				{
+									trackStats(array('email' => '+'));
+				}
 			}
 
 			// Put it back
@@ -304,9 +330,10 @@ 
 			log_email($sent);
 		}
 	}
-	else
-		// SMTP protocol it is
+	else {
+			// SMTP protocol it is
 		$mail_result = $mail_result && smtp_mail($to_array, $subject, $message, $headers, $priority, $message_type . $message_id);
+	}
 
 	// Clear out the stat cache.
 	trackStats();
@@ -340,7 +367,9 @@ 
 	static $cur_insert_len = 0;
 
 	if ($cur_insert_len == 0)
-		$cur_insert = array();
+	{
+			$cur_insert = array();
+	}
 
 	// If we're flushing, make the final inserts - also if we're near the MySQL length limit!
 	if (($flush || $cur_insert_len > 800000) && !empty($cur_insert))
@@ -417,7 +446,9 @@ 
 
 	// If they are using SSI there is a good chance obExit will never be called.  So lets be nice and flush it for them.
 	if (ELK === 'SSI')
-		return AddMailQueue(true);
+	{
+			return AddMailQueue(true);
+	}
 
 	return true;
 }
@@ -451,12 +482,16 @@ 
 		$simple = true;
 
 		foreach ($matches[1] as $entity)
-			if ($entity > 128)
+		{
+					if ($entity > 128)
 				$simple = false;
+		}
 		unset($matches);
 
 		if ($simple)
-			$string = preg_replace_callback('~&#(\d{3,7});~', 'mimespecialchars_callback', $string);
+		{
+					$string = preg_replace_callback('~&#(\d{3,7});~', 'mimespecialchars_callback', $string);
+		}
 		else
 		{
 			$string = preg_replace_callback('~&#(\d{3,7});~', 'fixchar__callback', $string);
@@ -484,17 +519,21 @@ 
 
 		// Show the characterset and the transfer-encoding for header strings.
 		if ($with_charset)
-			$string = '=?' . $charset . '?B?' . $string . '?=';
+		{
+					$string = '=?' . $charset . '?B?' . $string . '?=';
+		}
 
 		// Break it up in lines (mail body).
-		else
-			$string = chunk_split($string, 76, $line_break);
+		else {
+					$string = chunk_split($string, 76, $line_break);
+		}
 
 		return array($charset, $string, 'base64');
 	}
-	else
-		return array($charset, $string, '7bit');
-}
+	else {
+			return array($charset, $string, '7bit');
+	}
+	}
 
 /**
  * Converts out of ascii range characters in to HTML entities
@@ -512,16 +551,25 @@ 
 	$c_ord = ord($c[0]);
 
 	if ($c_strlen === 1 && $c_ord <= 0x7F)
-		return $c;
+	{
+			return $c;
+	}
 	elseif ($c_strlen === 2 && $c_ord >= 0xC0 && $c_ord <= 0xDF)
-		return '&#' . ((($c_ord ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ';';
+	{
+			return '&#' . ((($c_ord ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ';';
+	}
 	elseif ($c_strlen === 3 && $c_ord >= 0xE0 && $c_ord <= 0xEF)
-		return '&#' . ((($c_ord ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ';';
+	{
+			return '&#' . ((($c_ord ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ';';
+	}
 	elseif ($c_strlen === 4 && $c_ord >= 0xF0 && $c_ord <= 0xF7)
-		return '&#' . ((($c_ord ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ';';
-	else
-		return '';
-}
+	{
+			return '&#' . ((($c_ord ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ';';
+	}
+	else {
+			return '';
+	}
+	}
 
 /**
  * Callback for the preg_replace in mimespecialchars
@@ -571,7 +619,9 @@ 
 	{
 		$socket = fsockopen($modSettings['smtp_host'], 110, $errno, $errstr, 2);
 		if (!$socket && (substr($modSettings['smtp_host'], 0, 5) == 'smtp.' || substr($modSettings['smtp_host'], 0, 11) == 'ssl://smtp.'))
-			$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		{
+					$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		}
 
 		if ($socket)
 		{
@@ -593,7 +643,9 @@ 
 		if (substr($modSettings['smtp_host'], 0, 4) == 'ssl:' && (empty($modSettings['smtp_port']) || $modSettings['smtp_port'] == 25))
 		{
 			if ($socket = @fsockopen($modSettings['smtp_host'], 465, $errno, $errstr, 3))
-				Errors::instance()->log_error($txt['smtp_port_ssl']);
+			{
+							Errors::instance()->log_error($txt['smtp_port_ssl']);
+			}
 		}
 
 		// Unable to connect!  Don't show any error message, but just log one and try to continue anyway.
@@ -606,7 +658,9 @@ 
 
 	// Wait for a response of 220, without "-" continue.
 	if (!server_parse(null, $socket, '220'))
-		return false;
+	{
+			return false;
+	}
 
 	// This should be set in the ACP
 	if (empty($modSettings['smtp_client']))
@@ -628,22 +682,32 @@ 
 			}
 
 			if (!server_parse('AUTH LOGIN', $socket, '334'))
-				return false;
+			{
+							return false;
+			}
 			// Send the username and password, encoded.
 			if (!server_parse(base64_encode($modSettings['smtp_username']), $socket, '334'))
-				return false;
+			{
+							return false;
+			}
 			// The password is already encoded ;)
 			if (!server_parse($modSettings['smtp_password'], $socket, '235'))
-				return false;
+			{
+							return false;
+			}
 		}
 		elseif (!server_parse('HELO ' . $modSettings['smtp_client'], $socket, '250'))
-			return false;
+		{
+					return false;
+		}
 	}
 	else
 	{
 		// Just say "helo".
 		if (!server_parse('HELO ' . $modSettings['smtp_client'], $socket, '250'))
-			return false;
+		{
+					return false;
+		}
 	}
 
 	// Fix the message for any lines beginning with a period! (the first is ignored, you see.)
@@ -683,30 +747,44 @@ 
 		if ($i != 0)
 		{
 			if (!server_parse('RSET', $socket, '250'))
-				return false;
+			{
+							return false;
+			}
 		}
 
 		// From, to, and then start the data...
 		if (!server_parse('MAIL FROM: <' . $return_path . '>', $socket, '250'))
-			return false;
+		{
+					return false;
+		}
 		if (!server_parse('RCPT TO: <' . $mail_to . '>', $socket, '250'))
-			return false;
+		{
+					return false;
+		}
 		if (!server_parse('DATA', $socket, '354'))
-			return false;
+		{
+					return false;
+		}
 
 		fputs($socket, 'Subject: ' . $subject . $line_break);
 		if (strlen($mail_to) > 0)
-			fputs($socket, 'To: <' . $mail_to . '>' . $line_break);
+		{
+					fputs($socket, 'To: <' . $mail_to . '>' . $line_break);
+		}
 		fputs($socket, $headers . $line_break . $line_break);
 		fputs($socket, $message . $line_break);
 
 		// Send a ., or in other words "end of data".
 		if (!server_parse('.', $socket, '250'))
-			return false;
+		{
+					return false;
+		}
 
 		// track the number of emails sent
 		if (!empty($modSettings['trackStats']))
-			trackStats(array('email' => '+'));
+		{
+					trackStats(array('email' => '+'));
+		}
 
 		// Keep our post via email log
 		if (!empty($unq_head))
@@ -751,21 +829,27 @@ 
 	global $txt;
 
 	if ($message !== null)
-		fputs($socket, $message . "\r\n");
+	{
+			fputs($socket, $message . "\r\n");
+	}
 
 	// No response yet.
 	$server_response = '';
 
 	while (substr($server_response, 3, 1) != ' ')
-		if (!($server_response = fgets($socket, 256)))
+	{
+			if (!($server_response = fgets($socket, 256)))
 		{
 			// @todo Change this message to reflect that it may mean bad user/password/server issues/etc.
 			Errors::instance()->log_error($txt['smtp_bad_response']);
+	}
 			return false;
 		}
 
 	if ($response === null)
-		return substr($server_response, 0, 3);
+	{
+			return substr($server_response, 0, 3);
+	}
 
 	if (substr($server_response, 0, 3) != $response)
 	{
@@ -833,17 +917,23 @@ 
 	{
 		loadLanguage('EmailTemplates', $lang);
 		if (!empty($modSettings['maillist_enabled']))
-			loadLanguage('MaillistTemplates', $lang);
+		{
+					loadLanguage('MaillistTemplates', $lang);
+		}
 
 		if (!empty($additional_files))
 		{
 			foreach ($additional_files as $file)
-				loadLanguage($file, $lang);
+			{
+							loadLanguage($file, $lang);
+			}
 		}
 	}
 
 	if (!isset($txt[$template . '_subject']) || !isset($txt[$template . '_body']))
-		throw new Elk_Exception('email_no_template', 'template', array($template));
+	{
+			throw new Elk_Exception('email_no_template', 'template', array($template));
+	}
 
 	$ret = array(
 		'subject' => $txt[$template . '_subject'],
@@ -852,7 +942,9 @@ 
 	if (!empty($suffixes))
 	{
 		foreach ($suffixes as $key)
-			$ret[$key] = $txt[$template . '_' . $key];
+		{
+					$ret[$key] = $txt[$template . '_' . $key];
+		}
 	}
 
 	// Add in the default replacements.
@@ -932,9 +1024,13 @@ 
 		$context[$key] = !empty($_REQUEST[$post]) ? $_REQUEST[$post] : '';
 
 		if (empty($context[$key]) && empty($_REQUEST['xml']))
-			$context['post_error']['messages'][] = $txt['error_no_' . $post];
+		{
+					$context['post_error']['messages'][] = $txt['error_no_' . $post];
+		}
 		elseif (!empty($_REQUEST['xml']))
-			continue;
+		{
+					continue;
+		}
 
 		preparsecode($context[$key]);
 
@@ -972,7 +1068,9 @@ 
 	global $user_info;
 
 	if (empty($matches[1]))
-		return '';
+	{
+			return '';
+	}
 
 	$use_ref = true;
 	$ref = &$user_info;
@@ -980,7 +1078,9 @@ 
 	foreach (explode('.', $matches[1]) as $index)
 	{
 		if ($use_ref && isset($ref[$index]))
-			$ref = &$ref[$index];
+		{
+					$ref = &$ref[$index];
+		}
 		else
 		{
 			$use_ref = false;
@@ -1021,7 +1121,9 @@ 
 		{
 			// Private PM/email subjects and similar shouldn't be shown in the mailbox area.
 			if (!empty($row['private']))
-				$row['subject'] = $txt['personal_message'];
+			{
+							$row['subject'] = $txt['personal_message'];
+			}
 
 			return $row;
 		}
@@ -1118,7 +1220,8 @@ 
 
 	// If we have failed to many times, tell mail to wait a bit and try again.
 	if ($modSettings['mail_failed_attempts'] > 5)
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}settings
 			SET value = {string:next_mail_send}
 			WHERE variable = {string:mail_next_send}
@@ -1129,6 +1232,7 @@ 
 				'last_send' => $modSettings['mail_next_send'],
 			)
 		);
+	}
 
 	// Add our email back to the queue, manually.
 	$db->insert('insert',
@@ -1215,7 +1319,9 @@ 
 		)
 	);
 	if ($db->affected_rows() == 0)
-		return false;
+	{
+			return false;
+	}
 
 	return $delay;
 }
@@ -1280,17 +1386,23 @@ 
 
 	// Do we have another script to send out the queue?
 	if (!empty($modSettings['mail_queue_use_cron']) && empty($force_send))
-		return false;
+	{
+			return false;
+	}
 
 	// How many emails can we send each time we are called in a period
 	if (!$batch_size)
 	{
 		// Batch size has been set in the ACP, use it
 		if (!empty($modSettings['mail_batch_size']))
-			$batch_size = $modSettings['mail_batch_size'];
+		{
+					$batch_size = $modSettings['mail_batch_size'];
+		}
 		// No per period setting or batch size, set to send 5 every 5 seconds, or 60 per minute
 		elseif (empty($modSettings['mail_period_limit']))
-			$batch_size = 5;
+		{
+					$batch_size = 5;
+		}
 		// A per period limit but no defined batch size, set a batch size
 		else
 		{
@@ -1303,7 +1415,9 @@ 
 
 	// If we came with a timestamp, and that doesn't match the next event, then someone else has beaten us.
 	if (isset($_GET['ts']) && $_GET['ts'] != $modSettings['mail_next_send'] && empty($force_send))
-		return false;
+	{
+			return false;
+	}
 
 	// Prepare to send each email, and log that for future proof.
 	require_once(SUBSDIR . '/Maillist.subs.php');
@@ -1315,7 +1429,9 @@ 
 		// Update next send time for our mail queue, if there was something to update. Otherwise bail out :P
 		$delay = updateNextSendTime();
 		if ($delay === false)
-			return false;
+		{
+					return false;
+		}
 
 		$modSettings['mail_next_send'] = time() + $delay;
 	}
@@ -1337,16 +1453,21 @@ 
 		{
 			// If this is likely one of the last cycles for this period, then send any remaining quota
 			if (($mail_time - (time() - 60)) < $delay * 2)
-				$batch_size = $modSettings['mail_period_limit'] - $mail_number;
+			{
+							$batch_size = $modSettings['mail_period_limit'] - $mail_number;
+			}
 			// Some batch sizes may need to be adjusted to fit as we approach the end
 			elseif ($mail_number + $batch_size > $modSettings['mail_period_limit'])
-				$batch_size = $modSettings['mail_period_limit'] - $mail_number;
+			{
+							$batch_size = $modSettings['mail_period_limit'] - $mail_number;
+			}
 
 			$mail_number += $batch_size;
 		}
 		// No more I'm afraid, return!
-		else
-			return false;
+		else {
+					return false;
+		}
 
 		// Reflect that we're about to send some, do it now to be safe.
 		updateSettings(array('mail_recent' => $mail_time . '|' . $mail_number));
@@ -1357,14 +1478,20 @@ 
 
 	// Delete, delete, delete!!!
 	if (!empty($ids))
-		deleteMailQueueItems($ids);
+	{
+			deleteMailQueueItems($ids);
+	}
 
 	// Don't believe we have any left after this batch?
 	if (count($ids) < $batch_size)
-		resetNextSendTime();
+	{
+			resetNextSendTime();
+	}
 
 	if (empty($ids))
-		return false;
+	{
+			return false;
+	}
 
 	// We have some to send, lets send them!
 	$sent = array();
@@ -1420,28 +1547,37 @@ 
 				$email['body'] = mail_insert_key($email['body'], $unq_head, $line_break);
 			}
 			elseif ($email['message_id'] !== null && empty($modSettings['mail_no_message_id']))
-				$unq_id = ($need_break ? $line_break : '') . 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $email['message_id'] . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>';
+			{
+							$unq_id = ($need_break ? $line_break : '') . 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $email['message_id'] . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>';
+			}
 
 			// No point logging a specific error here, as we have no language. PHP error is helpful anyway...
 			$result = mail(strtr($email['to'], array("\r" => '', "\n" => '')), $email['subject'], $email['body'], $email['headers'] . $unq_id);
 
 			// If it sent, keep a record so we can save it in our allowed to reply log
 			if (!empty($unq_head) && $result)
-				$sent[] = array_merge($unq_head_array, array(time(),$email['to']));
+			{
+							$sent[] = array_merge($unq_head_array, array(time(),$email['to']));
+			}
 
 			// Track total emails sent
 			if ($result && !empty($modSettings['trackStats']))
-				trackStats(array('email' => '+'));
+			{
+							trackStats(array('email' => '+'));
+			}
 
 			// Try to stop a timeout, this would be bad...
 			detectServer()->setTimeLimit(300);
 		}
-		else
-			$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers'], $email['priority'], $email['message_type'] . $email['message_id']);
+		else {
+					$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers'], $email['priority'], $email['message_type'] . $email['message_id']);
+		}
 
 		// Hopefully it sent?
 		if (!$result)
-			$failed_emails[] = array(time(), $email['to'], $email['body_fail'], $email['subject'], $email['headers'], $email['send_html'], $email['priority'], $email['private'], $email['message_id']);
+		{
+					$failed_emails[] = array(time(), $email['to'], $email['body_fail'], $email['subject'], $email['headers'], $email['send_html'], $email['priority'], $email['private'], $email['message_id']);
+		}
 	}
 
 	// Clear out the stat cache.
@@ -1449,7 +1585,9 @@ 
 
 	// Log each of the sent emails.
 	if (!empty($sent))
-		log_email($sent);
+	{
+			log_email($sent);
+	}
 
 	// Any emails that didn't send?
 	if (!empty($failed_emails))
@@ -1460,7 +1598,9 @@ 
 	}
 	// We were able to send the email, clear our failed attempts.
 	elseif (!empty($modSettings['mail_failed_attempts']))
-		updateSuccessQueue();
+	{
+			updateSuccessQueue();
+	}
 
 	// Had something to send...
 	return true;
@@ -1511,7 +1651,9 @@ 
 	global $txt;
 
 	if ($time_diff < 0)
-		$time_diff = 0;
+	{
+			$time_diff = 0;
+	}
 
 	// Just do a bit of an if fest...
 	if ($time_diff > 86400)
@@ -1532,6 +1674,7 @@ 
 		return sprintf($minutes == 1 ? $txt['mq_minute'] : $txt['mq_minutes'], $minutes);
 	}
 	// Otherwise must be second
-	else
-		return sprintf($time_diff == 1 ? $txt['mq_second'] : $txt['mq_seconds'], $time_diff);
-}
+	else {
+			return sprintf($time_diff == 1 ? $txt['mq_second'] : $txt['mq_seconds'], $time_diff);
+	}
+	}

sources/subs/MessageTopicIcons.class.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	 * Icons that are default with ElkArte
 	 * @var array
 	 */
-	protected $_stable_icons = 	array();
+	protected $_stable_icons = array();
 
 	/**
 	 * Icons to load in addition to the default
@@ -103,7 +103,7 @@ 
 		if ($this->_allowCustomIcons())
 		{
 			// Merge in additional ones
-			$custom_icons = array_map(function ($element) {
+			$custom_icons = array_map(function($element) {
 				return $element['value'];
 			}, $this->_custom_icons);
 

sources/subs/Ila.integrate.php

Spacing +2 added lines, -2 removed lines

@@ -249,7 +249,7 @@ 
 	{
 		global $modSettings, $scripturl;
 
-		return static function ($tag, &$data, $disabled) use ($modSettings, $scripturl) {
+		return static function($tag, &$data, $disabled) use ($modSettings, $scripturl) {
 			$num = $data;
 			$attachment = [];
 			$preview = self::isPreview($num);
@@ -325,7 +325,7 @@ 
 	{
 		global $txt, $scripturl;
 
-		return static function ($tag, &$data) use ($txt, $scripturl) {
+		return static function($tag, &$data) use ($txt, $scripturl) {
 			$num = $data;
 			$attachment = false;
 

sources/subs/SettingsFormAdapter/File.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
 	{
 		// Now loop through the remaining (database-based) settings.
 		$this->configVars = array_map(
-			function ($configVar)
+			function($configVar)
 			{
 				// We just saved the file-based settings, so skip their definitions.
 				if (!is_array($configVar) || $configVar[2] === 'file')

sources/subs/SettingsFormAdapter/Db.php

Spacing +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
 		global $context;
 
 		$inlinePermissions = array_filter($this->configVars,
-			function ($configVar)
+			function($configVar)
 			{
 				return isset($configVar[0]) && $configVar[0] === 'permissions';
 			}
@@ -314,7 +314,7 @@ 
 		global $helptxt, $modSettings;
 
 		$bbcChoice = array_filter($this->configVars,
-			function ($configVar)
+			function($configVar)
 			{
 				return isset($configVar[0]) && $configVar[0] === 'bbc';
 			}