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

Check outbound port 25

Browse Source 
Fixes #243
This commit is contained in:
Girish Ramakrishnan
2017-03-09 15:43:13 -08:00
parent 9dd0518c00
commit 7e44e7de82
7 changed files with 72 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webadmin/src/js/client.js
View File

@@ -440,8 +440,8 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
}).error(defaultErrorHandler(callback));
};
Client.prototype.getExpectedDnsRecords = function (callback) {
get('/api/v1/settings/email_dns_records').success(function(data, status) {
Client.prototype.getEmailStatus = function (callback) {
get('/api/v1/settings/email_status').success(function(data, status) {
if (status !== 200) return callback(new ClientError(status, data));
callback(null, data);
}).error(defaultErrorHandler(callback));

4
webadmin/src/js/main.js
View File

@@ -76,10 +76,10 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
if (result.provider === 'caas') return;
Client.getExpectedDnsRecords(function (error, result) {
Client.getEmailStatus(function (error, result) {
if (error) return console.error(error);
if (!result.spf.status || !result.dkim.status || !result.ptr.status) {
if (!result.dns.spf.status || !result.dns.dkim.status || !result.dns.ptr.status || !result.outboundPort25.status) {
var actionScope = $scope.$new(true);
actionScope.action = '/#/settings';

15
webadmin/src/views/settings.html
View File

@@ -319,6 +319,21 @@
</div>
</div>
</div>
<div class="row" ng-if="mailConfig.enabled">
<div class="col-xs-12">
<h4 class="text-muted">
Outbound SMTP (Port 25) <i ng-class="outboundPort25.status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'" aria-hidden="true"></i>
<button class="btn btn-xs btn-default" ng-click="email.refresh()" ng-disabled="email.refreshBusy" ng-show="!outboundPort25.status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': email.refreshBusy }"></i></button>
</h4>
<a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse_dns_{{ record.value }}">Advanced</a>
<div id="collapse_dns_{{ record.value }}" class="panel-collapse collapse">
<div class="panel-body">
<p><b> {{ outboundPort25.value }} </b> </p>
</div>
</div>
</div>
</div>
</div>
</div>
<br/>

6
webadmin/src/views/settings.js
View File

@@ -8,6 +8,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$scope.config = Client.getConfig();
$scope.backupConfig = {};
$scope.dnsConfig = {};
$scope.outboundPort25 = {};
$scope.expectedDnsRecords = {};
$scope.expectedDnsRecordsTypes = [
{ name: 'MX', value: 'mx' },
@@ -509,10 +510,11 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
function showExpectedDnsRecords(callback) {
callback = callback || function (error) { if (error) console.error(error); };
Client.getExpectedDnsRecords(function (error, dnsRecords) {
Client.getEmailStatus(function (error, result) {
if (error) return callback(error);
$scope.expectedDnsRecords = dnsRecords;
$scope.expectedDnsRecords = result.dns;
$scope.outboundPort25 = result.outboundPort25;
callback(null);
});