jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Select tls based on port

Browse Source 
Note that starttls is always supported

part of #188
This commit is contained in:
Girish Ramakrishnan
2017-06-28 16:56:11 -05:00
parent ae1dff980a
commit 7edf43c627
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webadmin/src/views/email.js
View File

@@ -86,12 +86,12 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
$scope.mailRelayPresets = [
{ provider: 'cloudron-smtp', name: 'Built-in SMTP server' },
{ provider: 'external-smtp', name: 'External SMTP server', host: '', port: 587, tls: true },
{ provider: 'ses-smtp', name: 'Amazon SES', host: 'email-smtp.us-east-1.amazonaws.com', port: 25, tls: true },
{ provider: 'google-smtp', name: 'Google', host: 'smtp.gmail.com', port: 587, tls: true },
{ provider: 'mailgun-smtp', name: 'Mailgun', host: 'smtp.mailgun.org', port: 587, tls: true },
{ provider: 'postmark-smtp', name: 'Postmark', host: 'smtp.postmarkapp.com', port: 587, tls: true },
{ provider: 'sendgrid-smtp', name: 'SendGrid', host: 'smtp.sendgrid.net', port: 587, tls: true },
{ provider: 'external-smtp', name: 'External SMTP server', host: '', port: 587, tls: false },
{ provider: 'ses-smtp', name: 'Amazon SES', host: 'email-smtp.us-east-1.amazonaws.com', port: 25, tls: false },
{ provider: 'google-smtp', name: 'Google', host: 'smtp.gmail.com', port: 587, tls: false },
{ provider: 'mailgun-smtp', name: 'Mailgun', host: 'smtp.mailgun.org', port: 587, tls: false },
{ provider: 'postmark-smtp', name: 'Postmark', host: 'smtp.postmarkapp.com', port: 587, tls: false },
{ provider: 'sendgrid-smtp', name: 'SendGrid', host: 'smtp.sendgrid.net', port: 587, tls: false },
];
$scope.mailRelay = {
@@ -115,13 +115,18 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
port: 25,
username: '',
password: '',
tls: true,
tls: true // whether we should connect with TLS. STARTTLS is always supported
},
submit: function () {
$scope.mailRelay.error = null;
$scope.mailRelay.busy = true;
if ($scope.mailRelay.relay.provider === 'external-smtp') {
// this is generally the case
$scope.mailRelay.relay.tls = $scope.mailRelay.relay.port === 465;
}
Client.setMailRelay($scope.mailRelay.relay, function (error) {
if (error) {
$scope.mailRelay.error = error.message;