From 05f0d453e1557eb06f480bb1c2cf2e208510cef7 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 15 Mar 2017 17:28:23 -0300 Subject: [PATCH] Ivan - Fix smtp server [skip ci] --- server/controllers/system/init-settings.php | 4 +- server/controllers/user/signup.php | 1 + .../data/mail-templates/user-signup-en.html | 395 +++++++++++++++++- server/libs/MailSender.php | 1 + 4 files changed, 393 insertions(+), 8 deletions(-) diff --git a/server/controllers/system/init-settings.php b/server/controllers/system/init-settings.php index e0d440aa..45f889ff 100644 --- a/server/controllers/system/init-settings.php +++ b/server/controllers/system/init-settings.php @@ -38,7 +38,7 @@ class InitSettingsController extends Controller { 'recaptcha-private' => '', 'no-reply-email' => 'noreply@opensupports.com', 'smtp-host' => 'localhost', - 'smtp-port' => 25, + 'smtp-port' => 7070, 'smtp-user' => '', 'smtp-pass' => '', 'time-zone' => 0, @@ -47,7 +47,7 @@ class InitSettingsController extends Controller { 'allow-attachments' => 0, 'max-size' => 1024, 'title' => 'Support Center', - 'url' => 'http://www.opensupports.com/support', + 'url' => 'http://dev3.opensupports.com', 'registration' => Controller::request('registration'), 'user-system-enabled' => Controller::request('user-system-enabled'), 'last-stat-day' => date('YmdHi', strtotime(' -12 day ')), diff --git a/server/controllers/user/signup.php b/server/controllers/user/signup.php index 444ea24c..41522832 100644 --- a/server/controllers/user/signup.php +++ b/server/controllers/user/signup.php @@ -108,6 +108,7 @@ class SignUpController extends Controller { $mailSender->setTemplate(MailTemplate::USER_SIGNUP, [ 'to' => $this->userEmail, 'name' => $this->userName, + 'url' => Setting::getSetting('url')->getValue(), 'verificationToken' => $this->verificationToken ]); diff --git a/server/data/mail-templates/user-signup-en.html b/server/data/mail-templates/user-signup-en.html index d5844f64..e7cfc4cb 100644 --- a/server/data/mail-templates/user-signup-en.html +++ b/server/data/mail-templates/user-signup-en.html @@ -1,6 +1,389 @@ -
- Welcome, {{name}} to our support center, - your email is {{to}}, - you can verify your user using this link - http://dev3.opensupports.com/verify-token/{{to}}/{{verificationToken}} -
+ + + + + + Support Center + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + +
+ logo +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Verify your account +
+ Welcome to our support center, {{name}}!. We need you to verify this email in order to get access to your account. +
+ + + + +
+ + + + + + + + + + +
+ Use this code in {{url}}/verify-token or click the button below. +
+ {{verificationToken}} +
+ +
+
+
+
+
+
+ + + + +
+ OpenSupports
+ Open source ticket system
+ www.opensupports.com

+
+
+
+ + \ No newline at end of file diff --git a/server/libs/MailSender.php b/server/libs/MailSender.php index e590667f..82570b19 100644 --- a/server/libs/MailSender.php +++ b/server/libs/MailSender.php @@ -26,6 +26,7 @@ class MailSender { $mailer->addAddress($this->mailOptions['to']); $mailer->Subject = $this->mailOptions['subject']; $mailer->Body = $this->mailOptions['body']; + $mailer->isHTML(true); $mailer->isSMTP(); $mailer->SMTPAuth = true;