tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ivan - Fix PHPMailer configurations, improve user system install [skip ci]

This commit is contained in:
ivan 2017-03-16 16:11:27 -03:00
parent 05f0d453e1
commit 475d11ccac
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/install/install-step-4-user-system.js
View File

@ -56,8 +56,8 @@ class InstallStep4UserSystem extends React.Component {
path: '/system/init-settings', path: '/system/init-settings',
data: { data: {
'language': this.props.language, 'language': this.props.language,
'user-system-enabled': form['user-system-enabled'], 'user-system-enabled': form['user-system-enabled'] * 1,
'registration': form['registration'] 'registration': form['registration'] * 1
} }
}).then(() => browserHistory.push('/install/step-5')); }).then(() => browserHistory.push('/install/step-5'));
} }

4
server/controllers/system/init-settings.php
View File

@ -48,8 +48,8 @@ class InitSettingsController extends Controller {
'max-size' => 1024, 'max-size' => 1024,
'title' => 'Support Center', 'title' => 'Support Center',
'url' => 'http://dev3.opensupports.com', 'url' => 'http://dev3.opensupports.com',
'registration' => Controller::request('registration'), 'registration' => !!Controller::request('registration'),
'user-system-enabled' => Controller::request('user-system-enabled'), 'user-system-enabled' => !!Controller::request('user-system-enabled'),
'last-stat-day' => date('YmdHi', strtotime(' -12 day ')), 'last-stat-day' => date('YmdHi', strtotime(' -12 day ')),
'ticket-gap' => Hashing::generateRandomPrime(100000, 999999), 'ticket-gap' => Hashing::generateRandomPrime(100000, 999999),
'file-gap' => Hashing::generateRandomPrime(100000, 999999), 'file-gap' => Hashing::generateRandomPrime(100000, 999999),

4
server/data/mail-templates/user-signup-en.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<td style="padding-bottom: 30px;"> <td style="padding-bottom: 30px;">
Use this code in {{url}}/verify-token or click the button below. Use this code in {{url}}/verify-token/{{email}}/{{verificationToken}} or click the button below.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -351,7 +351,7 @@
<tr> <tr>
<td class="button"> <td class="button">
<div><!--[if mso]> <div><!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="http://" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/verify-token/{{to}}/{{verificationToken}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
<w:anchorlock/> <w:anchorlock/>
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Shop Now</center> <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Shop Now</center>
</v:roundrect> </v:roundrect>

2
server/libs/MailSender.php
View File

@ -5,6 +5,7 @@ class MailSender {
public function __construct() { public function __construct() {
$this->mailOptions['from'] = Setting::getSetting('no-reply-email')->value; $this->mailOptions['from'] = Setting::getSetting('no-reply-email')->value;
$this->mailOptions['fromName'] = 'OpenSupports';
$this->mailOptions['smtp-host'] = Setting::getSetting('smtp-host')->value; $this->mailOptions['smtp-host'] = Setting::getSetting('smtp-host')->value;
$this->mailOptions['smtp-port'] = Setting::getSetting('smtp-port')->value; $this->mailOptions['smtp-port'] = Setting::getSetting('smtp-port')->value;
@ -23,6 +24,7 @@ class MailSender {
$mailer = new PHPMailer(); $mailer = new PHPMailer();
$mailer->From = $this->mailOptions['from']; $mailer->From = $this->mailOptions['from'];
$mailer->FromName = $this->mailOptions['fromName'];
$mailer->addAddress($this->mailOptions['to']); $mailer->addAddress($this->mailOptions['to']);
$mailer->Subject = $this->mailOptions['subject']; $mailer->Subject = $this->mailOptions['subject'];
$mailer->Body = $this->mailOptions['body']; $mailer->Body = $this->mailOptions['body'];