SimpleMachines / SMF2.1

Sources/Class-Package.php

Braces +9 added lines, -7 removed lines

@@ -881,7 +881,6 @@ 
 				$is_writable = true;
 				break;
 			}
-
 			else
 			{
 				// Convert the chmod value from octal (0777) to text ("777").
@@ -935,8 +934,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?
@@ -957,8 +957,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.
@@ -1080,8 +1081,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!

Sources/Class-Punycode.php

Braces +71 added lines, -31 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;
                         }
 
@@ -182,8 +192,10 @@ 
     {
         $input = strtolower($input);
         $parts = explode('.', $input);
-        foreach ($parts as &$part) {
-            if (strpos($part, static::PREFIX) !== 0) {
+        foreach ($parts as &$part)
+        {
+            if (strpos($part, static::PREFIX) !== 0)
+            {
                 continue;
             }
 
@@ -209,24 +221,30 @@ 
         $output = '';
 
         $pos = strrpos($input, static::DELIMITER);
-        if ($pos !== false) {
+        if ($pos !== false)
+        {
             $output = substr($input, 0, $pos++);
-        } else {
+        }
+        else
+        {
             $pos = 0;
         }
 
         $outputLength = strlen($output);
         $inputLength = strlen($input);
-        while ($pos < $inputLength) {
+        while ($pos < $inputLength)
+        {
             $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);
                 $t = $this->calculateThreshold($k, $bias);
 
-                if ($digit < $t) {
+                if ($digit < $t)
+                {
                     break;
                 }
 
@@ -253,9 +271,12 @@ 
      */
     protected function calculateThreshold($k, $bias)
     {
-        if ($k <= $bias + static::TMIN) {
+        if ($k <= $bias + static::TMIN)
+        {
             return static::TMIN;
-        } elseif ($k >= $bias + static::TMAX) {
+        }
+        elseif ($k >= $bias + static::TMAX)
+        {
             return static::TMAX;
         }
         return $k - $bias;
@@ -279,7 +300,8 @@ 
         $delta += (int) ($delta / $numPoints);
 
         $k = 0;
-        while ($delta > ((static::BASE - static::TMIN) * static::TMAX) / 2) {
+        while ($delta > ((static::BASE - static::TMIN) * static::TMAX) / 2)
+        {
             $delta = (int) ($delta / (static::BASE - static::TMIN));
             $k = $k + static::BASE;
         }
@@ -303,12 +325,16 @@ 
         );
 
         $length = mb_strlen($input, $this->encoding);
-        for ($i = 0; $i < $length; $i++) {
+        for ($i = 0; $i < $length; $i++)
+        {
             $char = mb_substr($input, $i, 1, $this->encoding);
             $code = $this->charToCodePoint($char);
-            if ($code < 128) {
+            if ($code < 128)
+            {
                 $codePoints['all'][] = $codePoints['basic'][] = $code;
-            } else {
+            }
+            else
+            {
                 $codePoints['all'][] = $codePoints['nonBasic'][] = $code;
             }
         }
@@ -325,13 +351,20 @@ 
     protected function charToCodePoint($char)
     {
         $code = ord($char[0]);
-        if ($code < 128) {
+        if ($code < 128)
+        {
             return $code;
-        } elseif ($code < 224) {
+        }
+        elseif ($code < 224)
+        {
             return (($code - 192) * 64) + (ord($char[1]) - 128);
-        } elseif ($code < 240) {
+        }
+        elseif ($code < 240)
+        {
             return (($code - 224) * 4096) + ((ord($char[1]) - 128) * 64) + (ord($char[2]) - 128);
-        } else {
+        }
+        else
+        {
             return (($code - 240) * 262144) + ((ord($char[1]) - 128) * 4096) + ((ord($char[2]) - 128) * 64) + (ord($char[3]) - 128);
         }
     }
@@ -344,13 +377,20 @@ 
      */
     protected function codePointToChar($code)
     {
-        if ($code <= 0x7F) {
+        if ($code <= 0x7F)
+        {
             return chr($code);
-        } elseif ($code <= 0x7FF) {
+        }
+        elseif ($code <= 0x7FF)
+        {
             return chr(($code >> 6) + 192) . chr(($code & 63) + 128);
-        } elseif ($code <= 0xFFFF) {
+        }
+        elseif ($code <= 0xFFFF)
+        {
             return chr(($code >> 12) + 224) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128);
-        } else {
+        }
+        else
+        {
             return chr(($code >> 18) + 240) . chr((($code >> 12) & 63) + 128) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128);
         }
     }

Sources/Recent.php

Braces -1 removed lines

@@ -1252,7 +1252,6 @@
 			if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages'])
 				$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
 		}
-
 		else
 			$pages = '';
 

Sources/QueryString.php

Braces +2 added lines, -1 removed lines

@@ -440,7 +440,8 @@
 		$ip_address = inet_pton($ip_address);
 		$cidr_network = inet_pton($cidr_network);
 		$binMask = str_repeat("f", $cidr_subnetmask / 4);
-		switch ($cidr_subnetmask % 4) {
+		switch ($cidr_subnetmask % 4)
+		{
 		  case 0:
 			break;
 		  case 1:

Sources/ManageMaintenance.php

Braces -1 removed lines

@@ -2291,7 +2291,6 @@
 		list ($hookData['class'], $hookData['method']) = explode('::', $modFunc);
 		$hookData['pureFunc'] = $hookData['method'];
 	}
-
 	else
 		$hookData['pureFunc'] = $modFunc;
 

Sources/Load.php

Braces +1 added lines, -6 removed lines

@@ -78,7 +78,7 @@ 
 	// Set a list of common functions.
 	$ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);';
 	$ent_check = empty($modSettings['disableEntityCheck']) ? function($string)
-		{
+	{
 			$string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string);
 			return $string;
 		} : function($string)
@@ -2131,7 +2131,6 @@ 
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
 	}
-
 	else
 	{
 		// Custom templates to load, or just default?
@@ -2510,14 +2509,12 @@ 
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 			}
-
 			else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
 		}
-
 		else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
@@ -2618,14 +2615,12 @@ 
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 			}
-
 			else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
 		}
-
 		else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);

Sources/Register.php

Braces -1 removed lines

@@ -849,7 +849,6 @@
 			die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
 		}
 	}
-
 	elseif ($_REQUEST['format'] === '.wav')
 	{
 		require_once($sourcedir . '/Subs-Sound.php');

Sources/Subs-Membergroups.php

Braces -1 removed lines

@@ -756,7 +756,6 @@
 				$groups[$row['id_group']]['num_members'] += $row['num_members'];
 			$smcFunc['db_free_result']($query);
 		}
-
 		else
 		{
 			$query = $smcFunc['db_query']('', '

Sources/Subs-Package.php

Braces +4 added lines, -3 removed lines

@@ -253,9 +253,10 @@ 
 
 		// Phar doesn't handle open_basedir restrictions very well and throws a PHP Warning. Ignore that.
 		set_error_handler(function($errno, $errstr, $errfile, $errline)
-			{
+		{
 				// error was suppressed with the @-operator
-				if (0 === error_reporting()) {
+				if (0 === error_reporting())
+				{
 					return false;
 				}
 				if (strpos($errstr, 'PharData::__construct(): open_basedir') === false)
@@ -269,7 +270,7 @@ 
 
 		// go though each file in the archive
 		foreach ($iterator as $file_info)
-			{
+		{
 				$i = $iterator->getSubPathname();
 				// If this is a file, and it doesn't exist.... happy days!
 				if (substr($i, -1) != '/' && !file_exists($destination . '/' . $i))