Yoshi2889 / SMF2.1

Sources/Class-Punycode.php

Spacing +2 added lines, -2 removed lines

@@ -145,7 +145,7 @@ 
 				}
 				if ($c === $n) {
 					$q = $delta;
-					for ($k = static::BASE;; $k += static::BASE) {
+					for ($k = static::BASE; ; $k += static::BASE) {
 						$t = $this->calculateThreshold($k, $bias);
 						if ($q < $t) {
 							break;
@@ -227,7 +227,7 @@ 
 			$oldi = $i;
 			$w = 1;
 
-			for ($k = static::BASE;; $k += static::BASE)
+			for ($k = static::BASE; ; $k += static::BASE)
 			{
 				$digit = static::$decodeTable[$input[$pos++]];
 				$i = $i + ($digit * $w);

Braces +20 added lines, -10 removed lines

@@ -94,7 +94,8 @@ 
 	{
 		$input = mb_strtolower($input, $this->encoding);
 		$parts = explode('.', $input);
-		foreach ($parts as &$part) {
+		foreach ($parts as &$part)
+		{
 			$part = $this->encodePart($part);
 		}
 		$output = implode('.', $parts);
@@ -119,13 +120,16 @@ 
 		$h = $b = count($codePoints['basic']);
 
 		$output = '';
-		foreach ($codePoints['basic'] as $code) {
+		foreach ($codePoints['basic'] as $code)
+		{
 			$output .= $this->codePointToChar($code);
 		}
-		if ($input === $output) {
+		if ($input === $output)
+		{
 			return $output;
 		}
-		if ($b > 0) {
+		if ($b > 0)
+		{
 			$output .= static::DELIMITER;
 		}
 
@@ -134,20 +138,26 @@ 
 
 		$i = 0;
 		$length = mb_strlen($input, $this->encoding);
-		while ($h < $length) {
+		while ($h < $length)
+		{
 			$m = $codePoints['nonBasic'][$i++];
 			$delta = $delta + ($m - $n) * ($h + 1);
 			$n = $m;
 
-			foreach ($codePoints['all'] as $c) {
-				if ($c < $n || $c < static::INITIAL_N) {
+			foreach ($codePoints['all'] as $c)
+			{
+				if ($c < $n || $c < static::INITIAL_N)
+				{
 					$delta++;
 				}
-				if ($c === $n) {
+				if ($c === $n)
+				{
 					$q = $delta;
-					for ($k = static::BASE;; $k += static::BASE) {
+					for ($k = static::BASE;; $k += static::BASE)
+					{
 						$t = $this->calculateThreshold($k, $bias);
-						if ($q < $t) {
+						if ($q < $t)
+						{
 							break;
 						}
 

Sources/Likes.php

Braces -1 removed lines

@@ -222,7 +222,6 @@
 
 			$this->_validLikes['can_like'] = ($this->_user['id'] == $topicOwner ? 'cannot_like_content' : (allowedTo('likes_like') ? true : 'cannot_like_content'));
 		}
-
 		else
 		{
 			// Modders: This will give you whatever the user offers up in terms of liking, e.g. $this->_type=msg, $this->_content=1

Sources/Class-Graphics.php

Spacing +1 added lines, -1 removed lines

@@ -280,7 +280,7 @@
 			$ret .=
 				chr(($this->m_arColors[$i] & 0x000000FF)) . // R
 				chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G
-				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16);  // B
+				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16); // B
 		}
 
 		return $ret;

Sources/ManageMembers.php

Spacing +1 added lines, -1 removed lines

@@ -738,7 +738,7 @@
 			);
 		else
 			$context['allowed_actions'] = array(
-				'ok' => $txt['admin_browse_w_approve'] .' '. $txt['admin_browse_no_email'],
+				'ok' => $txt['admin_browse_w_approve'] . ' ' . $txt['admin_browse_no_email'],
 				'okemail' => $txt['admin_browse_w_approve'] . ' ' . $txt['admin_browse_w_email'],
 				'require_activation' => $txt['admin_browse_w_approve_require_activate'],
 				'reject' => $txt['admin_browse_w_reject'],

Sources/ReportedContent.php

Spacing +7 added lines, -7 removed lines

@@ -93,13 +93,13 @@ 
 				),
 				'ignore' => array(
 					'label' => $report['ignore'] ? $txt['mc_reportedp_unignore'] : $txt['mc_reportedp_ignore'],
-					'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;ignore='.(int)!$report['ignore'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-ignore_token_var'].'='.$context['mod-report-ignore_token'],
+					'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;ignore=' . (int) !$report['ignore'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-ignore_token_var'] . '=' . $context['mod-report-ignore_token'],
 					'javascript' => !$report['ignore'] ? ' class="you_sure" data-confirm="' . $txt['mc_reportedp_ignore_confirm'] . '"' : '',
 					'icon' => 'ignore'
 				),
 				'close' => array(
 					'label' => $context['view_closed'] ? $txt['mc_reportedp_open'] : $txt['mc_reportedp_close'],
-					'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;closed='.(int)!$report['closed'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-closed_token_var'].'='.$context['mod-report-closed_token'],
+					'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;closed=' . (int) !$report['closed'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-closed_token_var'] . '=' . $context['mod-report-closed_token'],
 					'icon' => $context['view_closed'] ? 'folder' : 'close',
 				),
 			);
@@ -108,17 +108,17 @@ 
 			if ($context['report_type'] == 'posts')
 				$context['reports'][$key]['quickbuttons']['delete'] = array(
 					'label' => $txt['mc_reportedp_delete'],
-					'href' => $scripturl.'?action=deletemsg;topic='.$report['topic']['id'].'.0;msg='.$report['topic']['id_msg'].';modcenter;'.$context['session_var'].'='.$context['session_id'],
-					'javascript' => 'data-confirm="'.$txt['mc_reportedp_delete_confirm'].'" class="you_sure"',
+					'href' => $scripturl . '?action=deletemsg;topic=' . $report['topic']['id'] . '.0;msg=' . $report['topic']['id_msg'] . ';modcenter;' . $context['session_var'] . '=' . $context['session_id'],
+					'javascript' => 'data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '" class="you_sure"',
 					'icon' => 'delete',
 					'show' => !$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards']))
 				);
 
 			// Ban reported member/post author link
 			if ($context['report_type'] == 'members')
-				$ban_link = $scripturl.'?action=admin;area=ban;sa=add;u='.$report['user']['id'].';'.$context['session_var'].'='.$context['session_id'];
+				$ban_link = $scripturl . '?action=admin;area=ban;sa=add;u=' . $report['user']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 			else
-				$ban_link = $scripturl.'?action=admin;area=ban;sa=add'.(!empty($report['author']['id']) ? ';u='.$report['author']['id'] : ';msg='.$report['topic']['id_msg']).';'.$context['session_var'].'='.$context['session_id'];
+				$ban_link = $scripturl . '?action=admin;area=ban;sa=add' . (!empty($report['author']['id']) ? ';u=' . $report['author']['id'] : ';msg=' . $report['topic']['id_msg']) . ';' . $context['session_var'] . '=' . $context['session_id'];
 
 			$context['reports'][$key]['quickbuttons'] += array(
 				'ban' => array(
@@ -128,7 +128,7 @@ 
 					'show' => !$report['closed'] && !empty($context['report_manage_bans']) && ($context['report_type'] == 'posts' || $context['report_type'] == 'members' && !empty($report['user']['id']))
 				),
 				'quickmod' => array(
-					'content' => '<input type="checkbox" name="close[]" value="'.$report['id'].'">',
+					'content' => '<input type="checkbox" name="close[]" value="' . $report['id'] . '">',
 					'show' => !$context['view_closed']
 				)
 			);

Sources/Profile.php

Spacing +1 added lines, -1 removed lines

@@ -619,7 +619,7 @@
 			if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn())
 				fatal_lang_error('login_ssl_required', false);
 
-			$password = isset($_POST['oldpasswrd']) ? $_POST['oldpasswrd'] :  '';
+			$password = isset($_POST['oldpasswrd']) ? $_POST['oldpasswrd'] : '';
 
 			// You didn't even enter a password!
 			if (trim($password) == '')

Sources/Subs-Graphics.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -419,7 +419,7 @@
 
 		if (checkImagick())
 		{
-			$imagick = New Imagick($destName);
+			$imagick = new Imagick($destName);
 			$src_width = empty($src_width) ? $imagick->getImageWidth() : $src_width;
 			$src_height = empty($src_height) ? $imagick->getImageHeight() : $src_height;
 			$dest_width = empty($max_width) ? $src_width : $max_width;

Sources/Subs-Admin.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	{
 		if (class_exists('Imagick'))
 		{
-			$temp = New Imagick;
+			$temp = new Imagick;
 			$temp2 = $temp->getVersion();
 			$im_version = $temp2['versionString'];
 			$extension_version = 'Imagick ' . phpversion('Imagick');

Spacing +4 added lines, -4 removed lines

@@ -1736,7 +1736,7 @@ 
 	// Prevents warnings about constants that are already defined.
 	$settingsText = preg_replace_callback(
 		'~\bdefine\s*\(\s*(["\'])(\w+)\1~',
-		function ($matches)
+		function($matches)
 		{
 			return 'define(\'' . md5(mt_rand()) . '\'';
 		},
@@ -1746,7 +1746,7 @@ 
 	// Handle eval errors gracefully in both PHP 5 and PHP 7
 	try
 	{
-		if($settingsText !== '' && @eval($settingsText) === false)
+		if ($settingsText !== '' && @eval($settingsText) === false)
 			throw new ErrorException('eval error');
 
 		unset($mtime, $settingsFile, $settingsText);
@@ -1953,7 +1953,7 @@ 
 	}
 
 	// Everything is simpler if we convert heredocs to normal strings first.
-	if (preg_match_all('/<<<(\'?)(\w+)\'?'. $line_ending . '(.*?)'. $line_ending . '\2;$/m', $code_str, $matches))
+	if (preg_match_all('/<<<(\'?)(\w+)\'?' . $line_ending . '(.*?)' . $line_ending . '\2;$/m', $code_str, $matches))
 	{
 		foreach ($matches[0] as $mkey => $heredoc)
 		{
@@ -1967,7 +1967,7 @@ 
 	}
 
 	// Split before everything that could possibly delimit a comment or a string.
-	$parts = preg_split('~(?=#+|/(?=/|\*)|\*/|'. $line_ending . '|(?<!\\\)[\'"])~m', $code_str);
+	$parts = preg_split('~(?=#+|/(?=/|\*)|\*/|' . $line_ending . '|(?<!\\\)[\'"])~m', $code_str);
 
 	$in_string = 0;
 	$in_comment = 0;

Braces +10 added lines, -4 removed lines

@@ -1213,7 +1213,8 @@ 
 	}
 
 	// It's important to do the numbered ones before the named ones, or messes happen.
-	uksort($substitutions, function($a, $b) {
+	uksort($substitutions, function($a, $b)
+	{
 		if (is_int($a) && is_int($b))
 			return $a > $b;
 		elseif (is_int($a))
@@ -1752,8 +1753,12 @@ 
 		unset($mtime, $settingsFile, $settingsText);
 		$defined_vars = get_defined_vars();
 	}
-	catch (Throwable $e) {}
-	catch (ErrorException $e) {}
+	catch (Throwable $e)
+	{
+}
+	catch (ErrorException $e)
+	{
+}
 	if (isset($e))
 		return false;
 
@@ -1913,7 +1918,8 @@ 
 	// For the same reason, replace literal returns and newlines with "\r" and "\n"
 	elseif (is_string($var) && (strpos($var, "\n") !== false || strpos($var, "\r") !== false))
 	{
-		return strtr(preg_replace_callback('/[\r\n]+/', function($m) {
+		return strtr(preg_replace_callback('/[\r\n]+/', function($m)
+		{
 			return '\' . "' . strtr($m[0], array("\r" => '\r', "\n" => '\n')) . '" . \'';
 		}, $var), array("'' . " => '', " . ''" => ''));
 	}

Sources/Class-Package.php

Braces +9 added lines, -7 removed lines

@@ -888,7 +888,6 @@ 
 				$is_writable = true;
 				break;
 			}
-
 			else
 			{
 				// Convert the chmod value from octal (0777) to text ("777").
@@ -942,8 +941,9 @@ 
 	{
 		// Wait for a response that isn't continued with -, but don't wait too long.
 		$time = time();
-		do
-			$this->last_message = fgets($this->connection, 1024);
+		do {
+					$this->last_message = fgets($this->connection, 1024);
+		}
 		while ((strlen($this->last_message) < 4 || strpos($this->last_message, ' ') === 0 || strpos($this->last_message, ' ', 3) !== 3) && time() - $time < 5);
 
 		// Was the desired response returned?
@@ -964,8 +964,9 @@ 
 		// Request a passive connection - this means, we'll talk to you, you don't talk to us.
 		@fwrite($this->connection, 'PASV' . "\r\n");
 		$time = time();
-		do
-			$response = fgets($this->connection, 1024);
+		do {
+					$response = fgets($this->connection, 1024);
+		}
 		while (strpos($response, ' ', 3) !== 3 && time() - $time < 5);
 
 		// If it's not 227, we weren't given an IP and port, which means it failed.
@@ -1087,8 +1088,9 @@ 
 
 		@fwrite($this->connection, 'PWD' . "\r\n");
 		$time = time();
-		do
-			$response = fgets($this->connection, 1024);
+		do {
+					$response = fgets($this->connection, 1024);
+		}
 		while ($response[3] != ' ' && time() - $time < 5);
 
 		// Check for 257!