ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure lock passwords isn't true before emailing

Browse Source
This commit is contained in:
snipe
2015-08-13 00:54:57 -07:00
parent ed2d7310f8
commit c5e5930c1b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+1 -1
View File
@@ -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');
app/models/Asset.php
+1 -1
View File
@@ -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);