From 6f7dd8e3fc30a5960d6bca5ca1594352f3af0035 Mon Sep 17 00:00:00 2001
From: usmannasir <01-134132-158@student.bahria.edu.pk>
Date: Mon, 23 Jul 2018 02:09:33 +0500
Subject: [PATCH] Enable/Disable PowerDNS Service

---
 CyberCP/settings.py                           |    3 +-
 CyberCP/settings.pyc                          |  Bin 3893 -> 3917 bytes
 CyberCP/urls.py                               |    1 +
 .../templates/baseTemplate/index.html         |    1 +
 dns/templates/dns/addDeleteDNSRecords.html    |   16 +
 dns/templates/dns/createDNSZone.html          |   13 +
 dns/templates/dns/createNameServer.html       |   14 +
 dns/templates/dns/deleteDNSZone.html          |   15 +
 dns/views.py                                  |   29 +-
 emailPremium/views.py                         |    1 -
 filemanager/templates/filemanager/index.html  |    2 +-
 mailServer/models.pyc                         |  Bin 2497 -> 2497 bytes
 managePHP/urls.py                             |   12 -
 managePHP/views.py                            |    2 -
 manageServices/__init__.py                    |    0
 manageServices/__init__.pyc                   |  Bin 0 -> 151 bytes
 manageServices/admin.py                       |    6 +
 manageServices/admin.pyc                      |  Bin 0 -> 272 bytes
 manageServices/apps.py                        |    8 +
 manageServices/migrations/__init__.py         |    0
 manageServices/models.py                      |    6 +
 manageServices/models.pyc                     |  Bin 0 -> 269 bytes
 .../static/manageServices/manageServices.js   | 1094 +++++++++++++++++
 .../manageServices/managePostfix.html         |   81 ++
 .../manageServices/managePowerDNS.html        |   91 ++
 manageServices/tests.py                       |    6 +
 manageServices/urls.py                        |    8 +
 manageServices/views.py                       |  125 ++
 plogical/remoteBackup.py                      |    1 +
 plogical/sslUtilities.py                      |   22 +-
 plogical/upgrade.py                           |   27 +
 static/manageServices/manageServices.js       | 1094 +++++++++++++++++
 static/serverStatus/serverStatus.js           |   26 +-
 .../templates/websiteFunctions/website.html   |    2 +-
 websiteFunctions/views.py                     |    3 +-
 35 files changed, 2660 insertions(+), 49 deletions(-)
 create mode 100644 manageServices/__init__.py
 create mode 100644 manageServices/__init__.pyc
 create mode 100644 manageServices/admin.py
 create mode 100644 manageServices/admin.pyc
 create mode 100644 manageServices/apps.py
 create mode 100644 manageServices/migrations/__init__.py
 create mode 100644 manageServices/models.py
 create mode 100644 manageServices/models.pyc
 create mode 100644 manageServices/static/manageServices/manageServices.js
 create mode 100644 manageServices/templates/manageServices/managePostfix.html
 create mode 100644 manageServices/templates/manageServices/managePowerDNS.html
 create mode 100644 manageServices/tests.py
 create mode 100644 manageServices/urls.py
 create mode 100644 manageServices/views.py
 create mode 100644 static/manageServices/manageServices.js

diff --git a/CyberCP/settings.py b/CyberCP/settings.py
index ba653da73..2633710c7 100644
--- a/CyberCP/settings.py
+++ b/CyberCP/settings.py
@@ -58,7 +58,8 @@ INSTALLED_APPS = [
     'manageSSL',
     'api',
     'filemanager',
-    'emailPremium'
+    'emailPremium',
+    'manageServices'
 ]
 
 MIDDLEWARE = [
diff --git a/CyberCP/settings.pyc b/CyberCP/settings.pyc
index 3e0c0bc0cdd237e8b4d5e8d84da8fb23cdde9a90..20fea15aaa38d8bf3a645094ca4160f57ffe360d 100644
GIT binary patch
delta 576
zcmY+C$!^n76o!90v<i_(3t>#uq!0)x^UxX!lqO9X!qk?8>4qW0?^uom3xc|+kg~`V
zpgahRs6y#GblaC;$qR7qbzFoc>p!25Ki_k0Z>M+DsmPy0vF5L8t%dQClq|^E9sNlC
z>@fo`2^9xt!PDRwFbkdq&w)AcJiI8>6qtvahJOH@124dFEp#T(ISlt8coBUYo&{c#
z#u4x`9AD@Pcon<`UWX^*4LH0BNA6Pza31O?e7gsK5?lZs>D~fw2eBw|2fQnB4_uPC
z4=zg-<kA0xVj!%5S||m=Y9Kragokj{G4PR|PaTJz>#?zPRYp#)sLLn&7oVC+CRQiF
zXHX}>=Y!u?w)aABQ_X;DP-*=42G(_}Eh}WS;>vC}(6`XG!IuUrAyy5(3h}kUHzB??
z_%1|cuohq$d~f(e*#2nnQ;2ngjS!m#TVrg;pyUhNsN^}^vrCc0x48TSpBrBqo?CIh
XZu%{^J3KX6k6Jr}t$1-TihutLYN~T2

delta 553
zcmY+B$xZ@66h&`0N{~dH2SUUF2OM#1#Sz3AXB-O$ln0$=>&^`een7*AxF8yT!G(#5
zD}Ta`Kj7<X+Qd#O_nmrmt8P`l`=9+j$4|BU<1L&_qx^YUBRuY29(_-F-3#FXwSzi9
zouDpI0MrfY0rf(6LDYcyAZlS$fP$cYXc+~$O62O0sR9k4ph8zbgWRYG4M8)QhCw5s
z5NH%S8^@s0I5b`-8bA{ejWARg&OB%mG{s#FG;PTYOBgiEG6$MxSpY4vEb-RPKSRVa
zL_wxu*)qf|!-{2Cg(jLnYi2&t3^UidbeYwLSp{U+&A-VlS#e^~0*XVlg0_p_N+7>u
zUQ@Jzb|L)u_X2xnE6XSFBgT>8+wP;FAgh87Bp%wBka%R{vBVP_PbHq&crH;`$O)5@
vFYNZE#48)GC8lh=k$79itQ&%VuZl!4UHVdEj#9{(aw)IH2T!#4>AC*}2oG$s

diff --git a/CyberCP/urls.py b/CyberCP/urls.py
index f69178e01..3780c7b72 100644
--- a/CyberCP/urls.py
+++ b/CyberCP/urls.py
@@ -36,4 +36,5 @@ urlpatterns = [
     url(r'^api/',include('api.urls')),
     url(r'^filemanager/',include('filemanager.urls')),
     url(r'^emailPremium/',include('emailPremium.urls')),
+    url(r'^manageservices/',include('manageServices.urls')),
 ]
diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index 8ea3f9d40..426a8ba27 100755
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -642,6 +642,7 @@
 <script src="{% static 'baseTemplate/bootstrap-toggle.min.js' %}"></script>
 <script src="{% static 'firewall/firewall.js' %}"></script>
 <script src="{% static 'manageSSL/manageSSL.js' %}"></script>
+<script src="{% static 'manageServices/manageServices.js' %}"></script>
 </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/dns/templates/dns/addDeleteDNSRecords.html b/dns/templates/dns/addDeleteDNSRecords.html
index 077e1eb08..42b97a57e 100644
--- a/dns/templates/dns/addDeleteDNSRecords.html
+++ b/dns/templates/dns/addDeleteDNSRecords.html
@@ -21,6 +21,20 @@
         <div  class="example-box-wrapper">
 
 
+        {% if not status %}
+
+            <div class="col-md-12 text-center" style="margin-bottom: 2%;">
+                <h3>{% trans "PowerDNS is disabled." %}
+                    <a href="{% url 'managePowerDNS' %}"><button class="btn btn-alt btn-hover btn-blue-alt">
+                        <span>{% trans "Enable Now" %}</span>
+                        <i class="glyph-icon icon-arrow-right"></i>
+                    </button></a></h3>
+            </div>
+
+
+        {% else %}
+
+
             <form action="/" class="form-horizontal bordered-row">
 
 
@@ -359,6 +373,8 @@
 
             </form>
 
+        {% endif %}
+
 
 
 
diff --git a/dns/templates/dns/createDNSZone.html b/dns/templates/dns/createDNSZone.html
index d575d2f9d..38b2264ed 100644
--- a/dns/templates/dns/createDNSZone.html
+++ b/dns/templates/dns/createDNSZone.html
@@ -19,6 +19,17 @@
         </h3>
         <div class="example-box-wrapper">
 
+        {% if not status %}
+            <div class="col-md-12 text-center" style="margin-bottom: 2%;">
+                <h3>{% trans "PowerDNS is disabled." %}
+                    <a href="{% url 'managePowerDNS' %}"><button class="btn btn-alt btn-hover btn-blue-alt">
+                        <span>{% trans "Enable Now" %}</span>
+                        <i class="glyph-icon icon-arrow-right"></i>
+                    </button></a></h3>
+            </div>
+
+
+        {% else %}
 
             <form  action="/" class="form-horizontal bordered-row">
 
@@ -70,6 +81,8 @@
 
             </form>
 
+        {% endif %}
+
 
 
 
diff --git a/dns/templates/dns/createNameServer.html b/dns/templates/dns/createNameServer.html
index cb6736c18..ff22dfe6c 100644
--- a/dns/templates/dns/createNameServer.html
+++ b/dns/templates/dns/createNameServer.html
@@ -19,6 +19,17 @@
         </h3>
         <div class="example-box-wrapper">
 
+        {% if not status %}
+            <div class="col-md-12 text-center" style="margin-bottom: 2%;">
+                <h3>{% trans "PowerDNS is disabled." %}
+                    <a href="{% url 'managePowerDNS' %}"><button class="btn btn-alt btn-hover btn-blue-alt">
+                        <span>{% trans "Enable Now" %}</span>
+                        <i class="glyph-icon icon-arrow-right"></i>
+                    </button></a></h3>
+            </div>
+
+
+        {% else %}
 
             <form  action="/" class="form-horizontal bordered-row">
 
@@ -111,6 +122,9 @@
             </form>
 
 
+        {% endif %}
+
+
 
 
         </div>
diff --git a/dns/templates/dns/deleteDNSZone.html b/dns/templates/dns/deleteDNSZone.html
index 4a90613db..dc5c96df6 100644
--- a/dns/templates/dns/deleteDNSZone.html
+++ b/dns/templates/dns/deleteDNSZone.html
@@ -20,6 +20,19 @@
         <div ng-controller="deleteDNSZone" class="example-box-wrapper">
 
 
+        {% if not status %}
+            <div class="col-md-12 text-center" style="margin-bottom: 2%;">
+                <h3>{% trans "PowerDNS is disabled." %}
+                    <a href="{% url 'managePowerDNS' %}"><button class="btn btn-alt btn-hover btn-blue-alt">
+                        <span>{% trans "Enable Now" %}</span>
+                        <i class="glyph-icon icon-arrow-right"></i>
+                    </button></a></h3>
+            </div>
+
+
+        {% else %}
+
+
             <form  action="/" class="form-horizontal bordered-row">
 
 
@@ -75,6 +88,8 @@
 
             </form>
 
+        {% endif %}
+
 
 
 
diff --git a/dns/views.py b/dns/views.py
index 82cfa6d46..bda158ccd 100644
--- a/dns/views.py
+++ b/dns/views.py
@@ -11,6 +11,7 @@ from loginSystem.views import loadLoginPage
 from models import Domains,Records
 from re import match,I,M
 from websiteFunctions.models import Websites
+from plogical.mailUtilities import mailUtilities
 
 # Create your views here.
 
@@ -31,7 +32,15 @@ def createNameserver(request):
         if admin.type == 3:
             return HttpResponse("You don't have enough priviliges to access this page.")
 
-        return render(request,"dns/createNameServer.html")
+        mailUtilities.checkHome()
+
+        if os.path.exists('/home/cyberpanel/powerdns'):
+            return render(request, "dns/createNameServer.html", {"status": 1})
+        else:
+            return render(request, "dns/createNameServer.html", {"status": 0})
+
+
+
     except KeyError:
         return redirect(loadLoginPage)
 
@@ -202,7 +211,12 @@ def createDNSZone(request):
     try:
         userID = request.session['userID']
         admin = Administrator.objects.get(pk=userID)
-        return render(request,'dns/createDNSZone.html')
+
+        if os.path.exists('/home/cyberpanel/powerdns'):
+            return render(request,'dns/createDNSZone.html', {"status": 1})
+        else:
+            return render(request,'dns/createDNSZone.html', {"status": 0})
+
     except KeyError:
         return redirect(loadLoginPage)
 
@@ -261,6 +275,9 @@ def addDeleteDNSRecords(request):
         admin = Administrator.objects.get(pk=val)
         domainsList = []
 
+        if not os.path.exists('/home/cyberpanel/powerdns'):
+            return render(request,'dns/addDeleteDNSRecords.html', {"status": 0})
+
         if admin.type == 1:
             domains = Domains.objects.all()
             for items in domains:
@@ -276,7 +293,7 @@ def addDeleteDNSRecords(request):
                     pass
 
 
-        return render(request, 'dns/addDeleteDNSRecords.html',{"domainsList":domainsList})
+        return render(request, 'dns/addDeleteDNSRecords.html',{"domainsList":domainsList, "status": 1})
 
     except KeyError:
         return redirect(loadLoginPage)
@@ -571,6 +588,10 @@ def deleteDNSZone(request):
         admin = Administrator.objects.get(pk=val)
         domainsList = []
 
+
+        if not os.path.exists('/home/cyberpanel/powerdns'):
+            return render(request,'dns/deleteDNSZone.html', {"status": 0})
+
         if admin.type == 1:
             domains = Domains.objects.all()
             for items in domains:
@@ -586,7 +607,7 @@ def deleteDNSZone(request):
                     pass
 
 
-        return render(request, 'dns/deleteDNSZone.html',{"domainsList":domainsList})
+        return render(request, 'dns/deleteDNSZone.html',{"domainsList":domainsList, "status": 1})
 
     except KeyError:
         return redirect(loadLoginPage)
diff --git a/emailPremium/views.py b/emailPremium/views.py
index 5dc7a9ee8..647c2cab4 100644
--- a/emailPremium/views.py
+++ b/emailPremium/views.py
@@ -933,7 +933,6 @@ def emailPolicyServer(request):
     except KeyError:
         return redirect(loadLoginPage)
 
-
 def fetchPolicyServerStatus(request):
     try:
         val = request.session['userID']
diff --git a/filemanager/templates/filemanager/index.html b/filemanager/templates/filemanager/index.html
index faa9b4f30..0093e2bcc 100644
--- a/filemanager/templates/filemanager/index.html
+++ b/filemanager/templates/filemanager/index.html
@@ -180,7 +180,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div id="uploadBoxLabel" class="modal-header">
-                <h5 class="modal-title" >{% trans "Upload File" %}</h5>
+                <h5 class="modal-title" >{% trans "Upload File" %} - <a  target="_blank" href="https://go.cyberpanel.net/upload-limits" title="">{% trans "Upload Limits" %}</a></h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
diff --git a/mailServer/models.pyc b/mailServer/models.pyc
index 7875f6c2791d7d0518a188b77d9b6903d228f650..865b9fc01a883f9d93db4ea192a599d40c7b5b96 100644
GIT binary patch
delta 16
XcmX>od{CI3`7<w9g1z5H_FbF+EpP=T

delta 16
XcmX>od{CI3`7<w<REpk4_FbF+E5rok

diff --git a/managePHP/urls.py b/managePHP/urls.py
index 500f0347c..28360c444 100644
--- a/managePHP/urls.py
+++ b/managePHP/urls.py
@@ -4,25 +4,13 @@ import views
 urlpatterns = [
     url(r'^$', views.loadPHPHome, name='loadPHPHome'),
     url(r'^installExtensions', views.installExtensions, name='installExtensions'),
-
-
     url(r'^getExtensionsInformation', views.getExtensionsInformation, name='getExtensionsInformation'),
-
     url(r'^submitExtensionRequest', views.submitExtensionRequest, name='submitExtensionRequest'),
-
     url(r'^getRequestStatus', views.getRequestStatus, name='getRequestStatus'),
-
-
     url(r'^editPHPConfigs', views.editPHPConfigs, name='editPHPConfigs'),
-
-
     url(r'^getCurrentPHPConfig', views.getCurrentPHPConfig, name='getCurrentPHPConfig'),
-
     url(r'^savePHPConfigBasic', views.savePHPConfigBasic, name='savePHPConfigBasic'),
-
-
     url(r'^getCurrentAdvancedPHPConfig', views.getCurrentAdvancedPHPConfig, name='getCurrentAdvancedPHPConfig'),
-
     url(r'^savePHPConfigAdvance', views.savePHPConfigAdvance, name='savePHPConfigAdvance'),
 
 
diff --git a/managePHP/views.py b/managePHP/views.py
index 02d74a294..603236558 100644
--- a/managePHP/views.py
+++ b/managePHP/views.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 import sys
 reload(sys)
 sys.setdefaultencoding("utf-8")
-
 from django.shortcuts import render,redirect
 from loginSystem.views import loadLoginPage
 from .models import PHP,installedPackages
@@ -14,7 +13,6 @@ import os
 from plogical.installUtilities import installUtilities
 from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
 import re
-import subprocess
 from loginSystem.models import Administrator
 from plogical.virtualHostUtilities import virtualHostUtilities
 import subprocess
diff --git a/manageServices/__init__.py b/manageServices/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/manageServices/__init__.pyc b/manageServices/__init__.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..37f0e6b36cbe851e2ad190649f976e91cc192596
GIT binary patch
literal 151
zcmZSn%**v|TS#;=0~9a<X$K%KW&si@3=F{<AQ3+eAi;n}6gvRL^fU5vQ}s)Wa})FQ
zohy@4ivkk!QgZ@|Qgbs)b0H$m0s27M#PrnQ)S|M?<kVvQ`1s7c%#!$cy@JXT4xk}6
Rx%nxjIjMFatBQe`0RZB+BNPAt

literal 0
HcmV?d00001

diff --git a/manageServices/admin.py b/manageServices/admin.py
new file mode 100644
index 000000000..13be29d96
--- /dev/null
+++ b/manageServices/admin.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.contrib import admin
+
+# Register your models here.
diff --git a/manageServices/admin.pyc b/manageServices/admin.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5ff83525805235ad7774fba7c652a5a800260ebc
GIT binary patch
literal 272
zcmYL^%W6U~5QZl?6-21`5H8NjynvO0dpW2pU4(ct)s$RHE(Kq#kJXJ2pc54whClP=
zpUjZv@;>_i+wOaK2B-5AIHV~Rnv#J9a13?~SY-~DgKJ>d5I3-C->A`CDOyHVo{$u8
z`k+x-lQAlr9?pOqrJeDs`<px>mh!9Q5>d)E5#%w6{#O1NW_|EEn!~zIZL9f`^g$?2
z!J#P0DKD1i1IA8yv|U7JihJBFJ3+2G;s)cd=`o4>{@Kqt4{5^O1zjvI>Yr1U3BLi)
C3_s!k

literal 0
HcmV?d00001

diff --git a/manageServices/apps.py b/manageServices/apps.py
new file mode 100644
index 000000000..5009166ee
--- /dev/null
+++ b/manageServices/apps.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class ManageservicesConfig(AppConfig):
+    name = 'manageServices'
diff --git a/manageServices/migrations/__init__.py b/manageServices/migrations/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/manageServices/models.py b/manageServices/models.py
new file mode 100644
index 000000000..1dfab7604
--- /dev/null
+++ b/manageServices/models.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models
+
+# Create your models here.
diff --git a/manageServices/models.pyc b/manageServices/models.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..cc2ab716ead3028144f886440f797dc6d0214199
GIT binary patch
literal 269
zcmYL^&1wQM6oqdxMXXTpA-b5Ad4VE=dl}S~E<&8SwUJ~-@>B4|`dDuI0PRVq;3b^g
z@0{d@RNpVN``7;1(tk<pE0Ppn(R5gX9FZ4v5F`pqa*}*ShYDQLu71Kn`-7?lx-^I6
z-nK)>+S$axxHu*gBp$Ylo4-qG21D!joN{2Tw;)Q-knUpo^RVbn+cL2({zKvts6GbI
zDo1a6wZ5G=G^S_Q1ok%j(OEYNsX6nG!>4UIs`2f`^_Hd>@dnI}m*vB;$Xxyc*}^`m

literal 0
HcmV?d00001

diff --git a/manageServices/static/manageServices/manageServices.js b/manageServices/static/manageServices/manageServices.js
new file mode 100644
index 000000000..cc0a255fa
--- /dev/null
+++ b/manageServices/static/manageServices/manageServices.js
@@ -0,0 +1,1094 @@
+/**
+ * Created by usman on 6/22/18.
+ */
+
+/* Java script code to list accounts */
+
+app.controller('listDomains', function($scope,$http) {
+
+    $scope.listFail = true;
+    $scope.emailLimitsLoading = true;
+
+    // Global page number, to be used in later function to refresh the domains
+    var globalPageNumber;
+
+
+    $scope.getFurtherWebsitesFromDB = function(pageNumber) {
+
+        globalPageNumber = pageNumber;
+        $scope.emailLimitsLoading = false;
+
+        url = "/emailPremium/getFurtherDomains";
+
+        var data = {page: pageNumber};
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.listWebSiteStatus === 1) {
+
+            $scope.WebSitesList = JSON.parse(response.data.data);
+            $scope.listFail = true;
+        }
+        else
+        {
+            $scope.listFail = false;
+            $scope.errorMessage = response.data.error_message;
+
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+    }
+
+
+        };
+    $scope.getFurtherWebsitesFromDB(1);
+
+    $scope.enableDisableEmailLimits = function (operationVal, domainName) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableEmailLimits";
+
+        var data = {
+            operationVal: operationVal,
+            domainName: domainName
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $scope.getFurtherWebsitesFromDB(globalPageNumber);
+            $scope.listFail = true;
+        }
+        else
+        {
+            $scope.listFail = false;
+            $scope.errorMessage = response.data.error_message;
+
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+    }
+    }
+});
+
+/* Java script code to list accounts ends here */
+
+
+
+/* Java script code for email domain page */
+
+app.controller('emailDomainPage', function($scope,$http, $timeout, $window) {
+
+    $scope.listFail = true;
+    $scope.emailLimitsLoading = true;
+
+    var globalDomainName = window.location.pathname.split("/")[2];
+
+    // Global page number, to be used in later function to refresh the domains
+    var globalPageNumber;
+
+
+    $scope.getFurtherEmailsFromDB = function(pageNumber) {
+
+        globalPageNumber = pageNumber;
+        $scope.emailLimitsLoading = false;
+
+        url = "/emailPremium/getFurtherEmail";
+
+        var data = {
+            page: pageNumber,
+            domainName: globalDomainName
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $scope.emailList = JSON.parse(response.data.data);
+            $scope.listFail = true;
+        }
+        else
+        {
+            $scope.listFail = false;
+            $scope.errorMessage = response.data.error_message;
+
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+    }
+
+
+        };
+    $scope.getFurtherEmailsFromDB(1);
+
+    $scope.enableDisableEmailLimits = function (operationVal, domainName) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableEmailLimits";
+
+        var data = {
+            operationVal: operationVal,
+            domainName: domainName
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $timeout(function() {  $window.location.reload(); }, 0);
+        }
+        else
+        {
+            $timeout(function() {  $window.location.reload(); }, 0);
+        }
+    }
+        function cantLoadInitialData(response) {
+            $timeout(function() {  $window.location.reload(); }, 0);
+    }
+    };
+
+
+    /// Email limits
+
+    $scope.changeLimitsForm = true;
+    $scope.changeLimitsFail = true;
+    $scope.changeLimitsSuccess = true;
+    $scope.couldNotConnect = true;
+
+    $scope.showLimitsForm = function () {
+        $scope.changeLimitsForm = false;
+    };
+
+    $scope.hideLimitsForm = function () {
+        $scope.changeLimitsForm = true;
+        $scope.changeLimitsFail = true;
+        $scope.changeLimitsSuccess = true;
+        $scope.couldNotConnect = true;
+    };
+
+    $scope.changeDomainEmailLimits = function (domainName) {
+            $scope.emailLimitsLoading = false;
+
+            url = "/emailPremium/changeDomainLimit";
+
+            var data = {
+                domainName: domainName,
+                newLimit: $scope.monthlyLimit
+            };
+
+            var config = {
+                headers : {
+                    'X-CSRFToken': getCookie('csrftoken')
+                }
+            };
+
+            $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+            function ListInitialData(response) {
+
+                $scope.emailLimitsLoading = true;
+
+
+            if (response.data.status === 1) {
+
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = true;
+                $scope.changeLimitsSuccess = false;
+                $scope.couldNotConnect = true;
+                $timeout(function() {  $window.location.reload(); }, 3000);
+            }
+            else
+            {
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = false;
+                $scope.changeLimitsSuccess = true;
+                $scope.couldNotConnect = true;
+                $scope.errorMessage = response.data.error_message;
+
+            }
+        }
+            function cantLoadInitialData(response) {
+                $scope.emailLimitsLoading = true;
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = true;
+                $scope.changeLimitsSuccess = true;
+                $scope.couldNotConnect = false;
+        }
+    }
+
+
+    $scope.enableDisableIndividualEmailLimits = function (operationVal, emailAddress) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableIndividualEmailLimits";
+
+        var data = {
+            operationVal: operationVal,
+            emailAddress: emailAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+            $scope.getFurtherEmailsFromDB(1);
+        }
+        else
+        {
+            $scope.getFurtherEmailsFromDB(1);
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.getFurtherEmailsFromDB(1);
+    }
+    };
+
+});
+
+/* Java script code for email domain page */
+
+
+/* Java script code for Email Page */
+
+app.controller('emailPage', function($scope,$http, $timeout, $window) {
+
+    $scope.emailLimitsLoading = true;
+
+    var globalEamilAddress = $("#emailAddress").text();
+
+    // Global page number, to be used in later function to refresh the domains
+    var globalPageNumber;
+
+    $scope.getEmailStats = function() {
+
+        $scope.emailLimitsLoading = false;
+
+        ////
+
+        $scope.limitsOn = true;
+        $scope.limitsOff = true;
+
+        url = "/emailPremium/getEmailStats";
+
+        var data = {
+            emailAddress: globalEamilAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $scope.monthlyLimit = response.data.monthlyLimit;
+            $scope.monthlyUsed = response.data.monthlyUsed;
+            $scope.hourlyLimit = response.data.hourlyLimit;
+            $scope.hourlyUsed = response.data.hourlyUsed;
+
+            if(response.data.limitStatus === 1){
+                $scope.limitsOn = false;
+                $scope.limitsOff = true;
+            }else{
+                $scope.limitsOn = true;
+                $scope.limitsOff = false;
+            }
+
+            if(response.data.logsStatus === 1){
+                $scope.loggingOn = false;
+                $scope.loggingOff = true;
+            }else{
+                $scope.loggingOn = true;
+                $scope.loggingOff = false;
+            }
+
+        }
+        else
+        {
+
+            $scope.errorMessage = response.data.error_message;
+
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+    }
+
+
+        };
+    $scope.getEmailStats();
+
+    $scope.enableDisableIndividualEmailLimits = function (operationVal, emailAddress) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableIndividualEmailLimits";
+
+        var data = {
+            operationVal: operationVal,
+            emailAddress: emailAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+            if (response.data.status === 1) {
+                $scope.getEmailStats();
+            }
+            else
+            {
+                $scope.getEmailStats();
+            }
+    }
+        function cantLoadInitialData(response) {
+            $scope.getEmailStats();
+    }
+    };
+    $scope.enableDisableIndividualEmailLogs = function (operationVal, emailAddress) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableIndividualEmailLogs";
+
+        var data = {
+            operationVal: operationVal,
+            emailAddress: emailAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+            if (response.data.status === 1) {
+                $scope.getEmailStats();
+            }
+            else
+            {
+                $scope.getEmailStats();
+            }
+    }
+        function cantLoadInitialData(response) {
+            $scope.getEmailStats();
+    }
+    };
+
+
+    $scope.enableDisableEmailLimits = function (operationVal, domainName) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableEmailLimits";
+
+        var data = {
+            operationVal: operationVal,
+            domainName: domainName
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $timeout(function() {  $window.location.reload(); }, 0);
+        }
+        else
+        {
+            $timeout(function() {  $window.location.reload(); }, 0);
+        }
+    }
+        function cantLoadInitialData(response) {
+            $timeout(function() {  $window.location.reload(); }, 0);
+    }
+    };
+
+
+    /// Email limits
+    $scope.changeLimitsForm = true;
+    $scope.changeLimitsFail = true;
+    $scope.changeLimitsSuccess = true;
+    $scope.couldNotConnect = true;
+
+    $scope.showLimitsForm = function () {
+        $scope.changeLimitsForm = false;
+    };
+
+    $scope.hideLimitsForm = function () {
+        $scope.changeLimitsForm = true;
+        $scope.changeLimitsFail = true;
+        $scope.changeLimitsSuccess = true;
+        $scope.couldNotConnect = true;
+    };
+
+    $scope.changeDomainEmailLimitsIndividual = function () {
+            $scope.emailLimitsLoading = false;
+
+            url = "/emailPremium/changeDomainEmailLimitsIndividual";
+
+            var data = {
+                emailAddress: globalEamilAddress,
+                monthlyLimit: $scope.monthlyLimitForm,
+                hourlyLimit: $scope.hourlyLimitForm
+            };
+
+            var config = {
+                headers : {
+                    'X-CSRFToken': getCookie('csrftoken')
+                }
+            };
+
+            $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+            function ListInitialData(response) {
+
+                $scope.emailLimitsLoading = true;
+
+
+            if (response.data.status === 1) {
+
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = true;
+                $scope.changeLimitsSuccess = false;
+                $scope.couldNotConnect = true;
+                $scope.getEmailStats();
+
+            }
+            else
+            {
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = false;
+                $scope.changeLimitsSuccess = true;
+                $scope.couldNotConnect = true;
+                $scope.errorMessage = response.data.error_message;
+
+            }
+        }
+            function cantLoadInitialData(response) {
+                $scope.emailLimitsLoading = true;
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = true;
+                $scope.changeLimitsSuccess = true;
+                $scope.couldNotConnect = false;
+        }
+    };
+
+    /// Get email logs
+
+    $scope.getLogEntries = function(pageNumber) {
+
+        globalPageNumber = pageNumber;
+        $scope.emailLimitsLoading = false;
+
+        url = "/emailPremium/getEmailLogs";
+
+        var data = {
+            page: pageNumber,
+            emailAddress: globalEamilAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $scope.logs = JSON.parse(response.data.data);
+            $scope.listFail = true;
+        }
+        else
+        {
+            $scope.listFail = false;
+            $scope.errorMessage = response.data.error_message;
+
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+    }
+
+
+        };
+    $scope.getLogEntries(1);
+
+
+    $scope.flushLogs = function(emailAddress) {
+
+        $scope.emailLimitsLoading = false;
+
+        url = "/emailPremium/flushEmailLogs";
+
+        var data = {
+            emailAddress: emailAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+            $scope.getLogEntries(1);
+
+        }
+        else
+            {
+            $scope.listFail = false;
+            $scope.errorMessage = response.data.error_message;
+
+            }
+        }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+        }
+
+
+        };
+
+});
+
+/* Java script code for Email Page */
+
+
+/* Java script code for SpamAssassin */
+
+app.controller('SpamAssassin', function($scope, $http, $timeout, $window) {
+
+           $scope.SpamAssassinNotifyBox  = true;
+           $scope.SpamAssassinInstallBox = true;
+           $scope.SpamAssassinLoading = true;
+           $scope.failedToStartInallation = true;
+           $scope.couldNotConnect = true;
+           $scope.SpamAssassinSuccessfullyInstalled = true;
+           $scope.installationFailed = true;
+
+
+
+           $scope.installSpamAssassin = function(){
+
+               $scope.SpamAssassinNotifyBox  = true;
+               $scope.SpamAssassinInstallBox = true;
+               $scope.SpamAssassinLoading = false;
+               $scope.failedToStartInallation = true;
+               $scope.couldNotConnect = true;
+               $scope.SpamAssassinSuccessfullyInstalled = true;
+               $scope.installationFailed = true;
+
+               url = "/emailPremium/installSpamAssassin";
+
+                        var data = {};
+
+                        var config = {
+                            headers : {
+                                'X-CSRFToken': getCookie('csrftoken')
+                                }
+                            };
+
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+
+
+                    if(response.data.status === 1){
+
+                        $scope.SpamAssassinNotifyBox  = true;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = false;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = true;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                        $scope.installationFailed = true;
+
+                        getRequestStatus();
+
+                    }
+                    else{
+                        $scope.errorMessage = response.data.error_message;
+
+                        $scope.SpamAssassinNotifyBox  = false;
+                        $scope.SpamAssassinInstallBox = true;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.failedToStartInallation = false;
+                        $scope.couldNotConnect = true;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+
+                        $scope.SpamAssassinNotifyBox  = false;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = false;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                        $scope.installationFailed = true;
+                }
+
+           };
+
+           function getRequestStatus(){
+
+                        $scope.SpamAssassinNotifyBox  = true;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = false;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = true;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                        $scope.installationFailed = true;
+
+                        url = "/emailPremium/installStatusSpamAssassin";
+
+                        var data = {};
+
+                        var config = {
+                            headers : {
+                                'X-CSRFToken': getCookie('csrftoken')
+                                }
+                            };
+
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+
+
+                    if(response.data.abort === 0){
+
+                        $scope.SpamAssassinNotifyBox  = true;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = false;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = true;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                        $scope.installationFailed = true;
+
+                        $scope.requestData = response.data.requestStatus;
+                        $timeout(getRequestStatus,1000);
+                    }
+                    else{
+                        // Notifications
+                        $timeout.cancel();
+                        $scope.SpamAssassinNotifyBox  = false;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = true;
+
+                        $scope.requestData = response.data.requestStatus;
+
+                        if(response.data.installed === 0) {
+                            $scope.installationFailed = false;
+                            $scope.errorMessage = response.data.error_message;
+                        }else{
+                            $scope.SpamAssassinSuccessfullyInstalled = false;
+                            $timeout(function() {  $window.location.reload(); }, 3000);
+                        }
+
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+
+                        $scope.SpamAssassinNotifyBox  = false;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = false;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                        $scope.installationFailed = true;
+
+
+                }
+
+           }
+
+           ///// SpamAssassin configs
+
+           var report_safe = false;
+
+
+           $('#report_safe').change(function() {
+                report_safe = $(this).prop('checked');
+           });
+
+           fetchSpamAssassinSettings();
+           function fetchSpamAssassinSettings(){
+
+               $scope.SpamAssassinLoading = false;
+
+               $('#report_safe').bootstrapToggle('off');
+
+               url = "/emailPremium/fetchSpamAssassinSettings";
+
+               var data = {};
+
+               var config = {
+                   headers : {
+                       'X-CSRFToken': getCookie('csrftoken')
+                   }
+               };
+
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+
+                    $scope.SpamAssassinLoading = true;
+
+                    if(response.data.fetchStatus === 1){
+
+                        if(response.data.installed === 1) {
+
+                            if (response.data.report_safe === 1) {
+                                $('#report_safe').bootstrapToggle('on');
+                            }
+
+                            $scope.required_hits = response.data.required_hits;
+                            $scope.rewrite_header = response.data.rewrite_header;
+                            $scope.required_score = response.data.required_score;
+
+                        }
+
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+                    $scope.SpamAssassinLoading = true;
+                }
+
+           }
+
+
+           /////
+
+           /// Save SpamAssassin Changes
+
+          $scope.failedToSave = true;
+          $scope.successfullySaved = true;
+
+          $scope.saveSpamAssassinConfigurations = function () {
+
+               $scope.failedToSave = true;
+               $scope.successfullySaved = true;
+               $scope.SpamAssassinLoading = false;
+               $scope.couldNotConnect = true;
+
+
+                        url = "/emailPremium/saveSpamAssassinConfigurations";
+
+                        var data = {
+                            report_safe:report_safe,
+                            required_hits:$scope.required_hits,
+                            rewrite_header:$scope.rewrite_header,
+                            required_score:$scope.required_score
+                        };
+
+                        var config = {
+                            headers : {
+                                'X-CSRFToken': getCookie('csrftoken')
+                                }
+                            };
+
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+
+
+                    if(response.data.saveStatus === 1){
+
+                        $scope.failedToSave = true;
+                        $scope.successfullySaved = false;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.couldNotConnect = true;
+
+                    }
+                    else{
+                        $scope.errorMessage = response.data.error_message;
+
+                        $scope.failedToSave = false;
+                        $scope.successfullySaved = true;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.couldNotConnect = true;
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+                        $scope.failedToSave = true;
+                        $scope.successfullySaved = false;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.couldNotConnect = true;
+                }
+
+
+           };
+
+});
+
+
+/* Java script code for SpamAssassin */
+
+
+/* Java script code for Email Policy Server */
+
+app.controller('powerDNS', function($scope, $http, $timeout, $window) {
+
+           $scope.pdnsLoading = true;
+           $scope.failedToFetch = true;
+           $scope.couldNotConnect = true;
+           $scope.changesApplied = true;
+
+
+           ///// SpamAssassin configs
+
+           var report_safe = false;
+
+
+           $('#pdnsStatus').change(function() {
+                pdnsStatus = $(this).prop('checked');
+           });
+
+           fetchPDNSStatus('powerdns');
+           function fetchPDNSStatus(service){
+
+               $scope.pdnsLoading = false;
+
+               $('#pdnsStatus').bootstrapToggle('off');
+
+               url = "/manageservices/fetchStatus";
+
+               var data = {
+                   'service' : service
+               };
+
+               var config = {
+                   headers : {
+                       'X-CSRFToken': getCookie('csrftoken')
+                   }
+               };
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+
+                    $scope.pdnsLoading = true;
+
+                    if(response.data.status === 1){
+
+                        if (response.data.installCheck === 1) {
+                                $('#pdnsStatus').bootstrapToggle('on');
+                            }
+
+                    }else{
+                       $scope.failedToFetch = false;
+                       $scope.couldNotConnect = true;
+                       $scope.changesApplied = true;
+
+                       $scope.errorMessage = response.data.error_message;
+
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+                    $scope.pdnsLoading = true;
+                    $scope.failedToFetch = true;
+                    $scope.couldNotConnect = false;
+                    $scope.changesApplied = true;
+                }
+
+           }
+
+
+           $scope.saveStatus = function (service) {
+
+               $scope.pdnsLoading = false;
+               $scope.failedToFetch = true;
+               $scope.couldNotConnect = true;
+               $scope.changesApplied = true;
+
+
+
+                        url = "/manageservices/saveStatus";
+
+                        var data = {
+                            status:pdnsStatus,
+                            service: service
+                        };
+
+                        var config = {
+                            headers : {
+                                'X-CSRFToken': getCookie('csrftoken')
+                                }
+                            };
+
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+                    $scope.pdnsLoading = true;
+
+                    if(response.data.status === 1){
+
+                        $scope.failedToFetch = true;
+                        $scope.couldNotConnect = true;
+                        $scope.changesApplied = false;
+
+                    }
+                    else{
+                        $scope.errorMessage = response.data.error_message;
+
+                        $scope.failedToFetch = false;
+                        $scope.couldNotConnect = true;
+                        $scope.changesApplied = true;
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+                        $scope.policyServerLoading = true;
+                        $scope.failedToFetch = true;
+                        $scope.couldNotConnect = false;
+                        $scope.changesApplied = true;
+                }
+
+
+           };
+
+});
+
+
+/* Java script code for Email Policy Server */
\ No newline at end of file
diff --git a/manageServices/templates/manageServices/managePostfix.html b/manageServices/templates/manageServices/managePostfix.html
new file mode 100644
index 000000000..3d9fea014
--- /dev/null
+++ b/manageServices/templates/manageServices/managePostfix.html
@@ -0,0 +1,81 @@
+{% extends "baseTemplate/index.html" %}
+{% load i18n %}
+{% block title %}{% trans "Email Policy Server - CyberPanel" %}{% endblock %}
+{% block content %}
+
+{% load static %}
+{% get_current_language as LANGUAGE_CODE %}
+<!-- Current language: {{ LANGUAGE_CODE }} -->
+
+
+<div class="container">
+<div id="page-title">
+   <h2>{% trans "Email Policy Server Configurations!" %} - <a  target="_blank" href="http://go.cyberpanel.net/emailLimits" style="height: 23px;line-height: 21px;" class="btn btn-border btn-alt border-red btn-link font-red" title=""><span>{% trans "Emai Limits Docs" %}</span></a> </h2>
+   <p>{% trans "Turn ON Email Policy Server to use Email Limits Feature. " %}</p>
+</div>
+
+<div ng-controller="policyServer" class="example-box-wrapper">
+        <div style="border-radius: 25px;border-color:#3498db" class="content-box">
+            <h3 class="content-box-header bg-blue">
+                {% trans "Email Policy Server" %} <img ng-hide="policyServerLoading"  src="/static/images/loading.gif">
+            </h3>
+
+            <div class="content-box-wrapper">
+                <div class="row">
+
+                 <div style="padding: 2%"  class="col-md-12">
+                    <form  action="/" id="createPackages" class="form-horizontal bordered-row">
+
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">Server Status</label>
+                            <div class="col-sm-6">
+                                <input type="checkbox" id="policServerStatus" data-toggle="toggle">
+                            </div>
+                        </div>
+
+
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label"></label>
+                            <div class="col-sm-4">
+                                 <button type="button" ng-click="savePolicServerStatus()" class="btn btn-primary btn-lg btn-block">{% trans "Save changes." %}</button>
+
+                            </div>
+                        </div>
+
+
+
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label"></label>
+                            <div class="col-sm-4">
+
+                                    <div ng-hide="failedToFetch" class="alert alert-danger">
+                                                <p>{% trans "Error message: " %} {$ errorMessage $}</p>
+                                    </div>
+
+                                    <div ng-hide="changesApplied" class="alert alert-success">
+                                                <p>{% trans "Changes successfully applied." %}</p>
+                                    </div>
+
+                                    <div ng-hide="couldNotConnect" class="alert alert-danger">
+                                            <p>{% trans "Could not connect. Please refresh this page." %} </p>
+                                    </div>
+
+                            </div>
+                        </div>
+
+
+                    </form>
+                </div>
+
+
+
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+</div>
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/manageServices/templates/manageServices/managePowerDNS.html b/manageServices/templates/manageServices/managePowerDNS.html
new file mode 100644
index 000000000..db53699b3
--- /dev/null
+++ b/manageServices/templates/manageServices/managePowerDNS.html
@@ -0,0 +1,91 @@
+{% extends "baseTemplate/index.html" %}
+{% load i18n %}
+{% block title %}{% trans "Manage PowerDNS - CyberPanel" %}{% endblock %}
+{% block content %}
+
+{% load static %}
+{% get_current_language as LANGUAGE_CODE %}
+<!-- Current language: {{ LANGUAGE_CODE }} -->
+
+
+<div class="container">
+<div id="page-title">
+   <h2>{% trans "Manage PowerDNS!" %} - <a  target="_blank" href="http://go.cyberpanel.net/emailLimits" style="height: 23px;line-height: 21px;" class="btn btn-border btn-alt border-red btn-link font-red" title=""><span>{% trans "Emai Limits Docs" %}</span></a> </h2>
+   <p>{% trans "Enable or disable DNS services. " %}</p>
+</div>
+
+    {% if status %}
+
+    <div ng-controller="powerDNS" class="example-box-wrapper">
+        <div style="border-radius: 25px;border-color:#3498db" class="content-box">
+            <h3 class="content-box-header bg-blue">
+                {% trans "Manage PowerDNS" %} <img ng-hide="pdnsLoading"  src="/static/images/loading.gif">
+            </h3>
+
+            <div class="content-box-wrapper">
+                <div class="row">
+
+                 <div style="padding: 2%"  class="col-md-12">
+                    <form  action="/" id="createPackages" class="form-horizontal bordered-row">
+
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">PowerDNS Status</label>
+                            <div class="col-sm-6">
+                                <input type="checkbox" id="pdnsStatus" data-toggle="toggle">
+                            </div>
+                        </div>
+
+
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label"></label>
+                            <div class="col-sm-4">
+                                 <button type="button" ng-click="saveStatus('powerdns')" class="btn btn-primary btn-lg btn-block">{% trans "Save changes." %}</button>
+
+                            </div>
+                        </div>
+
+
+
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label"></label>
+                            <div class="col-sm-4">
+
+                                    <div ng-hide="failedToFetch" class="alert alert-danger">
+                                                <p>{% trans "Error message: " %} {$ errorMessage $}</p>
+                                    </div>
+
+                                    <div ng-hide="changesApplied" class="alert alert-success">
+                                                <p>{% trans "Changes successfully applied." %}</p>
+                                    </div>
+
+                                    <div ng-hide="couldNotConnect" class="alert alert-danger">
+                                            <p>{% trans "Could not connect. Please refresh this page." %} </p>
+                                    </div>
+
+                            </div>
+                        </div>
+
+
+                    </form>
+                </div>
+
+
+
+                </div>
+            </div>
+        </div>
+    </div>
+
+    {% else %}
+
+        <div class="alert alert-danger">
+            <p>{% trans "Only administrator can manage services." %}</p>
+    </div>
+
+    {% endif  %}
+
+
+</div>
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/manageServices/tests.py b/manageServices/tests.py
new file mode 100644
index 000000000..5982e6bcd
--- /dev/null
+++ b/manageServices/tests.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/manageServices/urls.py b/manageServices/urls.py
new file mode 100644
index 000000000..06276cf19
--- /dev/null
+++ b/manageServices/urls.py
@@ -0,0 +1,8 @@
+from django.conf.urls import url
+import views
+
+urlpatterns = [
+    url(r'^managePowerDNS$', views.managePowerDNS, name='managePowerDNS'),
+    url(r'^fetchStatus$', views.fetchStatus, name='fetchStatus'),
+    url(r'^saveStatus$', views.saveStatus, name='saveStatus'),
+]
\ No newline at end of file
diff --git a/manageServices/views.py b/manageServices/views.py
new file mode 100644
index 000000000..20608146c
--- /dev/null
+++ b/manageServices/views.py
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.shortcuts import render
+from loginSystem.models import Administrator
+from django.shortcuts import HttpResponse, redirect
+import plogical.CyberCPLogFileWriter as logging
+from loginSystem.views import loadLoginPage
+import os
+import json
+from plogical.mailUtilities import mailUtilities
+import subprocess, shlex
+# Create your views here.
+
+
+# Create your views here.
+
+def managePowerDNS(request):
+    try:
+        val = request.session['userID']
+        try:
+            admin = Administrator.objects.get(pk=val)
+
+            if admin.type == 1:
+                return render(request, 'manageServices/managePowerDNS.html', {"status": 1})
+            else:
+                return render(request, 'manageServices/managePowerDNS.html', {"status": 0})
+
+        except BaseException, msg:
+            logging.CyberCPLogFileWriter.writeToFile(str(msg))
+            return HttpResponse("See CyberCP main log file.")
+
+    except KeyError:
+        return redirect(loadLoginPage)
+
+
+def fetchStatus(request):
+    try:
+        val = request.session['userID']
+        admin = Administrator.objects.get(pk=val)
+        try:
+            if request.method == 'POST':
+
+                if admin.type != 1:
+                    dic = {'status': 0, 'error_message': "Only administrator can view this page."}
+                    json_data = json.dumps(dic)
+                    return HttpResponse(json_data)
+
+                mailUtilities.checkHome()
+
+                data = json.loads(request.body)
+                service = data['service']
+
+                if service == 'powerdns':
+                    if os.path.exists('/home/cyberpanel/powerdns'):
+                        data_ret = {'status': 1, 'error_message': 'None', 'installCheck': 1}
+                        json_data = json.dumps(data_ret)
+                        return HttpResponse(json_data)
+                    else:
+                        data_ret = {'status': 1, 'error_message': 'None', 'installCheck': 0}
+                        json_data = json.dumps(data_ret)
+                        return HttpResponse(json_data)
+
+
+
+        except BaseException,msg:
+            data_ret = {'status': 0, 'error_message': str(msg)}
+            json_data = json.dumps(data_ret)
+            return HttpResponse(json_data)
+
+    except KeyError,msg:
+        logging.CyberCPLogFileWriter.writeToFile(str(msg))
+        data_ret = {'status': 0, 'error_message': str(msg)}
+        json_data = json.dumps(data_ret)
+        return HttpResponse(json_data)
+
+def saveStatus(request):
+    try:
+        val = request.session['userID']
+        admin = Administrator.objects.get(pk=val)
+        try:
+            if request.method == 'POST':
+
+                if admin.type != 1:
+                    dic = {'status': 0, 'error_message': "Only administrator can view this page."}
+                    json_data = json.dumps(dic)
+                    return HttpResponse(json_data)
+
+                data = json.loads(request.body)
+
+                status = data['status']
+                service = data['service']
+
+                mailUtilities.checkHome()
+
+                if service == 'powerdns':
+                    pdnsPath = '/home/cyberpanel/powerdns'
+                    if status == True:
+                        writeToFile = open(pdnsPath, 'w+')
+                        writeToFile.close()
+                        command = 'sudo systemctl start pdns'
+                        subprocess.call(shlex.split(command))
+                    else:
+                        command = 'sudo systemctl stop pdns'
+                        subprocess.call(shlex.split(command))
+                        try:
+                            os.remove(pdnsPath)
+                        except:
+                            pass
+
+                    data_ret = {'status': 1, 'error_message': "None"}
+                    json_data = json.dumps(data_ret)
+                    return HttpResponse(json_data)
+
+
+        except BaseException,msg:
+            data_ret = {'status': 0, 'error_message': str(msg)}
+            json_data = json.dumps(data_ret)
+            return HttpResponse(json_data)
+
+    except KeyError,msg:
+        logging.CyberCPLogFileWriter.writeToFile(str(msg))
+        data_ret = {'status': 0, 'error_message': str(msg)}
+        json_data = json.dumps(data_ret)
+        return HttpResponse(json_data)
\ No newline at end of file
diff --git a/plogical/remoteBackup.py b/plogical/remoteBackup.py
index 2ff013ae6..c6c29e4c0 100644
--- a/plogical/remoteBackup.py
+++ b/plogical/remoteBackup.py
@@ -222,6 +222,7 @@ class remoteBackup:
 
             command = 'sudo rsync -avz -e "ssh  -i /root/.ssh/cyberpanel -o StrictHostKeyChecking=no" ' + completedPathToSend + ' root@' + IPAddress + ':/home/backup/transfer-'+folderNumber
             subprocess.call(shlex.split(command), stdout=writeToFile)
+            os.remove(completedPathToSend)
 
         except BaseException, msg:
             logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [startBackup]")
diff --git a/plogical/sslUtilities.py b/plogical/sslUtilities.py
index 1f78acbe6..2f222c246 100644
--- a/plogical/sslUtilities.py
+++ b/plogical/sslUtilities.py
@@ -178,7 +178,7 @@ class sslUtilities:
 
                 try:
                     logging.CyberCPLogFileWriter.writeToFile("Trying to obtain SSL for: " + virtualHostName + " and: www." + virtualHostName)
-                    command = "certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName + " -d www." + virtualHostName
+                    command = "/usr/local/CyberCP/bin/certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName + " -d www." + virtualHostName
                     output = subprocess.check_output(shlex.split(command))
                     logging.CyberCPLogFileWriter.writeToFile(
                         "Successfully obtained SSL for: " + virtualHostName + " and: www." + virtualHostName)
@@ -188,7 +188,7 @@ class sslUtilities:
                     try:
                         logging.CyberCPLogFileWriter.writeToFile(
                             "Trying to obtain SSL for: " + virtualHostName)
-                        command = "certbot certonly -n --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName
+                        command = "/usr/local/CyberCP/bin/certbot certonly -n --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName
                         output = subprocess.check_output(shlex.split(command))
                         logging.CyberCPLogFileWriter.writeToFile(
                             "Successfully obtained SSL for: " + virtualHostName)
@@ -196,6 +196,8 @@ class sslUtilities:
                         logging.CyberCPLogFileWriter.writeToFile('Failed to obtain SSL, issuing self-signed SSL for: ' + virtualHostName)
                         return 0
 
+                logging.CyberCPLogFileWriter.writeToFile(command)
+
                 pathToStoreSSL = sslUtilities.Server_root + "/conf/vhosts/" + "SSL-" + virtualHostName
 
                 if not os.path.exists(pathToStoreSSL):
@@ -260,13 +262,13 @@ class sslUtilities:
 
                         if serverIPAddress == ipRecordsAlias[1] and serverIPAddress == ipRecordsAlias[2]:
 
-                            command = "certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName + " -d www." + virtualHostName + " -d " + aliasDomain + " -d www." + aliasDomain
+                            command = "/usr/local/CyberCP/bin/certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName + " -d www." + virtualHostName + " -d " + aliasDomain + " -d www." + aliasDomain
 
                         else:
                             if serverIPAddress == ipRecordsAlias[2]:
-                                command = "certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName + " -d www." + virtualHostName + " -d " + aliasDomain
+                                command = "/usr/local/CyberCP/bin/certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName + " -d www." + virtualHostName + " -d " + aliasDomain
                             else:
-                                command = "certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName + " -d www." + virtualHostName
+                                command = "/usr/local/CyberCP/bin/certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName + " -d www." + virtualHostName
 
                     else:
                         if serverIPAddress == ipRecords[2]:
@@ -275,13 +277,13 @@ class sslUtilities:
 
                             if serverIPAddress == ipRecordsAlias[1] and serverIPAddress == ipRecordsAlias[2]:
 
-                                command = "certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName  + " -d " + aliasDomain + " -d www." + aliasDomain
+                                command = "/usr/local/CyberCP/bin/certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName  + " -d " + aliasDomain + " -d www." + aliasDomain
 
                             else:
                                 if serverIPAddress == ipRecordsAlias[2]:
-                                    command = "certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName + " -d " + aliasDomain
+                                    command = "/usr/local/CyberCP/bin/certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName + " -d " + aliasDomain
                                 else:
-                                    command = "certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName
+                                    command = "/usr/local/CyberCP/bin/certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath + " -d " + virtualHostName
 
                             logging.CyberCPLogFileWriter.writeToFile(
                                 "SSL is issued without 'www' due to DNS error for domain : " + virtualHostName)
@@ -290,10 +292,10 @@ class sslUtilities:
                             ipRecordsAlias = sslUtilities.getDNSRecords(aliasDomain)
 
                             if serverIPAddress == ipRecordsAlias[1] and serverIPAddress == ipRecordsAlias[2]:
-                                command = "certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath  + " -d " + aliasDomain + " -d www." + aliasDomain
+                                command = "/usr/local/CyberCP/bin/certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath  + " -d " + aliasDomain + " -d www." + aliasDomain
                             else:
                                 if serverIPAddress == ipRecordsAlias[2]:
-                                    command = "certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath  + " -d " + aliasDomain
+                                    command = "/usr/local/CyberCP/bin/certbot certonly -n --expand --agree-tos --email " + adminEmail + " --webroot -w " + sslpath  + " -d " + aliasDomain
                                 else:
                                     return 0
                 else:
diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index 043de6fae..88e32e3d6 100644
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -238,6 +238,32 @@ WantedBy=multi-user.target"""
         command = "chmod -R 777 /usr/local/lsws/Example/html/FileManager"
         subprocess.call(shlex.split(command))
 
+    @staticmethod
+    def setupCLI():
+        try:
+            count = 0
+            while (1):
+                command = "ln -s /usr/local/CyberCP/cli/cyberPanel.py /usr/bin/cyberpanel"
+                res = subprocess.call(shlex.split(command))
+
+                if res == 1:
+                    count = count + 1
+                    Upgrade.stdOut(
+                        "Trying to setup CLI, trying again, try number: " + str(count))
+                    if count == 3:
+                        Upgrade.stdOut(
+                            "Failed to setup CLI! [setupCLI]")
+                else:
+                    Upgrade.stdOut("CLI setup successfull!")
+                    break
+
+            command = "chmod +x /usr/local/CyberCP/cli/cyberPanel.py"
+            res = subprocess.call(shlex.split(command))
+
+        except OSError, msg:
+            Upgrade.stdOut(str(msg) + " [setupCLI]")
+            return 0
+
     @staticmethod
     def staticContent():
         count = 1
@@ -495,6 +521,7 @@ WantedBy=multi-user.target"""
         ## Upgrade OpenLiteSpeed
 
         Upgrade.upgradeOpenLiteSpeed()
+        Upgrade.setupCLI()
         time.sleep(3)
 
         ## Upgrade version
diff --git a/static/manageServices/manageServices.js b/static/manageServices/manageServices.js
new file mode 100644
index 000000000..cc0a255fa
--- /dev/null
+++ b/static/manageServices/manageServices.js
@@ -0,0 +1,1094 @@
+/**
+ * Created by usman on 6/22/18.
+ */
+
+/* Java script code to list accounts */
+
+app.controller('listDomains', function($scope,$http) {
+
+    $scope.listFail = true;
+    $scope.emailLimitsLoading = true;
+
+    // Global page number, to be used in later function to refresh the domains
+    var globalPageNumber;
+
+
+    $scope.getFurtherWebsitesFromDB = function(pageNumber) {
+
+        globalPageNumber = pageNumber;
+        $scope.emailLimitsLoading = false;
+
+        url = "/emailPremium/getFurtherDomains";
+
+        var data = {page: pageNumber};
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.listWebSiteStatus === 1) {
+
+            $scope.WebSitesList = JSON.parse(response.data.data);
+            $scope.listFail = true;
+        }
+        else
+        {
+            $scope.listFail = false;
+            $scope.errorMessage = response.data.error_message;
+
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+    }
+
+
+        };
+    $scope.getFurtherWebsitesFromDB(1);
+
+    $scope.enableDisableEmailLimits = function (operationVal, domainName) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableEmailLimits";
+
+        var data = {
+            operationVal: operationVal,
+            domainName: domainName
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $scope.getFurtherWebsitesFromDB(globalPageNumber);
+            $scope.listFail = true;
+        }
+        else
+        {
+            $scope.listFail = false;
+            $scope.errorMessage = response.data.error_message;
+
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+    }
+    }
+});
+
+/* Java script code to list accounts ends here */
+
+
+
+/* Java script code for email domain page */
+
+app.controller('emailDomainPage', function($scope,$http, $timeout, $window) {
+
+    $scope.listFail = true;
+    $scope.emailLimitsLoading = true;
+
+    var globalDomainName = window.location.pathname.split("/")[2];
+
+    // Global page number, to be used in later function to refresh the domains
+    var globalPageNumber;
+
+
+    $scope.getFurtherEmailsFromDB = function(pageNumber) {
+
+        globalPageNumber = pageNumber;
+        $scope.emailLimitsLoading = false;
+
+        url = "/emailPremium/getFurtherEmail";
+
+        var data = {
+            page: pageNumber,
+            domainName: globalDomainName
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $scope.emailList = JSON.parse(response.data.data);
+            $scope.listFail = true;
+        }
+        else
+        {
+            $scope.listFail = false;
+            $scope.errorMessage = response.data.error_message;
+
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+    }
+
+
+        };
+    $scope.getFurtherEmailsFromDB(1);
+
+    $scope.enableDisableEmailLimits = function (operationVal, domainName) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableEmailLimits";
+
+        var data = {
+            operationVal: operationVal,
+            domainName: domainName
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $timeout(function() {  $window.location.reload(); }, 0);
+        }
+        else
+        {
+            $timeout(function() {  $window.location.reload(); }, 0);
+        }
+    }
+        function cantLoadInitialData(response) {
+            $timeout(function() {  $window.location.reload(); }, 0);
+    }
+    };
+
+
+    /// Email limits
+
+    $scope.changeLimitsForm = true;
+    $scope.changeLimitsFail = true;
+    $scope.changeLimitsSuccess = true;
+    $scope.couldNotConnect = true;
+
+    $scope.showLimitsForm = function () {
+        $scope.changeLimitsForm = false;
+    };
+
+    $scope.hideLimitsForm = function () {
+        $scope.changeLimitsForm = true;
+        $scope.changeLimitsFail = true;
+        $scope.changeLimitsSuccess = true;
+        $scope.couldNotConnect = true;
+    };
+
+    $scope.changeDomainEmailLimits = function (domainName) {
+            $scope.emailLimitsLoading = false;
+
+            url = "/emailPremium/changeDomainLimit";
+
+            var data = {
+                domainName: domainName,
+                newLimit: $scope.monthlyLimit
+            };
+
+            var config = {
+                headers : {
+                    'X-CSRFToken': getCookie('csrftoken')
+                }
+            };
+
+            $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+            function ListInitialData(response) {
+
+                $scope.emailLimitsLoading = true;
+
+
+            if (response.data.status === 1) {
+
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = true;
+                $scope.changeLimitsSuccess = false;
+                $scope.couldNotConnect = true;
+                $timeout(function() {  $window.location.reload(); }, 3000);
+            }
+            else
+            {
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = false;
+                $scope.changeLimitsSuccess = true;
+                $scope.couldNotConnect = true;
+                $scope.errorMessage = response.data.error_message;
+
+            }
+        }
+            function cantLoadInitialData(response) {
+                $scope.emailLimitsLoading = true;
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = true;
+                $scope.changeLimitsSuccess = true;
+                $scope.couldNotConnect = false;
+        }
+    }
+
+
+    $scope.enableDisableIndividualEmailLimits = function (operationVal, emailAddress) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableIndividualEmailLimits";
+
+        var data = {
+            operationVal: operationVal,
+            emailAddress: emailAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+            $scope.getFurtherEmailsFromDB(1);
+        }
+        else
+        {
+            $scope.getFurtherEmailsFromDB(1);
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.getFurtherEmailsFromDB(1);
+    }
+    };
+
+});
+
+/* Java script code for email domain page */
+
+
+/* Java script code for Email Page */
+
+app.controller('emailPage', function($scope,$http, $timeout, $window) {
+
+    $scope.emailLimitsLoading = true;
+
+    var globalEamilAddress = $("#emailAddress").text();
+
+    // Global page number, to be used in later function to refresh the domains
+    var globalPageNumber;
+
+    $scope.getEmailStats = function() {
+
+        $scope.emailLimitsLoading = false;
+
+        ////
+
+        $scope.limitsOn = true;
+        $scope.limitsOff = true;
+
+        url = "/emailPremium/getEmailStats";
+
+        var data = {
+            emailAddress: globalEamilAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $scope.monthlyLimit = response.data.monthlyLimit;
+            $scope.monthlyUsed = response.data.monthlyUsed;
+            $scope.hourlyLimit = response.data.hourlyLimit;
+            $scope.hourlyUsed = response.data.hourlyUsed;
+
+            if(response.data.limitStatus === 1){
+                $scope.limitsOn = false;
+                $scope.limitsOff = true;
+            }else{
+                $scope.limitsOn = true;
+                $scope.limitsOff = false;
+            }
+
+            if(response.data.logsStatus === 1){
+                $scope.loggingOn = false;
+                $scope.loggingOff = true;
+            }else{
+                $scope.loggingOn = true;
+                $scope.loggingOff = false;
+            }
+
+        }
+        else
+        {
+
+            $scope.errorMessage = response.data.error_message;
+
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+    }
+
+
+        };
+    $scope.getEmailStats();
+
+    $scope.enableDisableIndividualEmailLimits = function (operationVal, emailAddress) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableIndividualEmailLimits";
+
+        var data = {
+            operationVal: operationVal,
+            emailAddress: emailAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+            if (response.data.status === 1) {
+                $scope.getEmailStats();
+            }
+            else
+            {
+                $scope.getEmailStats();
+            }
+    }
+        function cantLoadInitialData(response) {
+            $scope.getEmailStats();
+    }
+    };
+    $scope.enableDisableIndividualEmailLogs = function (operationVal, emailAddress) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableIndividualEmailLogs";
+
+        var data = {
+            operationVal: operationVal,
+            emailAddress: emailAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+            if (response.data.status === 1) {
+                $scope.getEmailStats();
+            }
+            else
+            {
+                $scope.getEmailStats();
+            }
+    }
+        function cantLoadInitialData(response) {
+            $scope.getEmailStats();
+    }
+    };
+
+
+    $scope.enableDisableEmailLimits = function (operationVal, domainName) {
+
+        $scope.emailLimitsLoading = false;
+
+
+        url = "/emailPremium/enableDisableEmailLimits";
+
+        var data = {
+            operationVal: operationVal,
+            domainName: domainName
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $timeout(function() {  $window.location.reload(); }, 0);
+        }
+        else
+        {
+            $timeout(function() {  $window.location.reload(); }, 0);
+        }
+    }
+        function cantLoadInitialData(response) {
+            $timeout(function() {  $window.location.reload(); }, 0);
+    }
+    };
+
+
+    /// Email limits
+    $scope.changeLimitsForm = true;
+    $scope.changeLimitsFail = true;
+    $scope.changeLimitsSuccess = true;
+    $scope.couldNotConnect = true;
+
+    $scope.showLimitsForm = function () {
+        $scope.changeLimitsForm = false;
+    };
+
+    $scope.hideLimitsForm = function () {
+        $scope.changeLimitsForm = true;
+        $scope.changeLimitsFail = true;
+        $scope.changeLimitsSuccess = true;
+        $scope.couldNotConnect = true;
+    };
+
+    $scope.changeDomainEmailLimitsIndividual = function () {
+            $scope.emailLimitsLoading = false;
+
+            url = "/emailPremium/changeDomainEmailLimitsIndividual";
+
+            var data = {
+                emailAddress: globalEamilAddress,
+                monthlyLimit: $scope.monthlyLimitForm,
+                hourlyLimit: $scope.hourlyLimitForm
+            };
+
+            var config = {
+                headers : {
+                    'X-CSRFToken': getCookie('csrftoken')
+                }
+            };
+
+            $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+            function ListInitialData(response) {
+
+                $scope.emailLimitsLoading = true;
+
+
+            if (response.data.status === 1) {
+
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = true;
+                $scope.changeLimitsSuccess = false;
+                $scope.couldNotConnect = true;
+                $scope.getEmailStats();
+
+            }
+            else
+            {
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = false;
+                $scope.changeLimitsSuccess = true;
+                $scope.couldNotConnect = true;
+                $scope.errorMessage = response.data.error_message;
+
+            }
+        }
+            function cantLoadInitialData(response) {
+                $scope.emailLimitsLoading = true;
+                $scope.changeLimitsForm = false;
+                $scope.changeLimitsFail = true;
+                $scope.changeLimitsSuccess = true;
+                $scope.couldNotConnect = false;
+        }
+    };
+
+    /// Get email logs
+
+    $scope.getLogEntries = function(pageNumber) {
+
+        globalPageNumber = pageNumber;
+        $scope.emailLimitsLoading = false;
+
+        url = "/emailPremium/getEmailLogs";
+
+        var data = {
+            page: pageNumber,
+            emailAddress: globalEamilAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+
+            $scope.logs = JSON.parse(response.data.data);
+            $scope.listFail = true;
+        }
+        else
+        {
+            $scope.listFail = false;
+            $scope.errorMessage = response.data.error_message;
+
+        }
+    }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+    }
+
+
+        };
+    $scope.getLogEntries(1);
+
+
+    $scope.flushLogs = function(emailAddress) {
+
+        $scope.emailLimitsLoading = false;
+
+        url = "/emailPremium/flushEmailLogs";
+
+        var data = {
+            emailAddress: emailAddress
+        };
+
+        var config = {
+            headers : {
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        };
+
+        $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+
+        function ListInitialData(response) {
+
+            $scope.emailLimitsLoading = true;
+
+        if (response.data.status === 1) {
+            $scope.getLogEntries(1);
+
+        }
+        else
+            {
+            $scope.listFail = false;
+            $scope.errorMessage = response.data.error_message;
+
+            }
+        }
+        function cantLoadInitialData(response) {
+            $scope.emailLimitsLoading = true;
+            $scope.listFail = false;
+        }
+
+
+        };
+
+});
+
+/* Java script code for Email Page */
+
+
+/* Java script code for SpamAssassin */
+
+app.controller('SpamAssassin', function($scope, $http, $timeout, $window) {
+
+           $scope.SpamAssassinNotifyBox  = true;
+           $scope.SpamAssassinInstallBox = true;
+           $scope.SpamAssassinLoading = true;
+           $scope.failedToStartInallation = true;
+           $scope.couldNotConnect = true;
+           $scope.SpamAssassinSuccessfullyInstalled = true;
+           $scope.installationFailed = true;
+
+
+
+           $scope.installSpamAssassin = function(){
+
+               $scope.SpamAssassinNotifyBox  = true;
+               $scope.SpamAssassinInstallBox = true;
+               $scope.SpamAssassinLoading = false;
+               $scope.failedToStartInallation = true;
+               $scope.couldNotConnect = true;
+               $scope.SpamAssassinSuccessfullyInstalled = true;
+               $scope.installationFailed = true;
+
+               url = "/emailPremium/installSpamAssassin";
+
+                        var data = {};
+
+                        var config = {
+                            headers : {
+                                'X-CSRFToken': getCookie('csrftoken')
+                                }
+                            };
+
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+
+
+                    if(response.data.status === 1){
+
+                        $scope.SpamAssassinNotifyBox  = true;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = false;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = true;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                        $scope.installationFailed = true;
+
+                        getRequestStatus();
+
+                    }
+                    else{
+                        $scope.errorMessage = response.data.error_message;
+
+                        $scope.SpamAssassinNotifyBox  = false;
+                        $scope.SpamAssassinInstallBox = true;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.failedToStartInallation = false;
+                        $scope.couldNotConnect = true;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+
+                        $scope.SpamAssassinNotifyBox  = false;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = false;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                        $scope.installationFailed = true;
+                }
+
+           };
+
+           function getRequestStatus(){
+
+                        $scope.SpamAssassinNotifyBox  = true;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = false;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = true;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                        $scope.installationFailed = true;
+
+                        url = "/emailPremium/installStatusSpamAssassin";
+
+                        var data = {};
+
+                        var config = {
+                            headers : {
+                                'X-CSRFToken': getCookie('csrftoken')
+                                }
+                            };
+
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+
+
+                    if(response.data.abort === 0){
+
+                        $scope.SpamAssassinNotifyBox  = true;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = false;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = true;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                        $scope.installationFailed = true;
+
+                        $scope.requestData = response.data.requestStatus;
+                        $timeout(getRequestStatus,1000);
+                    }
+                    else{
+                        // Notifications
+                        $timeout.cancel();
+                        $scope.SpamAssassinNotifyBox  = false;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = true;
+
+                        $scope.requestData = response.data.requestStatus;
+
+                        if(response.data.installed === 0) {
+                            $scope.installationFailed = false;
+                            $scope.errorMessage = response.data.error_message;
+                        }else{
+                            $scope.SpamAssassinSuccessfullyInstalled = false;
+                            $timeout(function() {  $window.location.reload(); }, 3000);
+                        }
+
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+
+                        $scope.SpamAssassinNotifyBox  = false;
+                        $scope.SpamAssassinInstallBox = false;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.failedToStartInallation = true;
+                        $scope.couldNotConnect = false;
+                        $scope.SpamAssassinSuccessfullyInstalled = true;
+                        $scope.installationFailed = true;
+
+
+                }
+
+           }
+
+           ///// SpamAssassin configs
+
+           var report_safe = false;
+
+
+           $('#report_safe').change(function() {
+                report_safe = $(this).prop('checked');
+           });
+
+           fetchSpamAssassinSettings();
+           function fetchSpamAssassinSettings(){
+
+               $scope.SpamAssassinLoading = false;
+
+               $('#report_safe').bootstrapToggle('off');
+
+               url = "/emailPremium/fetchSpamAssassinSettings";
+
+               var data = {};
+
+               var config = {
+                   headers : {
+                       'X-CSRFToken': getCookie('csrftoken')
+                   }
+               };
+
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+
+                    $scope.SpamAssassinLoading = true;
+
+                    if(response.data.fetchStatus === 1){
+
+                        if(response.data.installed === 1) {
+
+                            if (response.data.report_safe === 1) {
+                                $('#report_safe').bootstrapToggle('on');
+                            }
+
+                            $scope.required_hits = response.data.required_hits;
+                            $scope.rewrite_header = response.data.rewrite_header;
+                            $scope.required_score = response.data.required_score;
+
+                        }
+
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+                    $scope.SpamAssassinLoading = true;
+                }
+
+           }
+
+
+           /////
+
+           /// Save SpamAssassin Changes
+
+          $scope.failedToSave = true;
+          $scope.successfullySaved = true;
+
+          $scope.saveSpamAssassinConfigurations = function () {
+
+               $scope.failedToSave = true;
+               $scope.successfullySaved = true;
+               $scope.SpamAssassinLoading = false;
+               $scope.couldNotConnect = true;
+
+
+                        url = "/emailPremium/saveSpamAssassinConfigurations";
+
+                        var data = {
+                            report_safe:report_safe,
+                            required_hits:$scope.required_hits,
+                            rewrite_header:$scope.rewrite_header,
+                            required_score:$scope.required_score
+                        };
+
+                        var config = {
+                            headers : {
+                                'X-CSRFToken': getCookie('csrftoken')
+                                }
+                            };
+
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+
+
+                    if(response.data.saveStatus === 1){
+
+                        $scope.failedToSave = true;
+                        $scope.successfullySaved = false;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.couldNotConnect = true;
+
+                    }
+                    else{
+                        $scope.errorMessage = response.data.error_message;
+
+                        $scope.failedToSave = false;
+                        $scope.successfullySaved = true;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.couldNotConnect = true;
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+                        $scope.failedToSave = true;
+                        $scope.successfullySaved = false;
+                        $scope.SpamAssassinLoading = true;
+                        $scope.couldNotConnect = true;
+                }
+
+
+           };
+
+});
+
+
+/* Java script code for SpamAssassin */
+
+
+/* Java script code for Email Policy Server */
+
+app.controller('powerDNS', function($scope, $http, $timeout, $window) {
+
+           $scope.pdnsLoading = true;
+           $scope.failedToFetch = true;
+           $scope.couldNotConnect = true;
+           $scope.changesApplied = true;
+
+
+           ///// SpamAssassin configs
+
+           var report_safe = false;
+
+
+           $('#pdnsStatus').change(function() {
+                pdnsStatus = $(this).prop('checked');
+           });
+
+           fetchPDNSStatus('powerdns');
+           function fetchPDNSStatus(service){
+
+               $scope.pdnsLoading = false;
+
+               $('#pdnsStatus').bootstrapToggle('off');
+
+               url = "/manageservices/fetchStatus";
+
+               var data = {
+                   'service' : service
+               };
+
+               var config = {
+                   headers : {
+                       'X-CSRFToken': getCookie('csrftoken')
+                   }
+               };
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+
+                    $scope.pdnsLoading = true;
+
+                    if(response.data.status === 1){
+
+                        if (response.data.installCheck === 1) {
+                                $('#pdnsStatus').bootstrapToggle('on');
+                            }
+
+                    }else{
+                       $scope.failedToFetch = false;
+                       $scope.couldNotConnect = true;
+                       $scope.changesApplied = true;
+
+                       $scope.errorMessage = response.data.error_message;
+
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+                    $scope.pdnsLoading = true;
+                    $scope.failedToFetch = true;
+                    $scope.couldNotConnect = false;
+                    $scope.changesApplied = true;
+                }
+
+           }
+
+
+           $scope.saveStatus = function (service) {
+
+               $scope.pdnsLoading = false;
+               $scope.failedToFetch = true;
+               $scope.couldNotConnect = true;
+               $scope.changesApplied = true;
+
+
+
+                        url = "/manageservices/saveStatus";
+
+                        var data = {
+                            status:pdnsStatus,
+                            service: service
+                        };
+
+                        var config = {
+                            headers : {
+                                'X-CSRFToken': getCookie('csrftoken')
+                                }
+                            };
+
+
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+                    $scope.pdnsLoading = true;
+
+                    if(response.data.status === 1){
+
+                        $scope.failedToFetch = true;
+                        $scope.couldNotConnect = true;
+                        $scope.changesApplied = false;
+
+                    }
+                    else{
+                        $scope.errorMessage = response.data.error_message;
+
+                        $scope.failedToFetch = false;
+                        $scope.couldNotConnect = true;
+                        $scope.changesApplied = true;
+                    }
+
+                }
+                function cantLoadInitialDatas(response) {
+                        $scope.policyServerLoading = true;
+                        $scope.failedToFetch = true;
+                        $scope.couldNotConnect = false;
+                        $scope.changesApplied = true;
+                }
+
+
+           };
+
+});
+
+
+/* Java script code for Email Policy Server */
\ No newline at end of file
diff --git a/static/serverStatus/serverStatus.js b/static/serverStatus/serverStatus.js
index f3b0624c6..e52d380fe 100644
--- a/static/serverStatus/serverStatus.js
+++ b/static/serverStatus/serverStatus.js
@@ -403,25 +403,21 @@ app.controller('servicesManager', function($scope,$http) {
                     if(response.data.serviceAction == 1){
                         setTimeout(function() {
                             getServiceStatus();
-                            setTimeout(function() {
-                                $scope.ActionSuccessfull = true;
-                                $scope.ActionFailed = false;
-                                $scope.couldNotConnect = false;
-                                $scope.actionLoader = false;
-                                $scope.btnDisable = false;
-                            },1000)
+                            $scope.ActionSuccessfull = true;
+                            $scope.ActionFailed = false;
+                            $scope.couldNotConnect = false;
+                            $scope.actionLoader = false;
+                            $scope.btnDisable = false;
                         }, 3000);
                     }
                     else{
                         setTimeout(function() {
                             getServiceStatus();
-                            setTimeout(function() {
-                                $scope.ActionSuccessfull = false;
-                                $scope.ActionFailed = true;
-                                $scope.couldNotConnect = false;
-                                $scope.actionLoader = false;
-                                $scope.btnDisable = false;
-                            },1000)
+                            $scope.ActionSuccessfull = false;
+                            $scope.ActionFailed = true;
+                            $scope.couldNotConnect = false;
+                            $scope.actionLoader = false;
+                            $scope.btnDisable = false;
                         }, 5000);
 
                     }
@@ -437,4 +433,4 @@ app.controller('servicesManager', function($scope,$http) {
 
            }
 
-});
\ No newline at end of file
+});
diff --git a/websiteFunctions/templates/websiteFunctions/website.html b/websiteFunctions/templates/websiteFunctions/website.html
index 9ca46fa85..9fc47aa8d 100644
--- a/websiteFunctions/templates/websiteFunctions/website.html
+++ b/websiteFunctions/templates/websiteFunctions/website.html
@@ -1100,7 +1100,7 @@
 
     <div class="alert alert-danger">
             <p>{{ domain }}</p>
-        </div>
+    </div>
 
 
     {% endif %}
diff --git a/websiteFunctions/views.py b/websiteFunctions/views.py
index a53b8843a..928959c99 100644
--- a/websiteFunctions/views.py
+++ b/websiteFunctions/views.py
@@ -38,9 +38,8 @@ def loadWebsitesHome(request):
 def createWebsite(request):
     try:
         val = request.session['userID']
+        admin = Administrator.objects.get(pk=val)
         try:
-            admin = Administrator.objects.get(pk=val)
-
             if admin.type == 3:
                 return HttpResponse("Not enough privileges.")