DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Switched or and and to || and && for code quality

Browse source
This commit is contained in:
snipe 2016-07-10 20:55:44 -07:00
parent 814f8ea5fb
commit 4e38f96f97
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Auth/AuthController.php
View file

@ -89,7 +89,7 @@ class AuthController extends Controller
} }
// Connecting to LDAP // 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 // Needed for AD
ldap_set_option($connection, LDAP_OPT_REFERRALS, 0); ldap_set_option($connection, LDAP_OPT_REFERRALS, 0);
ldap_set_option($connection, LDAP_OPT_PROTOCOL_VERSION, $ldapversion); 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'))) { if ($this->ldap(Input::get('username'), Input::get('password'))) {
LOG::debug("Valid LDAP login. Updating the local data."); 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->password = bcrypt(Input::get('password'));
$user->ldap_import = 1; $user->ldap_import = 1;
$user->save(); $user->save();

2
app/Http/Controllers/UsersController.php
View file

@ -638,7 +638,7 @@ class UsersController extends Controller
} }
// Do we have permission to unsuspend this user? // 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 // Redirect to the user management page
return redirect()->route('users')->with('error', 'Insufficient permissions!'); return redirect()->route('users')->with('error', 'Insufficient permissions!');
} }