From 4e38f96f978c2b0a4518b9de9fe147d1a1318f6a Mon Sep 17 00:00:00 2001 From: snipe Date: Sun, 10 Jul 2016 20:55:44 -0700 Subject: [PATCH] Switched or and and to || and && for code quality --- app/Http/Controllers/Auth/AuthController.php | 4 ++-- app/Http/Controllers/UsersController.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index da14962faf..2a7de70633 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -89,7 +89,7 @@ class AuthController extends Controller } // Connecting to LDAP - $connection = ldap_connect($ldaphost) or die("Could not connect to {$ldaphost}"); + $connection = ldap_connect($ldaphost) || die("Could not connect to {$ldaphost}"); // Needed for AD ldap_set_option($connection, LDAP_OPT_REFERRALS, 0); ldap_set_option($connection, LDAP_OPT_PROTOCOL_VERSION, $ldapversion); @@ -210,7 +210,7 @@ class AuthController extends Controller if ($this->ldap(Input::get('username'), Input::get('password'))) { LOG::debug("Valid LDAP login. Updating the local data."); - $user = User::find($user->id); + $user = User::find($user->id); //need the Sentry object, not the Eloquent object, to access critical password hashing functions $user->password = bcrypt(Input::get('password')); $user->ldap_import = 1; $user->save(); diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 32b599bd92..31b94947ba 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -638,7 +638,7 @@ class UsersController extends Controller } // Do we have permission to unsuspend this user? - if ($user->isSuperUser() and ! Auth::user()->isSuperUser()) { + if ($user->isSuperUser() && !Auth::user()->isSuperUser()) { // Redirect to the user management page return redirect()->route('users')->with('error', 'Insufficient permissions!'); }