diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html index 34026a670..8fbe28b06 100755 --- a/baseTemplate/templates/baseTemplate/index.html +++ b/baseTemplate/templates/baseTemplate/index.html @@ -217,68 +217,70 @@ {$ three $} {% endcomment %} -{# #} - + {# #} + - + @@ -286,7 +288,6 @@ - @@ -494,124 +495,136 @@ -
  • - - - {% trans "DNS" %} - -
    + {% if dnsAsWhole %} - +
  • + + + {% trans "DNS" %} + +
    -
    -
    • + -
  • - - - {% trans "Email" %} - -
    +
    +
    • - + {% endif %} - - + {% if emailAsWhole %} -
  • - - - {% trans "FTP" %} - -
    +
  • + + + {% trans "Email" %} + +
    - + -
    -
    • + + + + {% endif %} + {% if ftpAsWhole %} + +
  • + + + {% trans "FTP" %} + +
    + + + +
    +
    • + + {% endif¬ %}
  • diff --git a/plogical/acl.py b/plogical/acl.py index 5374659c7..1ea9e1b6f 100644 --- a/plogical/acl.py +++ b/plogical/acl.py @@ -1,6 +1,7 @@ #!/usr/local/CyberCP/bin/python import os,sys +from manageServices.models import PDNSStatus from .processUtilities import ProcessUtilities sys.path.append('/usr/local/CyberCP') @@ -863,3 +864,31 @@ class ACLManager: ProcessUtilities.executioner(command) + @staticmethod + def GetServiceStatus(dic): + if os.path.exists('/home/cyberpanel/postfix'): + dic['emailAsWhole'] = 1 + else: + dic['emailAsWhole'] = 0 + + if os.path.exists('/home/cyberpanel/pureftpd'): + dic['ftpAsWhole'] = 1 + else: + dic['ftpAsWhole'] = 0 + + try: + pdns = PDNSStatus.objects.get(pk=1) + dic['dnsAsWhole'] = pdns.serverStatus + except: + if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20: + pdnsPath = '/etc/powerdns' + else: + pdnsPath = '/etc/pdns' + + if os.path.exists(pdnsPath): + PDNSStatus(serverStatus=1).save() + dic['dnsAsWhole'] = 1 + else: + dic['dnsAsWhole'] = 0 + + diff --git a/plogical/httpProc.py b/plogical/httpProc.py index af4ffe862..bce70891f 100755 --- a/plogical/httpProc.py +++ b/plogical/httpProc.py @@ -55,6 +55,8 @@ class httpProc: except: pass + ACLManager.GetServiceStatus(self.data) + self.data.update(currentACL) return render(self.request, self.templateName, self.data)