BOINC / boinc

html/inc/password_compat/password.inc

Switch Indentation +40 added lines, -40 removed lines

@@ -50,47 +50,47 @@ 
             }
             $resultLength = 0;
             switch ($algo) {
-                case PASSWORD_BCRYPT:
-                    $cost = PASSWORD_BCRYPT_DEFAULT_COST;
-                    if (isset($options['cost'])) {
-                        $cost = (int) $options['cost'];
-                        if ($cost < 4 || $cost > 31) {
-                            trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
-                            return null;
-                        }
+            case PASSWORD_BCRYPT:
+                $cost = PASSWORD_BCRYPT_DEFAULT_COST;
+                if (isset($options['cost'])) {
+                    $cost = (int) $options['cost'];
+                    if ($cost < 4 || $cost > 31) {
+                        trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
+                        return null;
                     }
-                    // The length of salt to generate
-                    $raw_salt_len = 16;
-                    // The length required in the final serialization
-                    $required_salt_len = 22;
-                    $hash_format = sprintf("$2y$%02d$", $cost);
-                    // The expected length of the final crypt() output
-                    $resultLength = 60;
-                    break;
-                default:
-                    trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
-                    return null;
+                }
+                // The length of salt to generate
+                $raw_salt_len = 16;
+                // The length required in the final serialization
+                $required_salt_len = 22;
+                $hash_format = sprintf("$2y$%02d$", $cost);
+                // The expected length of the final crypt() output
+                $resultLength = 60;
+                break;
+            default:
+                trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
+                return null;
             }
             $salt_req_encoding = false;
             if (isset($options['salt'])) {
                 switch (gettype($options['salt'])) {
-                    case 'NULL':
-                    case 'boolean':
-                    case 'integer':
-                    case 'double':
-                    case 'string':
+                case 'NULL':
+                case 'boolean':
+                case 'integer':
+                case 'double':
+                case 'string':
+                    $salt = (string) $options['salt'];
+                    break;
+                case 'object':
+                    if (method_exists($options['salt'], '__tostring')) {
                         $salt = (string) $options['salt'];
                         break;
-                    case 'object':
-                        if (method_exists($options['salt'], '__tostring')) {
-                            $salt = (string) $options['salt'];
-                            break;
-                        }
-                    case 'array':
-                    case 'resource':
-                    default:
-                        trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
-                        return null;
+                    }
+                case 'array':
+                case 'resource':
+                default:
+                    trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
+                    return null;
                 }
                 if (PasswordCompat\binary\_strlen($salt) < $required_salt_len) {
                     trigger_error(sprintf("password_hash(): Provided salt is too short: %d expecting %d", PasswordCompat\binary\_strlen($salt), $required_salt_len), E_USER_WARNING);
@@ -212,12 +212,12 @@ 
                 return true;
             }
             switch ($algo) {
-                case PASSWORD_BCRYPT:
-                    $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
-                    if ($cost !== $info['options']['cost']) {
-                        return true;
-                    }
-                    break;
+            case PASSWORD_BCRYPT:
+                $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
+                if ($cost !== $info['options']['cost']) {
+                    return true;
+                }
+                break;
             }
             return false;
         }

Spacing +11 added lines, -11 removed lines

@@ -38,14 +38,14 @@ 
                 return null;
             }
             if (is_null($password) || is_int($password)) {
-                $password = (string) $password;
+                $password = (string)$password;
             }
             if (!is_string($password)) {
                 trigger_error("password_hash(): Password must be a string", E_USER_WARNING);
                 return null;
             }
             if (!is_int($algo)) {
-                trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
+                trigger_error("password_hash() expects parameter 2 to be long, ".gettype($algo)." given", E_USER_WARNING);
                 return null;
             }
             $resultLength = 0;
@@ -53,7 +53,7 @@ 
                 case PASSWORD_BCRYPT:
                     $cost = PASSWORD_BCRYPT_DEFAULT_COST;
                     if (isset($options['cost'])) {
-                        $cost = (int) $options['cost'];
+                        $cost = (int)$options['cost'];
                         if ($cost < 4 || $cost > 31) {
                             trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
                             return null;
@@ -79,11 +79,11 @@ 
                     case 'integer':
                     case 'double':
                     case 'string':
-                        $salt = (string) $options['salt'];
+                        $salt = (string)$options['salt'];
                         break;
                     case 'object':
                         if (method_exists($options['salt'], '__tostring')) {
-                            $salt = (string) $options['salt'];
+                            $salt = (string)$options['salt'];
                             break;
                         }
                     case 'array':
@@ -126,13 +126,13 @@ 
                     if ($read >= $raw_salt_len) {
                         $buffer_valid = true;
                     }
-                    $buffer = str_pad($buffer, $raw_salt_len, "\0") ^ str_pad($local_buffer, $raw_salt_len, "\0");
+                    $buffer = str_pad($buffer, $raw_salt_len, "\0")^str_pad($local_buffer, $raw_salt_len, "\0");
                 }
                 if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len) {
                     $buffer_length = PasswordCompat\binary\_strlen($buffer);
                     for ($i = 0; $i < $raw_salt_len; $i++) {
                         if ($i < $buffer_length) {
-                            $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
+                            $buffer[$i] = $buffer[$i]^chr(mt_rand(0, 255));
                         } else {
                             $buffer .= chr(mt_rand(0, 255));
                         }
@@ -153,7 +153,7 @@ 
             }
             $salt = PasswordCompat\binary\_substr($salt, 0, $required_salt_len);
 
-            $hash = $hash_format . $salt;
+            $hash = $hash_format.$salt;
 
             $ret = crypt($password, $hash);
 
@@ -208,12 +208,12 @@ 
          */
         function password_needs_rehash($hash, $algo, array $options = array()) {
             $info = password_get_info($hash);
-            if ($info['algo'] !== (int) $algo) {
+            if ($info['algo'] !== (int)$algo) {
                 return true;
             }
             switch ($algo) {
                 case PASSWORD_BCRYPT:
-                    $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
+                    $cost = isset($options['cost']) ? (int)$options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
                     if ($cost !== $info['options']['cost']) {
                         return true;
                     }
@@ -242,7 +242,7 @@ 
 
             $status = 0;
             for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++) {
-                $status |= (ord($ret[$i]) ^ ord($hash[$i]));
+                $status |= (ord($ret[$i])^ord($hash[$i]));
             }
 
             return $status === 0;

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

@@ -299,7 +299,7 @@
          * @return boolean the check result
          */
         function check() {
-            static $pass = NULL;
+            static $pass = null;
 
             if (is_null($pass)) {
                 if (function_exists('crypt')) {

html/inc/random_compat/random_bytes_com_dotnet.inc

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
      *
      * @return string
      */
-    function random_bytes($bytes)
-    {
+    function random_bytes($bytes) {
         try {
             $bytes = RandomCompat_intval($bytes);
         } catch (TypeError $ex) {

html/inc/random_compat/random_bytes_libsodium_legacy.inc

Spacing +2 added lines, -2 removed lines

@@ -70,10 +70,10 @@
                 $n = ($bytes - $i) > 1073741824
                     ? 1073741824
                     : $bytes - $i;
-                $buf .= Sodium::randombytes_buf((int) $n);
+                $buf .= Sodium::randombytes_buf((int)$n);
             }
         } else {
-            $buf .= Sodium::randombytes_buf((int) $bytes);
+            $buf .= Sodium::randombytes_buf((int)$bytes);
         }
 
         if (is_string($buf)) {

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
      *
      * @return string
      */
-    function random_bytes($bytes)
-    {
+    function random_bytes($bytes) {
         try {
             $bytes = RandomCompat_intval($bytes);
         } catch (TypeError $ex) {

html/inc/random_compat/random_bytes_dev_urandom.inc

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
      *
      * @return string
      */
-    function random_bytes($bytes)
-    {
+    function random_bytes($bytes) {
         static $fp = null;
         /**
          * This block should only be run once

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
                 /**
                  * @var string|bool
                  */
-                $buf = $buf . $read;
+                $buf = $buf.$read;
             } while ($remaining > 0);
 
             /**

html/inc/random_compat/random_int.inc

Spacing +5 added lines, -5 removed lines

@@ -78,7 +78,7 @@ 
         }
 
         if ($max === $min) {
-            return (int) $min;
+            return (int)$min;
         }
 
         /**
@@ -124,12 +124,12 @@ 
              * type juggling
              */
             while ($range > 0) {
-                if ($bits % 8 === 0) {
+                if ($bits%8 === 0) {
                     ++$bytes;
                 }
                 ++$bits;
                 $range >>= 1;
-                $mask = $mask << 1 | 1;
+                $mask = $mask << 1|1;
             }
             $valueShift = $min;
         }
@@ -167,7 +167,7 @@ 
              */
             $val &= 0;
             for ($i = 0; $i < $bytes; ++$i) {
-                $val |= ord($randomByteString[$i]) << ($i * 8);
+                $val |= ord($randomByteString[$i]) << ($i*8);
             }
 
             /**
@@ -185,6 +185,6 @@ 
              */
         } while (!is_int($val) || $val > $max || $val < $min);
 
-        return (int) $val;
+        return (int)$val;
     }
 }

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
      *
      * @return int
      */
-    function random_int($min, $max)
-    {
+    function random_int($min, $max) {
         /**
          * Type and input logic checks
          *

html/inc/random_compat/error_polyfill.inc

Braces +3 added lines, -6 removed lines

@@ -28,21 +28,18 @@
 
 if (!class_exists('Error', false)) {
     // We can't really avoid making this extend Exception in PHP 5.
-    class Error extends Exception
-    {
+    class Error extends Exception {
         
     }
 }
 
 if (!class_exists('TypeError', false)) {
     if (is_subclass_of('Error', 'Exception')) {
-        class TypeError extends Error
-        {
+        class TypeError extends Error {
             
         }
     } else {
-        class TypeError extends Exception
-        {
+        class TypeError extends Exception {
             
         }
     }

html/inc/random_compat/cast_to_int.inc

Spacing +2 added lines, -2 removed lines

@@ -60,11 +60,11 @@
             &&
             $number < PHP_INT_MAX
         ) {
-            $number = (int) $number;
+            $number = (int)$number;
         }
 
         if (is_int($number)) {
-            return (int) $number;
+            return (int)$number;
         } elseif (!$fail_open) {
             throw new TypeError(
                 'Expected an integer.'

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
      *
      * @throws TypeError
      */
-    function RandomCompat_intval($number, $fail_open = false)
-    {
+    function RandomCompat_intval($number, $fail_open = false) {
         if (is_int($number) || is_float($number)) {
             $number += 0;
         } elseif (is_numeric($number)) {

html/inc/random_compat/random.inc

Spacing +11 added lines, -11 removed lines

@@ -34,8 +34,8 @@ 
     $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION));
     define(
         'PHP_VERSION_ID',
-        $RandomCompatversion[0] * 10000
-        + $RandomCompatversion[1] * 100
+        $RandomCompatversion[0]*10000
+        + $RandomCompatversion[1]*100
         + $RandomCompatversion[2]
     );
     $RandomCompatversion = null;
@@ -54,9 +54,9 @@ 
 
 $RandomCompatDIR = dirname(__FILE__);
 
-require_once $RandomCompatDIR . '/byte_safe_strings.inc';
-require_once $RandomCompatDIR . '/cast_to_int.inc';
-require_once $RandomCompatDIR . '/error_polyfill.inc';
+require_once $RandomCompatDIR.'/byte_safe_strings.inc';
+require_once $RandomCompatDIR.'/cast_to_int.inc';
+require_once $RandomCompatDIR.'/error_polyfill.inc';
 
 if (!is_callable('random_bytes')) {
     /**
@@ -76,9 +76,9 @@ 
     if (extension_loaded('libsodium')) {
         // See random_bytes_libsodium.php
         if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
-            require_once $RandomCompatDIR . '/random_bytes_libsodium.inc';
+            require_once $RandomCompatDIR.'/random_bytes_libsodium.inc';
         } elseif (method_exists('Sodium', 'randombytes_buf')) {
-            require_once $RandomCompatDIR . '/random_bytes_libsodium_legacy.inc';
+            require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.inc';
         }
     }
 
@@ -117,7 +117,7 @@ 
             // place, that is not helpful to us here.
 
             // See random_bytes_dev_urandom.php
-            require_once $RandomCompatDIR . '/random_bytes_dev_urandom.inc';
+            require_once $RandomCompatDIR.'/random_bytes_dev_urandom.inc';
         }
         // Unset variables after use
         $RandomCompat_basedir = null;
@@ -159,7 +159,7 @@ 
         extension_loaded('mcrypt')
     ) {
         // See random_bytes_mcrypt.php
-        require_once $RandomCompatDIR . '/random_bytes_mcrypt.inc';
+        require_once $RandomCompatDIR.'/random_bytes_mcrypt.inc';
     }
     $RandomCompatUrandom = null;
 
@@ -184,7 +184,7 @@ 
                 $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
                 if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
                     // See random_bytes_com_dotnet.php
-                    require_once $RandomCompatDIR . '/random_bytes_com_dotnet.inc';
+                    require_once $RandomCompatDIR.'/random_bytes_com_dotnet.inc';
                 }
             } catch (com_exception $e) {
                 // Don't try to use it.
@@ -219,7 +219,7 @@ 
 }
 
 if (!is_callable('random_int')) {
-    require_once $RandomCompatDIR . '/random_int.inc';
+    require_once $RandomCompatDIR.'/random_int.inc';
 }
 
 $RandomCompatDIR = null;

Braces +1 added lines, -2 removed lines

@@ -207,8 +207,7 @@
          * @throws Exception
          * @return string
          */
-        function random_bytes($length)
-        {
+        function random_bytes($length) {
             unset($length); // Suppress "variable not used" warnings.
             throw new Exception(
                 'There is no suitable CSPRNG installed on your system'

html/inc/random_compat/byte_safe_strings.inc

Braces +4 added lines, -8 removed lines

@@ -43,8 +43,7 @@ 
          *
          * @return int
          */
-        function RandomCompat_strlen($binary_string)
-        {
+        function RandomCompat_strlen($binary_string) {
             if (!is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_strlen() expects a string'
@@ -66,8 +65,7 @@ 
          *
          * @return int
          */
-        function RandomCompat_strlen($binary_string)
-        {
+        function RandomCompat_strlen($binary_string) {
             if (!is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_strlen() expects a string'
@@ -99,8 +97,7 @@ 
          *
          * @return string
          */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
+        function RandomCompat_substr($binary_string, $start, $length = null) {
             if (!is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_substr(): First argument should be a string'
@@ -151,8 +148,7 @@ 
          *
          * @return string
          */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
+        function RandomCompat_substr($binary_string, $start, $length = null) {
             if (!is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_substr(): First argument should be a string'

Spacing +5 added lines, -5 removed lines

@@ -51,7 +51,7 @@ 
                 );
             }
 
-            return (int) mb_strlen($binary_string, '8bit');
+            return (int)mb_strlen($binary_string, '8bit');
         }
 
     } else {
@@ -73,7 +73,7 @@ 
                     'RandomCompat_strlen() expects a string'
                 );
             }
-            return (int) strlen($binary_string);
+            return (int)strlen($binary_string);
         }
     }
 }
@@ -133,7 +133,7 @@ 
                 return '';
             }
 
-            return (string) mb_substr($binary_string, $start, $length, '8bit');
+            return (string)mb_substr($binary_string, $start, $length, '8bit');
         }
 
     } else {
@@ -172,10 +172,10 @@ 
                     );
                 }
 
-                return (string) substr($binary_string, $start, $length);
+                return (string)substr($binary_string, $start, $length);
             }
 
-            return (string) substr($binary_string, $start);
+            return (string)substr($binary_string, $start);
         }
     }
 }