BOINC / boinc

html/inc/password.php

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/bootstrap.inc

Doc Comments +42 added lines

@@ -30,6 +30,11 @@ 
 // $brand: the text or image to show at left of navbar
 // If text, put it in <a class="navbar-brand" ...
 //
+/**
+ * @param string $brand
+ * @param boolean $fixed
+ * @param boolean $inverse
+ */
 function navbar_start($brand, $fixed, $inverse) {
     global $fixed_navbar;
     $class = "navbar";
@@ -99,6 +104,9 @@ 
 
 // add a dropdown menu
 //
+/**
+ * @param string $name
+ */
 function navbar_menu($name, $items) {
     echo '
       <li class="dropdown">
@@ -218,6 +226,10 @@ 
 // output a panel.
 // $content_func is a function that generates the panel contents
 //
+/**
+ * @param string|null $title
+ * @param Closure $content_func
+ */
 function panel($title, $content_func, $class="panel-primary") {
     echo sprintf('<div class="panel %s">
         ', $class
@@ -244,6 +256,11 @@ 
 // are functions that generate the top, left, and right content
 // $left_width is the width of left column in 1/12 units.
 //
+/**
+ * @param boolean $top_func
+ * @param Closure $left_func
+ * @param Closure $right_func
+ */
 function grid($top_func, $left_func, $right_func, $left_width=6) {
     echo '
         <div class="container-fluid">
@@ -277,6 +294,9 @@ 
     ';
 }
 
+/**
+ * @param string $action
+ */
 function form_start($action, $method='get') {
     echo sprintf(
         '<div class="container">
@@ -286,6 +306,9 @@ 
     );
 }
 
+/**
+ * @param string $name
+ */
 function form_input_hidden($name, $value) {
     echo '<input type="hidden" name="'.$name.'" value="'.$value.'">
     ';
@@ -301,6 +324,10 @@ 
 define('FORM_LEFT_OFFSET', 'col-sm-offset-4');
 define('FORM_RIGHT_CLASS', 'col-sm-8');
 
+/**
+ * @param string $label
+ * @param string $name
+ */
 function form_input_text($label, $name, $value='', $type='text', $attrs='', $extra='') {
     echo sprintf('
         <div class="form-group">
@@ -343,6 +370,11 @@ 
 
 // $items is either a string of <option> elements, or an array
 //
+/**
+ * @param string $label
+ * @param string $name
+ * @param string $items
+ */
 function form_select($label, $name, $items) {
     echo sprintf('
         <div class="form-group">
@@ -387,6 +419,9 @@ 
 
 // $items is list of (name, label, checked)
 //
+/**
+ * @param string $label
+ */
 function form_checkboxes($label, $items, $attrs='') {
     echo sprintf('
         <div class="form-group">
@@ -434,6 +469,10 @@ 
     ';
 }
 
+/**
+ * @param string $label
+ * @param string $item
+ */
 function form_general($label, $item) {
     echo '
         <div class="form-group">
@@ -456,6 +495,9 @@ 
 ';
 }
 
+/**
+ * @param string $text
+ */
 function form_submit($text, $attrs='') {
     form_general(
         "",

Spacing +15 added lines, -15 removed lines

@@ -138,12 +138,12 @@ 
         // prefix for links; needed for pages not in top dir
     $user,
         // logged-in user, if any
-    $fixed=false,
+    $fixed = false,
         // if true, navbar is fixed at top of page.
         // NOTE: if you do this, you must set a global var $fixed_navbar
         // to true at compile time
         // (it needs to be set when page_head() is called).
-    $inverse=false
+    $inverse = false
         // white on black?
 ) {
     global $master_url;
@@ -218,7 +218,7 @@ 
 // output a panel.
 // $content_func is a function that generates the panel contents
 //
-function panel($title, $content_func, $class="panel-primary") {
+function panel($title, $content_func, $class = "panel-primary") {
     echo sprintf('<div class="panel %s">
         ', $class
     );
@@ -244,7 +244,7 @@ 
 // are functions that generate the top, left, and right content
 // $left_width is the width of left column in 1/12 units.
 //
-function grid($top_func, $left_func, $right_func, $left_width=6) {
+function grid($top_func, $left_func, $right_func, $left_width = 6) {
     echo '
         <div class="container-fluid">
     ';
@@ -259,7 +259,7 @@ 
             </div>
         ';
     }
-    $right_width = 12-$left_width;
+    $right_width = 12 - $left_width;
     echo '
         <div class="row">
         <div class="col-sm-'.$left_width.'">
@@ -277,7 +277,7 @@ 
     ';
 }
 
-function form_start($action, $method='get') {
+function form_start($action, $method = 'get') {
     echo sprintf(
         '<div class="container">
         <form class="form-horizontal" method="%s" action="%s">'
@@ -301,7 +301,7 @@ 
 define('FORM_LEFT_OFFSET', 'col-sm-offset-4');
 define('FORM_RIGHT_CLASS', 'col-sm-8');
 
-function form_input_text($label, $name, $value='', $type='text', $attrs='', $extra='') {
+function form_input_text($label, $name, $value = '', $type = 'text', $attrs = '', $extra = '') {
     echo sprintf('
         <div class="form-group">
             <label class="control-label %s">%s</label>
@@ -328,7 +328,7 @@ 
     );
 }
 
-function form_input_textarea($label, $name, $value='') {
+function form_input_textarea($label, $name, $value = '') {
     echo sprintf('
         <div class="form-group">
             <label class="control-label %s" for="%s">%s</label>
@@ -377,7 +377,7 @@ 
     );
     $n = 0;
     foreach ($items as $i) {
-        $s = ($flags && $flags[$n])?'selected':'';
+        $s = ($flags && $flags[$n]) ? 'selected' : '';
         echo '<option '.$s.' value="'.$i[0].'">'.$i[1].'</option>
         ';
         $n++;
@@ -387,7 +387,7 @@ 
 
 // $items is list of (name, label, checked)
 //
-function form_checkboxes($label, $items, $attrs='') {
+function form_checkboxes($label, $items, $attrs = '') {
     echo sprintf('
         <div class="form-group">
             <label class="control-label %s">%s</label>
@@ -404,7 +404,7 @@ 
         }
         echo sprintf('<input %s type="checkbox" name="%s" %s> %s
             ',
-            $attrs, $i[0], $i[2]?"checked":"", $i[1]
+            $attrs, $i[0], $i[2] ? "checked" : "", $i[1]
         );
     }
     echo '</div>
@@ -423,7 +423,7 @@ 
         FORM_LEFT_CLASS, $label, FORM_RIGHT_CLASS
     );
     foreach ($items as $i) {
-        $checked = ($selected == $i[0])?"checked":"";
+        $checked = ($selected == $i[0]) ? "checked" : "";
         echo sprintf('<input type="radio" name="%s" value="%s" %s> %s <br>
             ',
             $name, $i[0], $checked, $i[1]
@@ -456,7 +456,7 @@ 
 ';
 }
 
-function form_submit($text, $attrs='') {
+function form_submit($text, $attrs = '') {
     form_general(
         "",
         sprintf('<button %s type="submit" class="btn btn-success">%s</button>',
@@ -465,11 +465,11 @@ 
     );
 }
 
-function form_checkbox($label, $name, $checked=false) {
+function form_checkbox($label, $name, $checked = false) {
     echo sprintf('
         <div class="form-group">
             <input type="checkbox" name="%s" %s> &nbsp; <span class="lead">%s</span>
         </div>
-        ', $name, $checked?"checked":"", $label
+        ', $name, $checked ? "checked" : "", $label
     );
 }

html/user/login_form.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 if (!parse_bool($config, "disable_account_creation")
     && !parse_bool($config, "no_web_account_creation")
 ) {
-    echo tra("or %1 create an account %2.", "<a href=\"create_account_form.php?next_url=$next_url\">","</a>");
+    echo tra("or %1 create an account %2.", "<a href=\"create_account_form.php?next_url=$next_url\">", "</a>");
 }
 
 page_tail();

html/ops/login_action.php

Doc Comments +3 added lines

@@ -24,6 +24,9 @@
 require_once("../inc/user.inc");
 require_once("../inc/password.php");
 
+/**
+ * @param string $passwd_hash
+ */
 function do_passwd_rehash($user, $passwd_hash) {
     $database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT);
     $result = $user->update(" passwd_hash='$database_passwd_hash' ");

html/user/login_action.php

Doc Comments +3 added lines

@@ -32,6 +32,9 @@
 
 check_get_args(array("id", "t", "h", "key"));
 
+/**
+ * @param string $passwd_hash
+ */
 function do_passwd_rehash($user, $passwd_hash) {
     $database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT);
     $result = $user->update(" passwd_hash='$database_passwd_hash' ");

html/user/lookup_account.php

Doc Comments +3 added lines

@@ -25,6 +25,9 @@
 require_once("../inc/ldap.inc");
 require_once("../inc/password.php");
 
+/**
+ * @param string $passwd_hash
+ */
 function do_passwd_rehash($user, $passwd_hash) {
     $database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT);
     $result = $user->update(" passwd_hash='$database_passwd_hash' ");

html/user/edit_email_action.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
             echo tra("Invalid password.");
         } else {
             $passwd_hash = md5($passwd.$email_addr);
-            $database_passwd_hash = password_hash($passwd_hash , PASSWORD_DEFAULT);
+            $database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT);
             $email_addr = BoincDb::escape_string($email_addr);
             $result = $user->update(
                 "email_addr='$email_addr', passwd_hash='$database_passwd_hash', email_validated=0"

html/inc/account.inc

Spacing +3 added lines, -3 removed lines

@@ -97,7 +97,7 @@ 
             tra("Must be at least %1 characters", $min_passwd_length),
             tra("Password")
         ),
-        "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd")
+        "passwd", "", "password", 'id="passwd"', passwd_visible_checkbox("passwd")
     );
     form_select(
         sprintf('<span title="%s">%s</span>',
@@ -123,9 +123,9 @@ 
     } else {
         $x = tra("Email address:");
     }
-    form_input_text($x, "email_addr", '', 'text', $attrs='autofocus tabindex="1"');
+    form_input_text($x, "email_addr", '', 'text', $attrs = 'autofocus tabindex="1"');
     form_input_text(
-        tra("Password:").'<br><small><a href="get_passwd.php">' . tra("forgot password?") . "</a></small>",
+        tra("Password:").'<br><small><a href="get_passwd.php">'.tra("forgot password?")."</a></small>",
         "passwd",
         "",
         "password",