albertlast / SMF2.1

Sources/minify/src/CSS.php

Spacing +15 added lines, -15 removed lines

@@ -83,7 +83,7 @@ 
             }
 
             // add to top
-            $content = implode('', $matches[0]).$content;
+            $content = implode('', $matches[0]) . $content;
         };
 
         return $content;
@@ -208,7 +208,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
@@ -216,7 +216,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
@@ -226,7 +226,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
@@ -255,7 +255,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();
@@ -264,7 +264,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
@@ -276,7 +276,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 . '"';
             }
         }
 
@@ -513,19 +513,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);
 
         return $content;
     }

Sources/minify/src/Minify.php

Spacing +6 added lines, -6 removed lines

@@ -316,7 +316,7 @@ 
     {
         // PHP only supports $this inside anonymous functions since 5.4
         $minifier = $this;
-        $callback = function ($match) use ($minifier) {
+        $callback = function($match) use ($minifier) {
             // check the second index here, because the first always contains a quote
             if (!$match[2]) {
                 /*
@@ -329,8 +329,8 @@ 
             }
 
             $count = count($minifier->extracted);
-            $placeholder = $match[1].$count.$match[1];
-            $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1];
+            $placeholder = $match[1] . $count . $match[1];
+            $minifier->extracted[$placeholder] = $match[1] . $match[2] . $match[1];
 
             return $placeholder;
         };
@@ -347,7 +347,7 @@ 
          * considered as escape-char (times 2) and to get it in the regex,
          * escaped (times 2)
          */
-        $this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback);
+        $this->registerPattern('/([' . $chars . '])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback);
     }
 
     /**
@@ -397,7 +397,7 @@ 
     protected function openFileForWriting($path)
     {
         if (($handler = @fopen($path, 'w')) === false) {
-            throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.');
+            throw new IOException('The file "' . $path . '" could not be opened for writing. Check if PHP has enough permissions.');
         }
 
         return $handler;
@@ -415,7 +415,7 @@ 
     protected function writeToFile($handler, $content, $path = '')
     {
         if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) {
-            throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.');
+            throw new IOException('The file "' . $path . '" could not be written to. Check your disk space and file permissions.');
         }
     }
 }

Sources/SplitTopics.php

Spacing +4 added lines, -4 removed lines

@@ -360,7 +360,7 @@ 
 		)
 	);
 	$context['messages'] = array();
-	for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter ++)
+	for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter++)
 	{
 		censorText($row['subject']);
 		censorText($row['body']);
@@ -400,7 +400,7 @@ 
 			)
 		);
 		$context['messages'] = array();
-		for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter ++)
+		for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter++)
 		{
 			censorText($row['subject']);
 			censorText($row['body']);
@@ -1098,7 +1098,7 @@ 
 			$firstTopic = $row['id_topic'];
 
 		// Lowest topic id gets selected as surviving topic id. We need to store this board so we can adjust the topic count (This one will not have a redirect topic)
-		if($row['id_topic'] < $lowestTopicId || empty($lowestTopicId) )
+		if ($row['id_topic'] < $lowestTopicId || empty($lowestTopicId))
 		{
 			$lowestTopicId = $row['id_topic'];
 			$lowestTopicBoard = $row['id_board'];
@@ -1404,7 +1404,7 @@ 
 			}
 
 			// Update subject search index
-			updateStats('subject',$this_old_topic,$redirect_subject);
+			updateStats('subject', $this_old_topic, $redirect_subject);
 		}
 	}
 

Sources/Profile-View.php

Spacing +3 added lines, -3 removed lines

@@ -368,7 +368,7 @@ 
 	// Prepare the pagination vars.
 	$maxIndex = 10;
 	$start = (int) isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
-	$count =  alert_count($memID);
+	$count = alert_count($memID);
 
 	// Get the alerts.
 	$context['alerts'] = fetch_alerts($memID, true, false, array('start' => $start, 'maxIndex' => $maxIndex));
@@ -833,7 +833,7 @@ 
 			),
 		),
 		'data_check' => array(
-			'class' => function ($data)
+			'class' => function($data)
 			{
 				return $data['approved'] ? '' : 'approvebg';
 			}
@@ -1536,7 +1536,7 @@ 
 				),
 				'data' => array(
 					'sprintf' => array(
-						'format' => '<a href="' . $scripturl . '?action=profile;area=tracking;sa=ip;searchip=%1$s;u=' . $memID. '">%1$s</a>',
+						'format' => '<a href="' . $scripturl . '?action=profile;area=tracking;sa=ip;searchip=%1$s;u=' . $memID . '">%1$s</a>',
 						'params' => array(
 							'ip' => false,
 						),

Sources/Packages.php

Spacing +11 added lines, -11 removed lines

@@ -531,14 +531,14 @@ 
 
 			$thisAction = array(
 				'type' => $action['reverse'] ? $txt['execute_hook_remove'] : $txt['execute_hook_add'],
-				'action' => sprintf($txt['execute_hook_action'. ($action['reverse'] ? '_inverse' : '')],  $smcFunc['htmlspecialchars']($action['hook'])),
+				'action' => sprintf($txt['execute_hook_action' . ($action['reverse'] ? '_inverse' : '')], $smcFunc['htmlspecialchars']($action['hook'])),
 			);
 		}
 		elseif ($action['type'] == 'credits')
 		{
 			$thisAction = array(
 				'type' => $txt['execute_credits_add'],
-				'action' => sprintf($txt['execute_credits_action'],  $smcFunc['htmlspecialchars']($action['title'])),
+				'action' => sprintf($txt['execute_credits_action'], $smcFunc['htmlspecialchars']($action['title'])),
 			);
 		}
 		elseif ($action['type'] == 'requires')
@@ -654,7 +654,7 @@ 
 			if ($context['uninstalling'])
 				$file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
 			else
-				$file =  $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
+				$file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
 		}
 
 		// Don't fail if a file/directory we're trying to create doesn't exist...
@@ -758,7 +758,7 @@ 
 		$context['ftp_needed'] = !empty($ftp_status['files']['notwritable']) && !empty($context['package_ftp']);
 	}
 
-	$context['post_url'] = $scripturl .'?action=admin;area=packages;sa=' . ($context['uninstalling'] ? 'uninstall' : 'install') . ($context['ftp_needed'] ? '' : '2') . ';package=' . $context['filename'] . ';pid=' . $context['install_id'];
+	$context['post_url'] = $scripturl . '?action=admin;area=packages;sa=' . ($context['uninstalling'] ? 'uninstall' : 'install') . ($context['ftp_needed'] ? '' : '2') . ';package=' . $context['filename'] . ';pid=' . $context['install_id'];
 	checkSubmitOnce('register');
 }
 
@@ -1180,7 +1180,7 @@ 
 				'{db_prefix}log_packages',
 				array(
 					'filename' => 'string', 'name' => 'string', 'package_id' => 'string', 'version' => 'string',
-					'id_member_installed' => 'int', 'member_installed' => 'string','time_installed' => 'int',
+					'id_member_installed' => 'int', 'member_installed' => 'string', 'time_installed' => 'int',
 					'install_state' => 'int', 'failed_steps' => 'string', 'themes_installed' => 'string',
 					'member_removed' => 'int', 'db_changes' => 'string', 'credits' => 'string',
 				),
@@ -1383,7 +1383,7 @@ 
 						'style' => 'width: 40px;',
 					),
 					'data' => array(
-						'function' => function ($package_md5) use ($type, &$context)
+						'function' => function($package_md5) use ($type, &$context)
 						{
 							if (isset($context['available_' . $type . ''][$package_md5]))
 								return $context['available_' . $type . ''][$package_md5]['sort_id'];
@@ -1400,7 +1400,7 @@ 
 						'style' => 'width: 25%;',
 					),
 					'data' => array(
-						'function' => function ($package_md5) use ($type, &$context)
+						'function' => function($package_md5) use ($type, &$context)
 						{
 							if (isset($context['available_' . $type . ''][$package_md5]))
 								return $context['available_' . $type . ''][$package_md5]['name'];
@@ -1416,7 +1416,7 @@ 
 						'value' => $txt['mod_version'],
 					),
 					'data' => array(
-						'function' => function ($package_md5) use ($type, &$context)
+						'function' => function($package_md5) use ($type, &$context)
 						{
 							if (isset($context['available_' . $type . ''][$package_md5]))
 								return $context['available_' . $type . ''][$package_md5]['version'];
@@ -1432,7 +1432,7 @@ 
 						'value' => $txt['mod_installed_time'],
 					),
 					'data' => array(
-						'function' => function ($package_md5) use ($type, $txt, &$context)
+						'function' => function($package_md5) use ($type, $txt, &$context)
 						{
 							if (isset($context['available_' . $type . ''][$package_md5]))
 								return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable'];
@@ -1449,7 +1449,7 @@ 
 						'value' => '',
 					),
 					'data' => array(
-						'function' => function ($package_md5) use ($type, &$context, $scripturl, $txt)
+						'function' => function($package_md5) use ($type, &$context, $scripturl, $txt)
 						{
 							if (!isset($context['available_' . $type . ''][$package_md5]))
 								return '';
@@ -1734,7 +1734,7 @@ 
 				{
 					$sort_id['modification']++;
 					$sort_id['mod']++;
-					$packages['modification'][strtolower($packageInfo[$sort]) .  '_' . $sort_id['mod']] = md5($package);
+					$packages['modification'][strtolower($packageInfo[$sort]) . '_' . $sort_id['mod']] = md5($package);
 					$context['available_modification'][md5($package)] = $packageInfo;
 				}
 				// Avatar package.

Sources/Groups.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 					'value' => $txt['name'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($scripturl)
+					'function' => function($rowData) use ($scripturl)
 					{
 						// Since the moderator group has no explicit members, no link is needed.
 						if ($rowData['id_group'] == 3)
@@ -146,7 +146,7 @@ 
 					'value' => $txt['moderators'],
 				),
 				'data' => array(
-					'function' => function ($group) use ($txt)
+					'function' => function($group) use ($txt)
 					{
 						return empty($group['moderators']) ? '<em>' . $txt['membergroups_new_copy_none'] . '</em>' : implode(', ', $group['moderators']);
 					},
@@ -157,7 +157,7 @@ 
 					'value' => $txt['membergroups_members_top'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						// No explicit members for the moderator group.
 						return $rowData['id_group'] == 3 ? $txt['membergroups_guests_na'] : comma_format($rowData['num_members']);
@@ -745,7 +745,7 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		if (empty($row['reason']))
-			$reason = '<em>(' . $txt['mc_groupr_no_reason'] .  ')</em>';
+			$reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>';
 		else
 			$reason = censorText($row['reason']);
 

Sources/LogInOut.php

Spacing +4 added lines, -4 removed lines

@@ -99,19 +99,19 @@
 	{
 		if (isset($_COOKIE[$cookiename]) && preg_match('~^a:[34]:\{i:0;i:\d{1,7};i:1;s:(0|128):"([a-fA-F0-9]{128})?";i:2;[id]:\d{1,14};(i:3;i:\d;)?\}$~', $_COOKIE[$cookiename]) === 1)
 		{
-			list (, , $timeout) = smf_json_decode($_COOKIE[$cookiename], true);
+			list (,, $timeout) = smf_json_decode($_COOKIE[$cookiename], true);
 
 			// That didn't work... Maybe it's using serialize?
 			if (is_null($timeout))
-				list (, , $timeout) = safe_unserialize($_COOKIE[$cookiename]);
+				list (,, $timeout) = safe_unserialize($_COOKIE[$cookiename]);
 		}
 		elseif (isset($_SESSION['login_' . $cookiename]))
 		{
-			list (, , $timeout) = smf_json_decode($_SESSION['login_' . $cookiename]);
+			list (,, $timeout) = smf_json_decode($_SESSION['login_' . $cookiename]);
 
 			// Try for old format
 			if (is_null($timeout))
-				list (, , $timeout) = safe_unserialize($_SESSION['login_' . $cookiename]);
+				list (,, $timeout) = safe_unserialize($_SESSION['login_' . $cookiename]);
 		}
 		else
 			trigger_error('Login2(): Cannot be logged in without a session or cookie', E_USER_ERROR);

Sources/Subs-BoardIndex.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 					'new' => false,
 					'css_class' => '',
 				);
-				$categories[$row_board['id_cat']]['link'] = '<a id="c' . $row_board['id_cat'] . '"></a>' . (!$context['user']['is_guest'] ? '<a href="' . $scripturl . '?action=unread;c='. $row_board['id_cat'] . '" title="' . sprintf($txt['new_posts_in_category'], strip_tags($row_board['cat_name'])) . '">' . $row_board['cat_name'] . '</a>' : $row_board['cat_name']);
+				$categories[$row_board['id_cat']]['link'] = '<a id="c' . $row_board['id_cat'] . '"></a>' . (!$context['user']['is_guest'] ? '<a href="' . $scripturl . '?action=unread;c=' . $row_board['id_cat'] . '" title="' . sprintf($txt['new_posts_in_category'], strip_tags($row_board['cat_name'])) . '">' . $row_board['cat_name'] . '</a>' : $row_board['cat_name']);
 			}
 
 			// If this board has new posts in it (and isn't the recycle bin!) then the category is new.

Sources/Subs-Themes.php

Spacing +8 added lines, -8 removed lines

@@ -54,8 +54,8 @@ 
 	);
 
 	// Make our known/enable themes a little easier to work with.
-	$knownThemes = !empty($modSettings['knownThemes']) ? explode(',',$modSettings['knownThemes']) : array();
-	$enableThemes = !empty($modSettings['enableThemes']) ? explode(',',$modSettings['enableThemes']) : array();
+	$knownThemes = !empty($modSettings['knownThemes']) ? explode(',', $modSettings['knownThemes']) : array();
+	$enableThemes = !empty($modSettings['enableThemes']) ? explode(',', $modSettings['enableThemes']) : array();
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_theme, variable, value
@@ -102,8 +102,8 @@ 
 	global $modSettings, $context, $smcFunc;
 
 	// Make our known/enable themes a little easier to work with.
-	$knownThemes = !empty($modSettings['knownThemes']) ? explode(',',$modSettings['knownThemes']) : array();
-	$enableThemes = !empty($modSettings['enableThemes']) ? explode(',',$modSettings['enableThemes']) : array();
+	$knownThemes = !empty($modSettings['knownThemes']) ? explode(',', $modSettings['knownThemes']) : array();
+	$enableThemes = !empty($modSettings['enableThemes']) ? explode(',', $modSettings['enableThemes']) : array();
 
 	// List of all possible themes values.
 	$themeValues = array(
@@ -284,7 +284,7 @@ 
 				'no_member' => 0,
 				'name' => 'name',
 				'version' => 'version',
-				'name_value' => '%'. $context['to_install']['name'] .'%',
+				'name_value' => '%' . $context['to_install']['name'] . '%',
 			)
 		);
 
@@ -439,11 +439,11 @@ 
 		foreach ($objects as $object)
 			if ($object != '.' && $object != '..')
 			{
-				if (filetype($path .'/'. $object) == 'dir')
-					remove_dir($path .'/'.$object);
+				if (filetype($path . '/' . $object) == 'dir')
+					remove_dir($path . '/' . $object);
 
 				else
-					unlink($path .'/'. $object);
+					unlink($path . '/' . $object);
 			}
 	}