From a3c37b4e14bd2df7204b35c45aea8a2f655726ee Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Sun, 10 May 2020 23:38:59 +0500 Subject: [PATCH] display mail client details --- mailServer/mailserverManager.py | 2 +- mailServer/static/mailServer/mailServer.js | 1 + .../templates/mailServer/listEmails.html | 76 ++++++++++++++++++- static/mailServer/mailServer.js | 1 + 4 files changed, 78 insertions(+), 2 deletions(-) diff --git a/mailServer/mailserverManager.py b/mailServer/mailserverManager.py index 187fbbe74..a171cc68e 100755 --- a/mailServer/mailserverManager.py +++ b/mailServer/mailserverManager.py @@ -537,7 +537,7 @@ class MailServerManager: json_data = json_data + ',' + json.dumps(dic) json_data = json_data + ']' - final_json = json.dumps({'status': 1, 'fetchStatus': 1, 'mailConfigured': mailConfigured, 'error_message': "None", "data": json_data}) + final_json = json.dumps({'status': 1, 'fetchStatus': 1,'serverHostname': 'mail.%s' % (selectedDomain), 'mailConfigured': mailConfigured, 'error_message': "None", "data": json_data}) return HttpResponse(final_json) except BaseException as msg: diff --git a/mailServer/static/mailServer/mailServer.js b/mailServer/static/mailServer/mailServer.js index c33087815..f46bb4d4a 100755 --- a/mailServer/static/mailServer/mailServer.js +++ b/mailServer/static/mailServer/mailServer.js @@ -1153,6 +1153,7 @@ app.controller('listEmails', function ($scope, $http) { $scope.emailsAccounts = false; $scope.records = JSON.parse(response.data.data); $scope.mailConfigured = response.data.mailConfigured; + $scope.serverHostname = response.data.serverHostname; new PNotify({ title: 'Success!', diff --git a/mailServer/templates/mailServer/listEmails.html b/mailServer/templates/mailServer/listEmails.html index 4ed7781ff..00abe9f6b 100755 --- a/mailServer/templates/mailServer/listEmails.html +++ b/mailServer/templates/mailServer/listEmails.html @@ -65,7 +65,81 @@ -
+
+ +

{% trans "Details To Configure Mail Clients" %}

+ + + + + + + + + + + + + + + + + + + + + + +
{% trans "POP3" %}{% trans "Details" %}
{% trans "Server Hostname" %}{$ serverHostname $}
{% trans "Port" %}110
{% trans "SSL" %}STARTTLS
+ + + + + + + + + + + + + + + + + + + + + + +
{% trans "IMAP" %}{% trans "Details" %}
{% trans "Server Hostname" %}{$ serverHostname $}
{% trans "Port" %}143
{% trans "SSL" %}STARTTLS
+ + + + + + + + + + + + + + + + + + + + + + +
{% trans "SMTP" %}{% trans "Details" %}
{% trans "Server Hostname" %}{$ serverHostname $}
{% trans "Port" %}587
{% trans "SSL" %}STARTTLS
+
+ +
diff --git a/static/mailServer/mailServer.js b/static/mailServer/mailServer.js index c33087815..f46bb4d4a 100644 --- a/static/mailServer/mailServer.js +++ b/static/mailServer/mailServer.js @@ -1153,6 +1153,7 @@ app.controller('listEmails', function ($scope, $http) { $scope.emailsAccounts = false; $scope.records = JSON.parse(response.data.data); $scope.mailConfigured = response.data.mailConfigured; + $scope.serverHostname = response.data.serverHostname; new PNotify({ title: 'Success!',