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

Fixes #1130 - don't try to send email if email is not provided with the user

Browse Source
This commit is contained in:
snipe
2015-08-28 12:15:07 -07:00
parent cf7ef5e8b0
commit da10a9a2aa
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/AuthController.php
+11 -6
View File
@@ -207,7 +207,9 @@ class AuthController extends BaseController
try {
// Get the user password recovery code
$user = Sentry::getUserProvider()->findByLogin(Input::get('username'));
if (!$user = Sentry::getUserProvider()->findByLogin(Input::get('username'))) {
$user = User::where('email','=',Input::get('username'));
}
$reset = $user->getResetPasswordCode();
@@ -221,11 +223,14 @@ class AuthController extends BaseController
$user->save();
// Send the activation code through username
Mail::send('emails.forgot-password', $data, function ($m) use ($user) {
$m->to($user->username, $user->first_name . ' ' . $user->last_name);
$m->subject('Account Password Recovery');
});
if ($user->email) {
// Send the activation code through username
Mail::send('emails.forgot-password', $data, function ($m) use ($user) {
$m->to($user->email, $user->first_name . ' ' . $user->last_name);
$m->subject('Account Password Recovery');
});
}
} catch (Cartalyst\Sentry\Users\UserNotFoundException $e) {
// Even though the username was not found, we will pretend
// we have sent the password reset code through username,
app/views/frontend/auth/forgot-password.blade.php
+1 -1
View File
@@ -23,7 +23,7 @@ Forgot Password ::
</label>
<div class="col-md-5">
<input class="form-control" type="text" name="username" id="username" value="{{{ Input::old('username') }}}" />
{{ $errors->first('email', '<br><span class="alert-msg">:message</span>') }}
{{ $errors->first('username', '<br><span class="alert-msg">:message</span>') }}
</div>
</div>