kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixed some bugs while registering users.

Browse Source
This commit is contained in:
James Cole
2015-01-17 07:14:01 +01:00
parent 86ecca6011
commit 7d4006b205
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/UserController.php
View File

@@ -77,7 +77,11 @@ class UserController extends BaseController
$user = $repository->register(Input::all());
if ($user) {
$email->sendVerificationMail($user);
$result = $email->sendVerificationMail($user);
if($result === false) {
$user->delete();
return View::make('error')->with('message','The email message could not be send. See the log files.');
}
return View::make('user.verification-pending');
}
@@ -121,6 +125,9 @@ class UserController extends BaseController
*/
public function register()
{
if (Config::get('mail.from.address') == '@gmail.com' || Config::get('mail.from.address') == '') {
return View::make('error')->with('message', 'Configuration error in <code>app/config/'.App::environment().'/mail.php</code>');
}
return View::make('user.register');
}