fisharebest / webtrees

app/Services/UserService.php

Indentation +1 added lines, -1 removed lines

@@ -320,7 +320,7 @@
             'real_name' => $real_name,
             'email'     => $email,
             'password'  => password_hash($password, PASSWORD_DEFAULT),
-	    'secret'    => $secret,
+        'secret'    => $secret,
         ]);
 
         $user_id = DB::lastInsertId();

app/Http/RequestHandlers/AccountUpdate.php

Indentation +3 added lines, -3 removed lines

@@ -67,11 +67,11 @@ 
         $language       = Validator::parsedBody($request)->string('language');
         $real_name      = Validator::parsedBody($request)->string('real_name');
         $password       = Validator::parsedBody($request)->string('password');
-	$secret         = Validator::parsedBody($request)->string('secret');
+    $secret         = Validator::parsedBody($request)->string('secret');
         $time_zone      = Validator::parsedBody($request)->string('timezone');
         $user_name      = Validator::parsedBody($request)->string('user_name');
         $visible_online = Validator::parsedBody($request)->boolean('visible-online', false);
-	$status_mfa = Validator::parsedBody($request)->boolean('status-mfa', '0');
+    $status_mfa = Validator::parsedBody($request)->boolean('status-mfa', '0');
 
         // Change the password
         if ($password !== '') {
@@ -104,7 +104,7 @@ 
         $user->setPreference(UserInterface::PREF_LANGUAGE, $language);
         $user->setPreference(UserInterface::PREF_TIME_ZONE, $time_zone);
         $user->setPreference(UserInterface::PREF_IS_VISIBLE_ONLINE, (string) $visible_online);
-	$user->setPreference(UserInterface::PREF_IS_STATUS_MFA, (string) $status_mfa);
+    $user->setPreference(UserInterface::PREF_IS_STATUS_MFA, (string) $status_mfa);
 
         if ($tree instanceof Tree) {
             $default_xref = Validator::parsedBody($request)->string('default-xref');

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         $language       = Validator::parsedBody($request)->string('language');
         $real_name      = Validator::parsedBody($request)->string('real_name');
         $password       = Validator::parsedBody($request)->string('password');
-	$secret         = Validator::parsedBody($request)->string('secret');
+	$secret = Validator::parsedBody($request)->string('secret');
         $time_zone      = Validator::parsedBody($request)->string('timezone');
         $user_name      = Validator::parsedBody($request)->string('user_name');
         $visible_online = Validator::parsedBody($request)->boolean('visible-online', false);

app/Http/RequestHandlers/SetupWizard.php

Indentation +1 added lines, -1 removed lines

@@ -409,7 +409,7 @@
             $admin = $this->user_service->create($data['wtuser'], $data['wtname'], $data['wtemail'], $data['wtpass'], $data['wtsecret']);
             $admin->setPreference(UserInterface::PREF_LANGUAGE, $data['lang']);
             $admin->setPreference(UserInterface::PREF_IS_VISIBLE_ONLINE, '1');
-	    $admin->setPreference(UserInterface::PREF_IS_STATUS_MFA, '0');
+        $admin->setPreference(UserInterface::PREF_IS_STATUS_MFA, '0');
         } else {
             $admin->setPassword($_POST['wtpass']);
         }

app/Http/RequestHandlers/UserAddAction.php

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         $real_name = Validator::parsedBody($request)->string('real_name');
         $email     = Validator::parsedBody($request)->string('email');
         $password  = Validator::parsedBody($request)->string('password');
-	$secret = "";
+    $secret = "";
 
         $errors = false;
 

app/Http/RequestHandlers/RegisterAction.php

Indentation +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
         $password = Validator::parsedBody($request)->string('password');
         $realname = Validator::parsedBody($request)->string('realname');
         $username = Validator::parsedBody($request)->string('username');
-	$secret = Validator::parsedBody($request)->string('secret');
+    $secret = Validator::parsedBody($request)->string('secret');
 
         try {
             if ($this->captcha_service->isRobot($request)) {

app/Http/RequestHandlers/LoginAction.php

Indentation +6 added lines, -6 removed lines

@@ -69,7 +69,7 @@ 
         $default_url = route(HomePage::class);
         $username    = Validator::parsedBody($request)->string('username');
         $password    = Validator::parsedBody($request)->string('password');
-	$code2fa    = Validator::parsedBody($request)->string('code2fa');
+    $code2fa    = Validator::parsedBody($request)->string('code2fa');
         $url         = Validator::parsedBody($request)->isLocalUrl()->string('url', $default_url);
 
         try {
@@ -132,15 +132,15 @@ 
             throw new Exception(I18N::translate('This account has not been approved. Please wait for an administrator to approve it.'));
         }
         if ($user->getPreference(UserInterface::PREF_IS_STATUS_MFA) !== '') {
-          # covers scenario where 2fa not enabled by user
-          if($code2fa != '') {
+            # covers scenario where 2fa not enabled by user
+            if($code2fa != '') {
             if (!$user->check2FAcode($code2fa)) {
                     throw new Exception(I18N::translate('2FA code does not match. Please try again.'));
             }
-          }
-          else {
+            }
+            else {
                     throw new Exception(I18N::translate('2FA code must be entered as you have 2FA authentication enabled. Please try again.'));
-          }
+            }
         }
         Auth::login($user);
         Log::addAuthenticationLog('Login: ' . Auth::user()->userName() . '/' . Auth::user()->realName());

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
         $default_url = route(HomePage::class);
         $username    = Validator::parsedBody($request)->string('username');
         $password    = Validator::parsedBody($request)->string('password');
-	$code2fa    = Validator::parsedBody($request)->string('code2fa');
+	$code2fa = Validator::parsedBody($request)->string('code2fa');
         $url         = Validator::parsedBody($request)->isLocalUrl()->string('url', $default_url);
 
         try {
@@ -133,7 +133,7 @@ 
         }
         if ($user->getPreference(UserInterface::PREF_IS_STATUS_MFA) !== '') {
           # covers scenario where 2fa not enabled by user
-          if($code2fa != '') {
+          if ($code2fa != '') {
             if (!$user->check2FAcode($code2fa)) {
                     throw new Exception(I18N::translate('2FA code does not match. Please try again.'));
             }

Braces +1 added lines, -2 removed lines

@@ -137,8 +137,7 @@
             if (!$user->check2FAcode($code2fa)) {
                     throw new Exception(I18N::translate('2FA code does not match. Please try again.'));
             }
-          }
-          else {
+          } else {
                     throw new Exception(I18N::translate('2FA code must be entered as you have 2FA authentication enabled. Please try again.'));
           }
         }

app/Http/RequestHandlers/UserEditAction.php

Indentation +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
         $real_name      = Validator::parsedBody($request)->string('real_name');
         $email          = Validator::parsedBody($request)->string('email');
         $password       = Validator::parsedBody($request)->string('password');
-	$secret         = Validator::parsedBody($request)->string('secret');
+    $secret         = Validator::parsedBody($request)->string('secret');
         $theme          = Validator::parsedBody($request)->string('theme');
         $language       = Validator::parsedBody($request)->string('language');
         $timezone       = Validator::parsedBody($request)->string('timezone');
@@ -85,7 +85,7 @@ 
         $canadmin       = Validator::parsedBody($request)->boolean('canadmin', false);
         $visible_online = Validator::parsedBody($request)->boolean('visible-online', false);
         $verified       = Validator::parsedBody($request)->boolean('verified', false);
-	$status_mfa     = Validator::parsedBody($request)->boolean('status-mfa', false);
+    $status_mfa     = Validator::parsedBody($request)->boolean('status-mfa', false);
         $approved       = Validator::parsedBody($request)->boolean('approved', false);
 
         $edit_user = $this->user_service->find($user_id);

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
         $real_name      = Validator::parsedBody($request)->string('real_name');
         $email          = Validator::parsedBody($request)->string('email');
         $password       = Validator::parsedBody($request)->string('password');
-	$secret         = Validator::parsedBody($request)->string('secret');
+	$secret = Validator::parsedBody($request)->string('secret');
         $theme          = Validator::parsedBody($request)->string('theme');
         $language       = Validator::parsedBody($request)->string('language');
         $timezone       = Validator::parsedBody($request)->string('timezone');
@@ -85,7 +85,7 @@ 
         $canadmin       = Validator::parsedBody($request)->boolean('canadmin', false);
         $visible_online = Validator::parsedBody($request)->boolean('visible-online', false);
         $verified       = Validator::parsedBody($request)->boolean('verified', false);
-	$status_mfa     = Validator::parsedBody($request)->boolean('status-mfa', false);
+	$status_mfa = Validator::parsedBody($request)->boolean('status-mfa', false);
         $approved       = Validator::parsedBody($request)->boolean('approved', false);
 
         $edit_user = $this->user_service->find($user_id);

app/User.php

Indentation +18 added lines, -18 removed lines

@@ -278,24 +278,24 @@
         return $this;
     }
    
-      /**
-      * Validate a supplied 2fa code
-      *
-      * @param string $code2fa
-      *
-      * @return bool
-      */
-     public function check2facode(string $code2fa): bool
-     {
-         $secret = DB::table('user')
-             ->where('user_id', '=', $this->id())
-             ->value('secret');
-       $google2fa = new Google2FA;
-         if($google2fa->verifyKey($secret, $code2fa)) {
-                  return true;
-               }
-         return false;
-     }
+        /**
+         * Validate a supplied 2fa code
+         *
+         * @param string $code2fa
+         *
+         * @return bool
+         */
+        public function check2facode(string $code2fa): bool
+        {
+            $secret = DB::table('user')
+                ->where('user_id', '=', $this->id())
+                ->value('secret');
+        $google2fa = new Google2FA;
+            if($google2fa->verifyKey($secret, $code2fa)) {
+                    return true;
+                }
+            return false;
+        }
 
     /**
      * A closure which will create an object from a database row.

Spacing +1 added lines, -1 removed lines

@@ -291,7 +291,7 @@
              ->where('user_id', '=', $this->id())
              ->value('secret');
        $google2fa = new Google2FA;
-         if($google2fa->verifyKey($secret, $code2fa)) {
+         if ($google2fa->verifyKey($secret, $code2fa)) {
                   return true;
                }
          return false;

app/Http/RequestHandlers/AccountEdit.php

Indentation +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
             });
 
         $show_delete_option = $user->getPreference(UserInterface::PREF_IS_ADMINISTRATOR) !== '1';
-	$show_2fa = Site::getPreference('SHOW_2FA_OPTION') === '1';
+    $show_2fa = Site::getPreference('SHOW_2FA_OPTION') === '1';
         $timezone_ids       = DateTimeZone::listIdentifiers();
         $timezones          = array_combine($timezone_ids, $timezone_ids);
         $title              = I18N::translate('My account');
@@ -95,7 +95,7 @@ 
             'languages'            => $languages->all(),
             'my_individual_record' => $my_individual_record,
             'show_delete_option'   => $show_delete_option,
-	    'show_2fa'             => $show_2fa,
+        'show_2fa'             => $show_2fa,
             'timezones'            => $timezones,
             'title'                => $title,
             'tree'                 => $tree,