Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 22:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-03-10 23:55:56 +02:00
parent 70c5645088
commit 013a2103dd
5 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/config/packages/zizaco/confide/config.php
View File

@ -111,7 +111,7 @@ return array(
| table, otherwise they will not be able to login after the payment. | table, otherwise they will not be able to login after the payment.
| |
*/ */
'signup_email' => true, 'signup_email' => false,
'signup_confirm' => true, 'signup_confirm' => false,
); );

8
app/controllers/AccountController.php
View File

@ -1,16 +1,19 @@
<?php <?php
use ninja\repositories\AccountRepository; use ninja\repositories\AccountRepository;
use ninja\mailers\UserMailer as Mailer;
class AccountController extends \BaseController { class AccountController extends \BaseController {
protected $accountRepo; protected $accountRepo;
protected $mailer;
public function __construct(AccountRepository $accountRepo) public function __construct(AccountRepository $accountRepo, Mailer $mailer)
{ {
parent::__construct(); parent::__construct();
$this->accountRepo = $accountRepo; $this->accountRepo = $accountRepo;
$this->mailer = $mailer;
} }
public function getStarted() public function getStarted()
@ -571,11 +574,14 @@ class AccountController extends \BaseController {
$user->first_name = trim(Input::get('new_first_name')); $user->first_name = trim(Input::get('new_first_name'));
$user->last_name = trim(Input::get('new_last_name')); $user->last_name = trim(Input::get('new_last_name'));
$user->email = trim(strtolower(Input::get('new_email'))); $user->email = trim(strtolower(Input::get('new_email')));
$user->username = $user->email;
$user->password = trim(Input::get('new_password')); $user->password = trim(Input::get('new_password'));
$user->password_confirmation = trim(Input::get('new_password')); $user->password_confirmation = trim(Input::get('new_password'));
$user->registered = true; $user->registered = true;
$user->amend(); $user->amend();
$this->mailer->sendConfirmation($user);
$activities = Activity::scope()->get(); $activities = Activity::scope()->get();
foreach ($activities as $activity) foreach ($activities as $activity)
{ {

17
app/ninja/mailers/UserMailer.php
View File

@ -8,6 +8,23 @@ use Utils;
class UserMailer extends Mailer { class UserMailer extends Mailer {
public function sendConfirmation(User $user)
{
if (!$user->email)
{
return;
}
$view = 'confirm';
$subject = 'Invoice Ninja Account Confirmation';
$data = [
'user' => $user
];
$this->sendTo($user->email, CONTACT_EMAIL, $subject, $view, $data);
}
public function sendNotification(User $user, Invoice $invoice, $type, Payment $payment = null) public function sendNotification(User $user, Invoice $invoice, $type, Payment $payment = null)
{ {
if (!$user->email) if (!$user->email)

6
app/views/emails/confirm_text.blade.php Executable file
View File

@ -0,0 +1,6 @@
{{ Lang::get('confide::confide.email.account_confirmation.subject') }}
{{ Lang::get('confide::confide.email.account_confirmation.body') }}
{{{ URL::to("user/confirm/{$user->confirmation_code}") }}}
{{ Lang::get('confide::confide.email.account_confirmation.farewell') }}

2
public/css/style.css
View File

@ -223,7 +223,7 @@ margin-left: 10px !important;
/*new*/ /*new*/
div { div {
word-break: break-all; word-break: break-word;
} }
div.required > label { div.required > label {