From c5e5930c1bf6aae765874e24a763dfcda0f0548b Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 13 Aug 2015 00:54:57 -0700 Subject: [PATCH] Make sure lock passwords isn't true before emailing --- app/controllers/admin/AssetsController.php | 2 +- app/models/Asset.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index b553d12374..ecb3679bcf 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -543,7 +543,7 @@ class AssetsController extends AdminController $data['item_tag'] = $asset->asset_tag; $data['note'] = $logaction->note; - if (($asset->checkin_email()=='1')) { + if ((($asset->checkin_email()=='1')) && (!Config::get('app.lock_passwords'))) { Mail::send('emails.checkin-asset', $data, function ($m) use ($user) { $m->to($user->email, $user->first_name . ' ' . $user->last_name); $m->subject('Confirm Asset Checkin'); diff --git a/app/models/Asset.php b/app/models/Asset.php index 6718549a6f..bc56ec223b 100755 --- a/app/models/Asset.php +++ b/app/models/Asset.php @@ -66,7 +66,7 @@ $data['note'] = $note; $data['require_acceptance'] = $this->requireAcceptance(); - if (($this->requireAcceptance()=='1') || ($this->getEula())) { + if ((($this->requireAcceptance()=='1') || ($this->getEula())) && (!Config::get('app.lock_passwords'))) { Mail::send('emails.accept-asset', $data, function ($m) use ($user) { $m->to($user->email, $user->first_name . ' ' . $user->last_name);