-
-
{% trans "Details To Configure Mail Clients" %}
-
-
-
-
- {% trans "POP3" %}
- {% trans "Details" %}
-
-
-
-
- {% trans "Server Hostname" %}
- {$ serverHostname $}
-
-
- {% trans "Port" %}
- 110
-
-
- {% trans "Port" %}
- 995 (SSL)
-
-
- {% trans "SSL" %}
- STARTTLS
-
-
-
-
-
-
-
- {% trans "IMAP" %}
- {% trans "Details" %}
-
-
-
-
- {% trans "Server Hostname" %}
- {$ serverHostname $}
-
-
- {% trans "Port" %}
- 143
-
-
- {% trans "Port" %}
- 993 (SSL)
-
-
- {% trans "SSL" %}
- STARTTLS
-
-
-
-
-
-
-
- {% trans "SMTP" %}
- {% trans "Details" %}
-
-
-
-
- {% trans "Server Hostname" %}
- {$ serverHostname $}
-
-
- {% trans "Port" %}
- 25
-
-
- {% trans "Port" %}
- 587 (SSL)
-
-
- {% trans "Port" %}
- 465 (SSL)
-
-
- {% trans "SSL" %}
- STARTTLS
-
-
-
+
+
Details To Configure Mail Clients
+
+
+
+
+
+
+
+ POP3
+
+
+ Details
+
+
+
+
+
+
+ Server Hostname
+
+
+ {$ serverHostname $}
+
+
+
+
+ Port
+
+
+ 110
+
+
+
+
+ Port
+
+
+ 995 (SSL)
+
+
+
+
+ SSL
+
+
+ STARTTLS
+
+
+
+
+
+
+
+
+
+
+ IMAP
+
+
+ Details
+
+
+
+
+
+
+ Server Hostname
+
+
+ {$ serverHostname $}
+
+
+
+
+ Port
+
+
+ 143
+
+
+
+
+ Port
+
+
+ 993 (SSL)
+
+
+
+
+ SSL
+
+
+ STARTTLS
+
+
+
+
+
+
+
+
+
+
+ SMTP
+
+
+ Details
+
+
+
+
+
+
+ Server Hostname
+
+
+ {$ serverHostname $}
+
+
+
+
+ Port
+
+
+ 25
+
+
+
+
+ Port
+
+
+ 587 (SSL)
+
+
+
+
+ 465 (SSL)
+
+
+ STARTTLS
+
+
+
+
+
-
+
+
+
+
+
+
+ Emails
+
+
+ Disk Usage
+
+
+ Actions
+
+
+
+
+
+
+
+
+
+
+ Change Password
+
+ Delete
+
+
+
+
+
+
+
{% endif %}
diff --git a/mailServer/urls.py b/mailServer/urls.py
index 0f10fb752..7eff79e1f 100755
--- a/mailServer/urls.py
+++ b/mailServer/urls.py
@@ -10,33 +10,33 @@ urlpatterns = [
url(r'^submitEmailCreation', views.submitEmailCreation, name='submitEmailCreation'),
url(r'^fetchEmails$', views.fetchEmails, name='fetchEmails'),
-
## Mail Forwardings
url(r'^emailForwarding$', views.emailForwarding, name='emailForwarding'),
+ url(r'^V2/emailForwardingV2$', views.emailForwardingV2, name='emailForwardingV2'),
url(r'^submitEmailForwardingCreation$', views.submitEmailForwardingCreation, name='submitEmailForwardingCreation'),
url(r'^fetchCurrentForwardings$', views.fetchCurrentForwardings, name='fetchCurrentForwardings'),
url(r'^submitForwardDeletion$', views.submitForwardDeletion, name='submitForwardDeletion'),
-
## Delete email
url(r'^deleteEmailAccount', views.deleteEmailAccount, name='deleteEmailAccount'),
+ url(r'^V2/deleteEmailAccountV2', views.deleteEmailAccountV2, name='deleteEmailAccountV2'),
url(r'^getEmailsForDomain$', views.getEmailsForDomain, name='getEmailsForDomain'),
url(r'^submitEmailDeletion', views.submitEmailDeletion, name='submitEmailDeletion'),
url(r'^fixMailSSL', views.fixMailSSL, name='fixMailSSL'),
-
## Change email password
url(r'^changeEmailAccountPassword', views.changeEmailAccountPassword, name='changeEmailAccountPassword'),
+ url(r'^V2/changeEmailAccountPasswordV2', views.changeEmailAccountPasswordV2, name='changeEmailAccountPasswordV2'),
url(r'^submitPasswordChange', views.submitPasswordChange, name='submitPasswordChange'),
## DKIM Manager
url(r'^dkimManager', views.dkimManager, name='dkimManager'),
+ url(r'^V2/dkimManagerV2', views.dkimManagerV2, name='dkimManagerV2'),
url(r'^fetchDKIMKeys', views.fetchDKIMKeys, name='fetchDKIMKeys'),
url(r'^generateDKIMKeys$', views.generateDKIMKeys, name='generateDKIMKeys'),
url(r'^installOpenDKIM', views.installOpenDKIM, name='installOpenDKIM'),
url(r'^installStatusOpenDKIM', views.installStatusOpenDKIM, name='installStatusOpenDKIM'),
-
-]
\ No newline at end of file
+]
diff --git a/mailServer/views.py b/mailServer/views.py
index 31fe7670e..99f7bdbd4 100755
--- a/mailServer/views.py
+++ b/mailServer/views.py
@@ -84,6 +84,14 @@ def deleteEmailAccount(request):
return redirect(loadLoginPage)
+def deleteEmailAccountV2(request):
+ try:
+ msM = MailServerManager(request)
+ return msM.deleteEmailAccountV2()
+ except KeyError:
+ return redirect(loadLoginPage)
+
+
def getEmailsForDomain(request):
try:
msM = MailServerManager(request)
@@ -136,6 +144,14 @@ def emailForwarding(request):
return redirect(loadLoginPage)
+def emailForwardingV2(request):
+ try:
+ msM = MailServerManager(request)
+ return msM.emailForwardingV2()
+ except KeyError:
+ return redirect(loadLoginPage)
+
+
def fetchCurrentForwardings(request):
try:
msM = MailServerManager(request)
@@ -198,6 +214,14 @@ def changeEmailAccountPassword(request):
return redirect(loadLoginPage)
+def changeEmailAccountPasswordV2(request):
+ try:
+ msM = MailServerManager(request)
+ return msM.changeEmailAccountPasswordV2()
+ except KeyError:
+ return redirect(loadLoginPage)
+
+
def submitPasswordChange(request):
try:
@@ -229,6 +253,14 @@ def dkimManager(request):
return redirect(loadLoginPage)
+def dkimManagerV2(request):
+ try:
+ msM = MailServerManager(request)
+ return msM.dkimManagerV2()
+ except KeyError:
+ return redirect(loadLoginPage)
+
+
def fetchDKIMKeys(request):
try:
msM = MailServerManager(request)
diff --git a/upgrade.sh b/upgrade.sh
index 2424f55b8..b387b67c7 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -15,4 +15,4 @@ find /usr/local/CyberCP -type f -exec chmod 0644 {} \;
chmod -R 755 /usr/local/CyberCP/bin
chown -R root:root /usr/local/CyberCP
chown -R lscpd:lscpd /usr/local/CyberCP/public/phpmyadmin/tmp
-systemctl restart lscpd
+systemctl restart lscpd
\ No newline at end of file
+ 
+