From 148d41d8dcce1584c9441244a8a2c0e689bcb797 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 22 Aug 2017 12:22:32 -0700
Subject: [PATCH] Removes erroneous else

---
 app/Http/Controllers/ProfileController.php | 54 ++++++++++------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 512a65d9af..1ad35bd136 100755
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -107,45 +107,41 @@ class ProfileController extends Controller
      */
     public function passwordSave(Request $request)
     {
+
         if (config('app.lock_passwords')) {
             return redirect()->route('account.password.index')->with('error', Lang::get('admin/users/table.lock_passwords'));
-        } else {
+        }
 
-            // Grab the user
-            $user = Auth::user();
+        $user = Auth::user();
+        if ($user->ldap_import=='1') {
+            return redirect()->route('account.password.index')->with('error', Lang::get('admin/users/message.error.password_ldap'));
+        }
 
-            if ($user->ldap_import=='1') {
-                return redirect()->route('account.password.index')->with('error', Lang::get('admin/users/message.error.password_ldap'));
+        $rules = array(
+            'current_password'     => 'required',
+            'password'         => 'required|min:6',
+            'password_confirm' => 'required|same:password',
+        );
+
+        $validator = \Validator::make($request->all(), $rules);
+        $validator->after(function($validator) use ($request, $user) {
+
+            if (!Hash::check($request->input('current_password'), $user->password)) {
+                $validator->errors()->add('current_password', trans('validation.hashed_pass'));
             }
+            
+        });
 
-
-            $rules = array(
-                'current_password'     => 'required',
-                'password'         => 'required|min:6',
-                'password_confirm' => 'required|same:password',
-            );
-
-            $validator = \Validator::make($request->all(), $rules);
-
-            $validator->after(function($validator) use ($request, $user) {
-
-                if (!Hash::check($request->input('current_password'), $user->password)) {
-                    $validator->errors()->add('current_password', trans('validation.hashed_pass'));
-                }
-            });
-
-            if (!$validator->fails()) {
-                $user->password = Hash::make($request->input('password'));
-                $user->save();
-                return redirect()->route('account.password.index')->with('success', 'Password updated!');
-
-            }
-            return redirect()->back()->withInput()->withErrors($validator);
-
+        if (!$validator->fails()) {
+            $user->password = Hash::make($request->input('password'));
+            $user->save();
+            return redirect()->route('account.password.index')->with('success', 'Password updated!');
 
         }
+        return redirect()->back()->withInput()->withErrors($validator);
 
 
     }
 
+
 }