SimpleMachines / SMF2.1

Themes/default/Profile.template.php

Spacing +1 added lines, -2 removed lines

@@ -3031,8 +3031,7 @@
 							<div class="roundframe">
 								<div>
 		', !empty($context['tfa_backup']) ? '
-									<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' :
-			($modSettings['tfa_mode'] == 2 ? '
+									<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' : ($modSettings['tfa_mode'] == 2 ? '
 									<div class="smalltext"><strong>' . $txt['tfa_forced_desc'] . '</strong></div>' : ''), '
 									<div class="smalltext">', $txt['tfa_desc'], '</div>
 									<div id="basicinfo" style="width: 60%">

Themes/default/Recent.template.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	<div id="recent" class="main_section">
 		<div class="cat_bar">
 			<h3 class="catbg">
-				<span class="xx"></span>',$txt['recent_posts'],'
+				<span class="xx"></span>',$txt['recent_posts'], '
 			</h3>
 		</div>
 		<div class="pagesection">', $context['page_index'], '</div>';

Sources/Post.php

Spacing +2 added lines, -2 removed lines

@@ -259,8 +259,8 @@
 			$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
 
 		$js_time_string = str_replace(
-			array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r',      '%R',  '%S', '%T',    '%X'),
-			array('H',  'G',  'h',  'g',  'i',  'A',  'a',  'h:i:s A', 'H:i', 's',  'H:i:s', 'H:i:s'),
+			array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r', '%R', '%S', '%T', '%X'),
+			array('H', 'G', 'h', 'g', 'i', 'A', 'a', 'h:i:s A', 'H:i', 's', 'H:i:s', 'H:i:s'),
 			$time_string
 		);
 

Sources/Subs-Db-mysql.php

Spacing +2 added lines, -2 removed lines

@@ -757,7 +757,7 @@ 
 		$connection
 	);
 	
-	if(!empty($keys) && (count($keys) > 0) && $method == '' && $returnmode > 0)
+	if (!empty($keys) && (count($keys) > 0) && $method == '' && $returnmode > 0)
 	{
 		if ($returnmode == 1)
 			$return_var = smf_db_insert_id($table, $keys[0]) + count($insertRows) - 1;
@@ -766,7 +766,7 @@ 
 			$return_var = array();
 			$count = count($insertRows);
 			$start = smf_db_insert_id($table, $keys[0]);
-			for ($i = 0; $i < $count; $i++ )
+			for ($i = 0; $i < $count; $i++)
 				$return_var[] = $start + $i;
 		}
 		return $return_var;

Sources/Subs-Db-postgresql.php

Spacing +4 added lines, -4 removed lines

@@ -763,10 +763,10 @@ 
 	$returning = '';
 	$with_returning = false;
 	// lets build the returning string, mysql allow only in normal mode
-	if(!empty($keys) && (count($keys) > 0) && $method == '' && $returnmode > 0)
+	if (!empty($keys) && (count($keys) > 0) && $method == '' && $returnmode > 0)
 	{
 		// we only take the first key
-		$returning = ' RETURNING '.$keys[0];
+		$returning = ' RETURNING ' . $keys[0];
 		$with_returning = true;
 	}
 
@@ -797,7 +797,7 @@ 
 			INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '")
 			VALUES
 				' . implode(',
-				', $insertRows).$replace.$returning,
+				', $insertRows) . $replace . $returning,
 			array(
 				'security_override' => true,
 				'db_error_skip' => $method == 'ignore' || $table === $db_prefix . 'log_errors',
@@ -810,7 +810,7 @@ 
 			if ($returnmode === 2)
 				$return_var = array();
 
-			while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
+			while (($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
 			{
 				if (is_numeric($row[0])) // try to emulate mysql limitation
 				{

index.php

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
  *
  * @param string $class The fully-qualified class name.
  */
-spl_autoload_register(function ($class) use ($sourcedir)
+spl_autoload_register(function($class) use ($sourcedir)
 {
 	$classMap = array(
 		'ReCaptcha\\' => 'ReCaptcha/',

Sources/minify/path-converter/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, '/');
     }
 
     /**

Sources/minify/src/CSS.php

Spacing +20 added lines, -20 removed lines

@@ -82,7 +82,7 @@ 
             }
 
             // add to top
-            $content = implode('', $matches[0]).$content;
+            $content = implode('', $matches[0]) . $content;
         }
 
         return $content;
@@ -207,7 +207,7 @@ 
         // loop the matches
         foreach ($matches as $match) {
             // get the path for the file that will be imported
-            $importPath = dirname($source).'/'.$match['path'];
+            $importPath = dirname($source) . '/' . $match['path'];
 
             // only replace the import with the content if we can grab the
             // content of the file
@@ -215,7 +215,7 @@ 
                 // check if current file was not imported previously in the same
                 // import chain.
                 if (in_array($importPath, $parents)) {
-                    throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.');
+                    throw new FileImportException('Failed to import file "' . $importPath . '": circular reference detected.');
                 }
 
                 // grab referenced file & minify it (which may include importing
@@ -225,7 +225,7 @@ 
 
                 // check if this is only valid for certain media
                 if (!empty($match['media'])) {
-                    $importContent = '@media '.$match['media'].'{'.$importContent.'}';
+                    $importContent = '@media ' . $match['media'] . '{' . $importContent . '}';
                 }
 
                 // add to replacement array
@@ -254,7 +254,7 @@ 
     protected function importFiles($source, $content)
     {
         $extensions = array_keys($this->importExtensions);
-        $regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i';
+        $regex = '/url\((["\']?)((?!["\']?data:).*?\.(' . implode('|', $extensions) . '))\\1\)/i';
         if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
             $search = array();
             $replace = array();
@@ -263,7 +263,7 @@ 
             foreach ($matches as $match) {
                 // get the path for the file that will be imported
                 $path = $match[2];
-                $path = dirname($source).'/'.$path;
+                $path = dirname($source) . '/' . $path;
                 $extension = $match[3];
 
                 // only replace the import with the content if we're able to get
@@ -275,7 +275,7 @@ 
 
                     // build replacement
                     $search[] = $match[0];
-                    $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')';
+                    $replace[] = 'url(' . $this->importExtensions[$extension] . ';base64,' . $importContent . ')';
                 }
             }
 
@@ -463,9 +463,9 @@ 
             // build replacement
             $search[] = $match[0];
             if ($type == 'url') {
-                $replace[] = 'url('.$url.')';
+                $replace[] = 'url(' . $url . ')';
             } elseif ($type == 'import') {
-                $replace[] = '@import "'.$url.'"';
+                $replace[] = '@import "' . $url . '"';
             }
         }
 
@@ -519,8 +519,8 @@ 
         );
 
         return preg_replace_callback(
-            '/(?<=[: ])('.implode(array_keys($colors), '|').')(?=[; }])/i',
-            function ($match) use ($colors) {
+            '/(?<=[: ])(' . implode(array_keys($colors), '|') . ')(?=[; }])/i',
+            function($match) use ($colors) {
                 return $colors[strtoupper($match[0])];
             },
             $content
@@ -541,11 +541,11 @@ 
             'bold' => 700,
         );
 
-        $callback = function ($match) use ($weights) {
-            return $match[1].$weights[$match[2]];
+        $callback = function($match) use ($weights) {
+            return $match[1] . $weights[$match[2]];
         };
 
-        return preg_replace_callback('/(font-weight\s*:\s*)('.implode('|', array_keys($weights)).')(?=[;}])/', $callback, $content);
+        return preg_replace_callback('/(font-weight\s*:\s*)(' . implode('|', array_keys($weights)) . ')(?=[;}])/', $callback, $content);
     }
 
     /**
@@ -571,19 +571,19 @@ 
         // practice, Webkit (especially Safari) seems to stumble over at least
         // 0%, potentially other units as well. Only stripping 'px' for now.
         // @see https://github.com/matthiasmullie/minify/issues/60
-        $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content);
+        $content = preg_replace('/' . $before . '(-?0*(\.0+)?)(?<=0)px' . $after . '/', '\\1', $content);
 
         // strip 0-digits (.0 -> 0)
-        $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content);
+        $content = preg_replace('/' . $before . '\.0+' . $units . '?' . $after . '/', '0\\1', $content);
         // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px
-        $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+        $content = preg_replace('/' . $before . '(-?[0-9]+\.[0-9]+)0+' . $units . '?' . $after . '/', '\\1\\2', $content);
         // strip trailing 0: 50.00 -> 50, 50.00px -> 50px
-        $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+        $content = preg_replace('/' . $before . '(-?[0-9]+)\.0+' . $units . '?' . $after . '/', '\\1\\2', $content);
         // strip leading 0: 0.1 -> .1, 01.1 -> 1.1
-        $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content);
+        $content = preg_replace('/' . $before . '(-?)0+([0-9]*\.[0-9]+)' . $units . '?' . $after . '/', '\\1\\2\\3', $content);
 
         // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0)
-        $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content);
+        $content = preg_replace('/' . $before . '-?0+' . $units . '?' . $after . '/', '0\\1', $content);
 
         // remove zeroes where they make no sense in calc: e.g. calc(100px - 0)
         // the 0 doesn't have any effect, and this isn't even valid without unit

Sources/minify/src/JS.php

Spacing +26 added lines, -26 removed lines

@@ -117,14 +117,14 @@ 
     {
         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->operators = file($dataDir.'operators.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->operators = file($dataDir . 'operators.txt', $options);
+        $this->operatorsBefore = file($dataDir . 'operators_before.txt', $options);
+        $this->operatorsAfter = file($dataDir . 'operators_after.txt', $options);
     }
 
     /**
@@ -149,7 +149,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;";
         }
 
         /*
@@ -214,9 +214,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[0];
 
             return $placeholder;
@@ -229,7 +229,7 @@ 
         // likely part of a division, not a regex)
         $after = '[\.,;\)\}]';
         $methods = '\.(exec|test|match|search|replace|split)\(';
-        $this->registerPattern('/'.$pattern.'(?=\s*('.$after.'|'.$methods.'))/', $callback);
+        $this->registerPattern('/' . $pattern . '(?=\s*(' . $after . '|' . $methods . '))/', $callback);
 
         // 1 more edge case: a regex can be followed by a lot more operators or
         // keywords if there's a newline (ASI) in between, where the operator
@@ -237,7 +237,7 @@ 
         // (https://github.com/matthiasmullie/minify/issues/56)
         $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/');
         $operators += $this->getOperatorsForRegex($this->keywordsReserved, '/');
-        $this->registerPattern('/'.$pattern.'\s*\n(?=\s*('.implode('|', $operators).'))/', $callback);
+        $this->registerPattern('/' . $pattern . '\s*\n(?=\s*(' . implode('|', $operators) . '))/', $callback);
     }
 
     /**
@@ -281,8 +281,8 @@ 
         unset($operatorsBefore['+'], $operatorsBefore['-'], $operatorsAfter['+'], $operatorsAfter['-']);
         $content = preg_replace(
             array(
-                '/('.implode('|', $operatorsBefore).')\s+/',
-                '/\s+('.implode('|', $operatorsAfter).')/',
+                '/(' . implode('|', $operatorsBefore) . ')\s+/',
+                '/\s+(' . implode('|', $operatorsAfter) . ')/',
             ), '\\1', $content
         );
 
@@ -295,8 +295,8 @@ 
         );
 
         // collapse whitespace around reserved words into single space
-        $content = preg_replace('/(^|[;\}\s])\K('.implode('|', $keywordsBefore).')\s+/', '\\2 ', $content);
-        $content = preg_replace('/\s+('.implode('|', $keywordsAfter).')(?=([;\{\s]|$))/', ' \\1', $content);
+        $content = preg_replace('/(^|[;\}\s])\K(' . implode('|', $keywordsBefore) . ')\s+/', '\\2 ', $content);
+        $content = preg_replace('/\s+(' . implode('|', $keywordsAfter) . ')(?=([;\{\s]|$))/', ' \\1', $content);
 
         /*
          * We didn't strip whitespace after a couple of operators because they
@@ -306,8 +306,8 @@ 
          */
         $operatorsDiffBefore = array_diff($operators, $operatorsBefore);
         $operatorsDiffAfter = array_diff($operators, $operatorsAfter);
-        $content = preg_replace('/('.implode('|', $operatorsDiffBefore).')[^\S\n]+/', '\\1', $content);
-        $content = preg_replace('/[^\S\n]+('.implode('|', $operatorsDiffAfter).')/', '\\1', $content);
+        $content = preg_replace('/(' . implode('|', $operatorsDiffBefore) . ')[^\S\n]+/', '\\1', $content);
+        $content = preg_replace('/[^\S\n]+(' . implode('|', $operatorsDiffAfter) . ')/', '\\1', $content);
 
         /*
          * Get rid of double semicolons, except where they can be used like:
@@ -381,7 +381,7 @@ 
 
         // don't confuse = with other assignment shortcuts (e.g. +=)
         $chars = preg_quote('+-*\=<>%&|');
-        $operators['='] = '(?<!['.$chars.'])\=';
+        $operators['='] = '(?<![' . $chars . '])\=';
 
         return $operators;
     }
@@ -402,8 +402,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);
@@ -423,7 +423,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]], '\'"');
 
             /*
@@ -440,11 +440,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;
         };
 
         /*
@@ -465,9 +465,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.'\[\s*(([\'"])[0-9]+\\2)\s*\]/u', $callback, $content);
+        return preg_replace_callback('/(?<=' . $previousChar . '|\])' . $keywords . '\[\s*(([\'"])[0-9]+\\2)\s*\]/u', $callback, $content);
     }
 
     /**