simplesamlphp / simplesamlphp-module-sqlauth

src/Auth/Source/PasswordVerify.php

Indentation +3 added lines, -3 removed lines

@@ -172,13 +172,13 @@ 
                 || is_null($row[$this->passwordhashcolumn]))
             {
                 \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                          ': column ' . $this->passwordhashcolumn . ' must be in every result tuple.');
+                                            ': column ' . $this->passwordhashcolumn . ' must be in every result tuple.');
                 throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
             if( $pwhash ) {
                 if( $pwhash != $row[$this->passwordhashcolumn] ) {
                     \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                              ': column ' . $this->passwordhashcolumn . ' must be THE SAME in every result tuple.');
+                                                ': column ' . $this->passwordhashcolumn . ' must be THE SAME in every result tuple.');
                     throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
                 }
             }
@@ -191,7 +191,7 @@ 
         if( is_null($pwhash)) {
             if( $pwhash != $row[$this->passwordhashcolumn] ) {
                 \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                          ': column ' . $this->passwordhashcolumn . ' does not contain a password hash.');
+                                            ': column ' . $this->passwordhashcolumn . ' does not contain a password hash.');
                 throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
         }

Spacing +13 added lines, -13 removed lines

@@ -59,10 +59,10 @@ 
         // Call the parent constructor first, as required by the interface
         parent::__construct($info, $config);
 
-        if( array_key_exists('passwordhashcolumn', $config )) {
+        if (array_key_exists('passwordhashcolumn', $config)) {
             $this->passwordhashcolumn = $config['passwordhashcolumn'];
         }
-        if( !$this->passwordhashcolumn ) {
+        if (!$this->passwordhashcolumn) {
             $this->passwordhashcolumn = 'passwordhash';
         }
     }
@@ -75,7 +75,7 @@ 
      * @param array  $forbiddenAttributes An array of attributes to never return
      * @return array  Associative array with the users attributes.
      */
-    protected function extractAttributes( $data, $forbiddenAttributes = array() )
+    protected function extractAttributes($data, $forbiddenAttributes = array())
     {
         $attributes = [];
         foreach ($data as $row) {
@@ -172,13 +172,13 @@ 
                 || is_null($row[$this->passwordhashcolumn]))
             {
                 \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                          ': column ' . $this->passwordhashcolumn . ' must be in every result tuple.');
+                                          ': column '.$this->passwordhashcolumn.' must be in every result tuple.');
                 throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
-            if( $pwhash ) {
-                if( $pwhash != $row[$this->passwordhashcolumn] ) {
+            if ($pwhash) {
+                if ($pwhash != $row[$this->passwordhashcolumn]) {
                     \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                              ': column ' . $this->passwordhashcolumn . ' must be THE SAME in every result tuple.');
+                                              ': column '.$this->passwordhashcolumn.' must be THE SAME in every result tuple.');
                     throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
                 }
             }
@@ -188,10 +188,10 @@ 
          * This should never happen as the count(data) test above would have already thrown.
          * But checking twice doesn't hurt.
          */
-        if( is_null($pwhash)) {
-            if( $pwhash != $row[$this->passwordhashcolumn] ) {
+        if (is_null($pwhash)) {
+            if ($pwhash != $row[$this->passwordhashcolumn]) {
                 \SimpleSAML\Logger::error('sqlauth:'.$this->authId.
-                                          ': column ' . $this->passwordhashcolumn . ' does not contain a password hash.');
+                                          ': column '.$this->passwordhashcolumn.' does not contain a password hash.');
                 throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
             }
         }
@@ -200,13 +200,13 @@ 
          * VERIFICATION!
          * Now to check if the password the user supplied is actually valid
          */
-        if( !password_verify( $password, $pwhash )) {
-            \SimpleSAML\Logger::error('sqlauth:'.$this->authId. ': password is incorrect.');
+        if (!password_verify($password, $pwhash)) {
+            \SimpleSAML\Logger::error('sqlauth:'.$this->authId.': password is incorrect.');
             throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
         }
 
         
-        $attributes = $this->extractAttributes( $data, array($this->passwordhashcolumn) );
+        $attributes = $this->extractAttributes($data, array($this->passwordhashcolumn));
 
         \SimpleSAML\Logger::info('sqlauth:'.$this->authId.': Attributes: '.
             implode(',', array_keys($attributes)));