albertlast / SMF2.1

Sources/ManageSearchEngines.php

Spacing +4 added lines, -4 removed lines

@@ -239,7 +239,7 @@ 
 					'value' => $txt['spider_name'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($smcFunc, $scripturl)
+					'function' => function($rowData) use ($smcFunc, $scripturl)
 					{
 						return sprintf('<a href="%1$s?action=admin;area=sengines;sa=editspiders;sid=%2$d">%3$s</a>', $scripturl, $rowData['id_spider'], $smcFunc['htmlspecialchars']($rowData['spider_name']));
 					},
@@ -254,7 +254,7 @@ 
 					'value' => $txt['spider_last_seen'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($context, $txt)
+					'function' => function($rowData) use ($context, $txt)
 					{
 						return isset($context['spider_last_seen'][$rowData['id_spider']]) ? timeformat($context['spider_last_seen'][$rowData['id_spider']]) : $txt['spider_last_never'];
 					},
@@ -690,7 +690,7 @@ 
 
 		if (!empty($_POST['delete_entries']) && isset($_POST['older']))
 		{
-			$deleteTime = time() - (((int)$_POST['older']) * 24 * 60 * 60);
+			$deleteTime = time() - (((int) $_POST['older']) * 24 * 60 * 60);
 
 			// Delete the entires.
 			$smcFunc['db_query']('', '
@@ -742,7 +742,7 @@ 
 					'value' => $txt['spider_time'],
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return timeformat($rowData['log_time']);
 					},

Sources/Security.php

Spacing +5 added lines, -5 removed lines

@@ -52,7 +52,7 @@ 
 	require_once($sourcedir . '/Subs-Auth.php');
 
 	// Posting the password... check it.
-	if (isset($_POST[$type. '_pass']))
+	if (isset($_POST[$type . '_pass']))
 	{
 		// Check to ensure we're forcing SSL for authentication
 		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
@@ -179,7 +179,7 @@ 
 		{
 			if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip'])
 				continue;
-			$ban_query[] = ' {inet:'.$ip_number.'} BETWEEN bi.ip_low and bi.ip_high';
+			$ban_query[] = ' {inet:' . $ip_number . '} BETWEEN bi.ip_low and bi.ip_high';
 			$ban_query_vars[$ip_number] = $user_info[$ip_number];
 			// IP was valid, maybe there's also a hostname...
 			if (empty($modSettings['disableHostnameLookup']) && $user_info[$ip_number] != 'unknown')
@@ -187,8 +187,8 @@ 
 				$hostname = host_from_ip($user_info[$ip_number]);
 				if (strlen($hostname) > 0)
 				{
-					$ban_query[] = '({string:hostname'.$ip_number.'} LIKE bi.hostname)';
-					$ban_query_vars['hostname'.$ip_number] = $hostname;
+					$ban_query[] = '({string:hostname' . $ip_number . '} LIKE bi.hostname)';
+					$ban_query_vars['hostname' . $ip_number] = $hostname;
 				}
 			}
 		}
@@ -912,7 +912,7 @@ 
 		return true;
 
 	// Let's ensure this is an array.
-	$permission = (array)$permission;
+	$permission = (array) $permission;
 
 	// Are we checking the _current_ board, or some other boards?
 	if ($boards === null)

Sources/RemoveTopic.php

Spacing +1 added lines, -1 removed lines

@@ -398,7 +398,7 @@
 	}
 	$smcFunc['db_free_result']($request);
 
-	if($updateBoardCount)
+	if ($updateBoardCount)
 	{
 		// Decrease the posts/topics...
 		foreach ($adjustBoards as $stats)

Sources/PostModeration.php

Spacing +5 added lines, -5 removed lines

@@ -176,11 +176,11 @@ 
 		{
 			if ($curAction == 'approve')
 			{
-				approveMessages ($toAction, $details, $context['current_view']);
+				approveMessages($toAction, $details, $context['current_view']);
 			}
 			else
 			{
-				removeMessages ($toAction, $details, $context['current_view']);
+				removeMessages($toAction, $details, $context['current_view']);
 			}
 		}
 	}
@@ -437,7 +437,7 @@ 
 					'value' => $txt['mc_unapproved_attach_poster'],
 				),
 				'data' => array(
-					'function' => function ($data)
+					'function' => function($data)
 					{
 						return $data['poster']['link'];
 					},
@@ -467,7 +467,7 @@ 
 					'value' => $txt['post'],
 				),
 				'data' => array(
-					'function' => function ($data)
+					'function' => function($data)
 					{
 						return '<a href="' . $data['message']['href'] . '">' . shorten_subject($data['message']['subject'], 20) . '</a>';
 					},
@@ -693,7 +693,7 @@ 
 			logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
 	}
 
-	redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg']. '#msg' . $_REQUEST['msg']);
+	redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
 }
 
 /**

Sources/Subs-Sound.php

Spacing +1 added lines, -2 removed lines

@@ -66,8 +66,7 @@
 		$sound_letter = substr($sound_letter, strpos($sound_letter, 'data') + 8);
 		switch ($word{$i} === 's' ? 0 : mt_rand(0, 2))
 		{
-			case 0:
-				for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
+			case 0 : for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
 					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
 						$sound_word .= $word{$i} === 's' ? $sound_letter{$j} : chr(mt_rand(max(ord($sound_letter{$j}) - 1, 0x00), min(ord($sound_letter{$j}) + 1, 0xFF)));
 			break;

Sources/Subs-Post.php

Spacing +18 added lines, -18 removed lines

@@ -34,7 +34,7 @@ 
 	$message = preg_replace('~&#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $message);
 
 	// Clean up after nobbc ;).
-	$message = preg_replace_callback('~\[nobbc\](.+?)\[/nobbc\]~is', function ($a)
+	$message = preg_replace_callback('~\[nobbc\](.+?)\[/nobbc\]~is', function($a)
 	{
 		return '[nobbc]' . strtr($a[1], array('[' => '[', ']' => ']', ':' => ':', '@' => '@')) . '[/nobbc]';
 	}, $message);
@@ -122,7 +122,7 @@ 
 	if (!$previewing && strpos($message, '[html]') !== false)
 	{
 		if (allowedTo('admin_forum'))
-			$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function ($m) {
+			$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
 				return '[html]' . strtr(un_htmlspecialchars($m), array("\n" => '
', '  ' => '  ', '[' => '[', ']' => ']')) . '[/html]';
 			}, $message);
 
@@ -135,17 +135,17 @@ 
 	}
 
 	// Let's look at the time tags...
-	$message = preg_replace_callback('~\[time(?:=(absolute))*\](.+?)\[/time\]~i', function ($m) use ($modSettings, $user_info)
+	$message = preg_replace_callback('~\[time(?:=(absolute))*\](.+?)\[/time\]~i', function($m) use ($modSettings, $user_info)
 	{
 		return "[time]" . (is_numeric("$m[2]") || @strtotime("$m[2]") == 0 ? "$m[2]" : strtotime("$m[2]") - ("$m[1]" == "absolute" ? 0 : (($modSettings["time_offset"] + $user_info["time_offset"]) * 3600))) . "[/time]";
 	}, $message);
 
 	// Change the color specific tags to [color=the color].
-	$message = preg_replace('~\[(black|blue|green|red|white)\]~', '[color=$1]', $message);  // First do the opening tags.
-	$message = preg_replace('~\[/(black|blue|green|red|white)\]~', '[/color]', $message);   // And now do the closing tags
+	$message = preg_replace('~\[(black|blue|green|red|white)\]~', '[color=$1]', $message); // First do the opening tags.
+	$message = preg_replace('~\[/(black|blue|green|red|white)\]~', '[/color]', $message); // And now do the closing tags
 
 	// Make sure all tags are lowercase.
-	$message = preg_replace_callback('~\[([/]?)(list|li|table|tr|td)((\s[^\]]+)*)\]~i', function ($m)
+	$message = preg_replace_callback('~\[([/]?)(list|li|table|tr|td)((\s[^\]]+)*)\]~i', function($m)
 	{
 		return "[$m[1]" . strtolower("$m[2]") . "$m[3]]";
 	}, $message);
@@ -252,13 +252,13 @@ 
 
 	$message = implode('', $parts);
 
-	$message = preg_replace_callback('~\[html\](.+?)\[/html\]~i', function ($m) use ($smcFunc)
+	$message = preg_replace_callback('~\[html\](.+?)\[/html\]~i', function($m) use ($smcFunc)
 	{
 		return "[html]" . strtr($smcFunc['htmlspecialchars']("$m[1]", ENT_QUOTES), array("\\&quot;" => "&quot;", "&amp;#13;" => "<br>", "&amp;#32;" => " ", "&amp;#91;" => "[", "&amp;#93;" => "]")) . "[/html]";
 	}, $message);
 
 	// Attempt to un-parse the time to something less awful.
-	$message = preg_replace_callback('~\[time\](\d{0,10})\[/time\]~i', function ($m)
+	$message = preg_replace_callback('~\[time\](\d{0,10})\[/time\]~i', function($m)
 	{
 		return "[time]" . timeformat("$m[1]", false) . "[/time]";
 	}, $message);
@@ -349,7 +349,7 @@ 
 		fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
 
 	// Now fix possible security problems with images loading links automatically...
-	$message = preg_replace_callback('~(\[img.*?\])(.+?)\[/img\]~is', function ($m)
+	$message = preg_replace_callback('~(\[img.*?\])(.+?)\[/img\]~is', function($m)
 	{
 		return "$m[1]" . preg_replace("~action(=|%3d)(?!dlattach)~i", "action-", "$m[2]") . "[/img]";
 	}, $message);
@@ -535,7 +535,7 @@ 
 	$to_array = is_array($to) ? $to : array($to);
 
 	// Make sure we actually have email addresses to send this to
-	foreach($to_array as $k => $v)
+	foreach ($to_array as $k => $v)
 	{
 		// This should never happen, but better safe than sorry
 		if (trim($v) == '')
@@ -1211,7 +1211,7 @@ 
 		unset($matches);
 
 		if ($simple)
-			$string = preg_replace_callback('~&#(\d{3,8});~', function ($m)
+			$string = preg_replace_callback('~&#(\d{3,8});~', function($m)
 			{
 				return chr("$m[1]");
 			}, $string);
@@ -1242,7 +1242,7 @@ 
 				$string = $newstring;
 		}
 
-		$entityConvert = function ($m)
+		$entityConvert = function($m)
 		{
 			$c = $m[1];
 			if (strlen($c) === 1 && ord($c[0]) <= 0x7F)
@@ -1348,14 +1348,14 @@ 
 		$helo = gethostname();
 	elseif (function_exists('php_uname'))
 		$helo = php_uname('n');
-	elseif (array_key_exists('SERVER_NAME',$_SERVER) && !empty($_SERVER['SERVER_NAME']))
+	elseif (array_key_exists('SERVER_NAME', $_SERVER) && !empty($_SERVER['SERVER_NAME']))
 		$helo = $_SERVER['SERVER_NAME'];
 
 	if (empty($helo))
 		$helo = $modSettings['smtp_host'];
 
 	// SMTP = 1, SMTP - STARTTLS = 2
-	if (in_array($modSettings['mail_type'], array(1,2)) && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
+	if (in_array($modSettings['mail_type'], array(1, 2)) && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
 	{
 		// EHLO could be understood to mean encrypted hello...
 		if (server_parse('EHLO ' . $helo, $socket, null, $response) == '250')
@@ -2119,7 +2119,7 @@ 
 			preg_match_all('/\[member\=([0-9]+)\]([^\[]*)\[\/member\]/U', $msgOptions['old_body'], $match);
 
 			if (isset($match[1]) && isset($match[2]) && is_array($match[1]) && is_array($match[2]))
-				foreach($match[1] as $i => $oldID)
+				foreach ($match[1] as $i => $oldID)
 					$oldmentions[$oldID] = array('id' => $oldID, 'real_name' => $match[2][$i]);
 
 			if (empty($modSettings['search_custom_index_config']))
@@ -2130,10 +2130,10 @@ 
 		$messages_columns['body'] = $msgOptions['body'] = Mentions::getBody($msgOptions['body'], $mentions);
 
 		// Remove the poster.
-		if(isset($mentions[$user_info['id']]))
+		if (isset($mentions[$user_info['id']]))
 			unset($mentions[$user_info['id']]);
 
-		if(isset($oldmentions[$user_info['id']]))
+		if (isset($oldmentions[$user_info['id']]))
 			unset($oldmentions[$user_info['id']]);
 
 		if (is_array($mentions) && is_array($oldmentions) && count(array_diff_key($mentions, $oldmentions)) > 0 && count($mentions) > count($oldmentions))
@@ -2948,7 +2948,7 @@ 
 			$suggestions = enchant_dict_suggest($dict, $word);
 
 			// Go through the suggestions and convert them back to the proper character set
-			foreach($suggestions as $index => $suggestion)
+			foreach ($suggestions as $index => $suggestion)
 			{
 				// //TRANSLIT makes it use similar-looking characters for incompatible ones...
 				$suggestions[$index] = iconv('UTF-8', $txt['lang_character_set'] . '//TRANSLIT', $suggestion);

Sources/Class-Package.php

Spacing +5 added lines, -5 removed lines

@@ -424,7 +424,7 @@ 
 			if ((!isset($match[3]) || trim($match[3]) != '/') && (!isset($match[2]) || trim($match[2]) != '/'))
 			{
 				// Because PHP 5.2.0+ seems to croak using regex, we'll have to do this the less fun way.
-				$last_tag_end = strpos($data, '</' . $match[1]. '>');
+				$last_tag_end = strpos($data, '</' . $match[1] . '>');
 				if ($last_tag_end === false)
 					continue;
 
@@ -438,7 +438,7 @@ 
 						break;
 
 					// If not then find the next ending tag.
-					$next_tag_end = strpos($data, '</' . $match[1]. '>', $offset);
+					$next_tag_end = strpos($data, '</' . $match[1] . '>', $offset);
 
 					// Didn't find one? Then just use the last and sod it.
 					if ($next_tag_end === false)
@@ -452,7 +452,7 @@ 
 				// Parse the insides.
 				$inner_match = substr($data, 0, $last_tag_end);
 				// Data now starts from where this section ends.
-				$data = substr($data, $last_tag_end + strlen('</' . $match[1]. '>'));
+				$data = substr($data, $last_tag_end + strlen('</' . $match[1] . '>'));
 
 				if (!empty($inner_match))
 				{
@@ -618,7 +618,7 @@ 
 		$trans_tbl = array_flip(get_html_translation_table(HTML_ENTITIES, ENT_QUOTES));
 
 		// Translate all the entities out.
-		$data = strtr(preg_replace_callback('~&#(\d{1,4});~', function ($m)
+		$data = strtr(preg_replace_callback('~&#(\d{1,4});~', function($m)
 		{
 			return chr("$m[1]");
 		}, $data), $trans_tbl);
@@ -873,7 +873,7 @@ 
 		// Set different modes.
 		$chmod_values = $is_dir ? array(0750, 0755, 0775, 0777) : array(0644, 0664, 0666);
 
-		foreach($chmod_values as $val)
+		foreach ($chmod_values as $val)
 		{
 			// If it's writable, break out of the loop.
 			if (is_writable($ftp_file))

Sources/minify/src/JS.php

Spacing +24 added lines, -24 removed lines

@@ -106,13 +106,13 @@ 
     {
         call_user_func_array(array('parent', '__construct'), func_get_args());
 
-        $dataDir = __DIR__.'/../data/js/';
+        $dataDir = __DIR__ . '/../data/js/';
         $options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES;
-        $this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options);
-        $this->keywordsBefore = file($dataDir.'keywords_before.txt', $options);
-        $this->keywordsAfter = file($dataDir.'keywords_after.txt', $options);
-        $this->operatorsBefore = file($dataDir.'operators_before.txt', $options);
-        $this->operatorsAfter = file($dataDir.'operators_after.txt', $options);
+        $this->keywordsReserved = file($dataDir . 'keywords_reserved.txt', $options);
+        $this->keywordsBefore = file($dataDir . 'keywords_before.txt', $options);
+        $this->keywordsAfter = file($dataDir . 'keywords_after.txt', $options);
+        $this->operatorsBefore = file($dataDir . 'operators_before.txt', $options);
+        $this->operatorsAfter = file($dataDir . 'operators_after.txt', $options);
     }
 
     /**
@@ -137,7 +137,7 @@ 
              * singe-line comment on the last line (in which case it would also
              * be seen as part of that comment)
              */
-            $content .= $js."\n;";
+            $content .= $js . "\n;";
         }
 
         /*
@@ -202,9 +202,9 @@ 
     {
         // PHP only supports $this inside anonymous functions since 5.4
         $minifier = $this;
-        $callback = function ($match) use ($minifier) {
+        $callback = function($match) use ($minifier) {
             $count = count($minifier->extracted);
-            $placeholder = '/'.$count.'/';
+            $placeholder = '/' . $count . '/';
             $minifier->extracted[$placeholder] = $match[1];
 
             return $placeholder;
@@ -219,11 +219,11 @@ 
         // it's going to be division
         // checking for that is complex, so we'll do inverse:
         // * at the beginning of the file, it's not division, but regex
-        $this->registerPattern('/^\s*\K'.$pattern.'/', $callback);
+        $this->registerPattern('/^\s*\K' . $pattern . '/', $callback);
         // * following another operator, it's not division, but regex
         $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/');
         $operators += $this->getKeywordsForRegex($this->keywordsReserved, '/');
-        $this->registerPattern('/(?:'.implode('|', $operators).')\s*\K'.$pattern.'/', $callback);
+        $this->registerPattern('/(?:' . implode('|', $operators) . ')\s*\K' . $pattern . '/', $callback);
     }
 
     /**
@@ -265,8 +265,8 @@ 
         unset($before['+'], $before['-'], $after['+'], $after['-']);
         $content = preg_replace(
             array(
-                '/('.implode('|', $before).')\s+/',
-                '/\s+('.implode('|', $after).')/',
+                '/(' . implode('|', $before) . ')\s+/',
+                '/\s+(' . implode('|', $after) . ')/',
             ), '\\1', $content
         );
 
@@ -284,13 +284,13 @@ 
          * strip the newlines. However, we can safely strip any non-line feed
          * whitespace that follows them.
          */
-        $content = preg_replace('/([\}\)\]])[^\S\n]+(?!'.implode('|', $operators).')/', '\\1', $content);
+        $content = preg_replace('/([\}\)\]])[^\S\n]+(?!' . implode('|', $operators) . ')/', '\\1', $content);
 
         // collapse whitespace around reserved words into single space
         $before = $this->getKeywordsForRegex($this->keywordsBefore, '/');
         $after = $this->getKeywordsForRegex($this->keywordsAfter, '/');
-        $content = preg_replace('/(^|[;\}\s])\K('.implode('|', $before).')\s+/', '\\2 ', $content);
-        $content = preg_replace('/\s+('.implode('|', $after).')(?=([;\{\s]|$))/', ' \\1', $content);
+        $content = preg_replace('/(^|[;\}\s])\K(' . implode('|', $before) . ')\s+/', '\\2 ', $content);
+        $content = preg_replace('/\s+(' . implode('|', $after) . ')(?=([;\{\s]|$))/', ' \\1', $content);
 
         /*
          * Get rid of double semicolons, except where they can be used like:
@@ -364,7 +364,7 @@ 
 
         // don't confuse = with other assignment shortcuts (e.g. +=)
         $chars = preg_quote('+-*\=<>%&|');
-        $operators['='] = '(?<!['.$chars.'])\=';
+        $operators['='] = '(?<![' . $chars . '])\=';
 
         return $operators;
     }
@@ -385,8 +385,8 @@ 
         $escaped = array_map('preg_quote', $keywords, $delimiter);
 
         // add word boundaries
-        array_walk($keywords, function ($value) {
-            return '\b'.$value.'\b';
+        array_walk($keywords, function($value) {
+            return '\b' . $value . '\b';
         });
 
         $keywords = array_combine($keywords, $escaped);
@@ -406,7 +406,7 @@ 
         // PHP only supports $this inside anonymous functions since 5.4
         $minifier = $this;
         $keywords = $this->keywordsReserved;
-        $callback = function ($match) use ($minifier, $keywords) {
+        $callback = function($match) use ($minifier, $keywords) {
             $property = trim($minifier->extracted[$match[1]], '\'"');
 
             /*
@@ -423,11 +423,11 @@ 
              * array['key-here'] can't be replaced by array.key-here since '-'
              * is not a valid character there.
              */
-            if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) {
+            if (!preg_match('/^' . $minifier::REGEX_VARIABLE . '$/u', $property)) {
                 return $match[0];
             }
 
-            return '.'.$property;
+            return '.' . $property;
         };
 
         /*
@@ -448,9 +448,9 @@ 
          * separate look-behind assertions, one for each keyword.
          */
         $keywords = $this->getKeywordsForRegex($keywords);
-        $keywords = '(?<!'.implode(')(?<!', $keywords).')';
+        $keywords = '(?<!' . implode(')(?<!', $keywords) . ')';
 
-        return preg_replace_callback('/(?<='.$previousChar.'|\])'.$keywords.'\[(([\'"])[0-9]+\\2)\]/u', $callback, $content);
+        return preg_replace_callback('/(?<=' . $previousChar . '|\])' . $keywords . '\[(([\'"])[0-9]+\\2)\]/u', $callback, $content);
     }
 
     /**

Sources/minify/src/Converter.php

Spacing +4 added lines, -4 removed lines

@@ -39,8 +39,8 @@ 
             // when both paths have nothing in common, one of them is probably
             // absolute while the other is relative
             $cwd = getcwd();
-            $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from;
-            $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to;
+            $from = strpos($from, $cwd) === 0 ? $from : $cwd . '/' . $from;
+            $to = strpos($to, $cwd) === 0 ? $to : $cwd . '/' . $to;
 
             // or traveling the tree via `..`
             // attempt to resolve path, or assume it's fine if it doesn't exist
@@ -147,7 +147,7 @@ 
         }
 
         // normalize paths
-        $path = $this->normalize($this->from.'/'.$path);
+        $path = $this->normalize($this->from . '/' . $path);
 
         // strip shared ancestor paths
         $shared = $this->shared($path, $this->to);
@@ -157,7 +157,7 @@ 
         // add .. for every directory that needs to be traversed to new path
         $to = str_repeat('../', mb_substr_count($to, '/'));
 
-        return $to.ltrim($path, '/');
+        return $to . ltrim($path, '/');
     }
 
     /**