cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update v1.0.7.5

Browse Source
This commit is contained in:
Sujit Prasad
2016-06-14 18:13:39 +05:30
parent 383fd1c943
commit 3fbc55c0d8
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Auth/AuthController.php
View File

@@ -96,11 +96,13 @@ class AuthController extends Controller {
$code = str_random(60); $code = str_random(60);
$user->remember_token = $code; $user->remember_token = $code;
$user->save(); $user->save();
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'); $message12 = "";
try { $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)]);
$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) {
} catch (Exception $e) {
$message12 = Lang::get('lang.failed_to_send_email_contact_administrator'); $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); return redirect('home')->with('success', $message12);
} }

6
app/Http/Controllers/Common/PhpMailController.php
View File

@@ -15,13 +15,7 @@ class PhpMailController extends Controller {
public function fetch_smtp_details($id) { public function fetch_smtp_details($id) {
$emails = Emails::where('id', '=', $id)->first(); $emails = Emails::where('id', '=', $id)->first();
if ($emails->sending_status == 1) {
return $emails; return $emails;
} else {
$emails = null;
return $emails;
}
} }
/** /**