From 3fbc55c0d807584fa34d857a83bd66bd618f5d67 Mon Sep 17 00:00:00 2001 From: Sujit Prasad Date: Tue, 14 Jun 2016 18:13:39 +0530 Subject: [PATCH] update v1.0.7.5 --- app/Http/Controllers/Auth/AuthController.php | 10 ++++++---- app/Http/Controllers/Common/PhpMailController.php | 8 +------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index bf4377d1e..03c32266b 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -96,11 +96,13 @@ class AuthController extends Controller { $code = str_random(60); $user->remember_token = $code; $user->save(); - $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'); - try { - $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => 'Activate your Account', 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]); - } catch (Exception $e) { + $message12 = ""; + $var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => 'Activate your Account', 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]); + if ($var == null) { $message12 = Lang::get('lang.failed_to_send_email_contact_administrator'); + return redirect('home')->with('warning', $message12); + } else { + $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'); } return redirect('home')->with('success', $message12); } diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index 1ce415d17..148f0fa95 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -15,13 +15,7 @@ class PhpMailController extends Controller { public function fetch_smtp_details($id) { $emails = Emails::where('id', '=', $id)->first(); - if ($emails->sending_status == 1) { - return $emails; - } else { - $emails = null; - - return $emails; - } + return $emails; } /**