From 1434cd8ae920fa71695218e5358fb0001bfa0557 Mon Sep 17 00:00:00 2001
From: usmannasir <01-134132-158@student.bahria.edu.pk>
Date: Tue, 28 Aug 2018 23:11:33 +0500
Subject: [PATCH] Minor bug fix in SSL Home page

---
 backup/views.py                          | 14 +----------
 manageSSL/templates/manageSSL/index.html | 32 +++++++++++++++++++++---
 manageSSL/views.py                       |  5 ++--
 plogical/CyberCPLogFileWriter.py         |  1 +
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/backup/views.py b/backup/views.py
index 4d0619d27..9f7df2e06 100644
--- a/backup/views.py
+++ b/backup/views.py
@@ -1,22 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.shortcuts import render,redirect
-from django.http import HttpResponse
+from django.shortcuts import redirect
 # Create your views here.
 import json
-from websiteFunctions.models import dest, backupSchedules
-import plogical.CyberCPLogFileWriter as logging
 from loginSystem.views import loadLoginPage
-import os
-import time
-import shlex
-import subprocess
-import requests
-from plogical.virtualHostUtilities import virtualHostUtilities
-from random import randint
-from plogical.mailUtilities import mailUtilities
-from plogical.acl import ACLManager
 from plogical.backupManager import BackupManager
 
 
diff --git a/manageSSL/templates/manageSSL/index.html b/manageSSL/templates/manageSSL/index.html
index 762e2fc5b..069b591a5 100644
--- a/manageSSL/templates/manageSSL/index.html
+++ b/manageSSL/templates/manageSSL/index.html
@@ -22,8 +22,11 @@
 
              <div class="example-box-wrapper">
                 <div class="row">
-                    <div class="col-md-6">
-                                    <a href="{% url 'createDatabase' %}" title="{% trans 'Create Database' %}" class="tile-box tile-box-shortcut btn-primary">
+
+                {% if manageSSL or admin %}
+
+                    <div class="col-md-4">
+                                    <a href="{% url 'manageSSL' %}" title="{% trans 'Manage SSL' %}" class="tile-box tile-box-shortcut btn-primary">
                                         <div class="tile-header">
                                             {% trans "Manage SSL" %}
                                         </div>
@@ -33,9 +36,13 @@
                                     </a>
                     </div>
 
+                {% endif %}
 
-                    <div class="col-md-6">
-                                    <a href="{% url 'deleteDatabase' %}" title="{% trans 'Delete Database' %}" class="tile-box tile-box-shortcut btn-primary">
+                    {% if hostnameSSL or admin %}
+
+
+                    <div class="col-md-4">
+                                    <a href="{% url 'sslForHostName' %}" title="{% trans 'Hostname SSL' %}" class="tile-box tile-box-shortcut btn-primary">
                                         <div class="tile-header">
                                             {% trans "Hostname SSL" %}
                                         </div>
@@ -45,6 +52,23 @@
                                     </a>
                     </div>
 
+                    {% endif %}
+
+                {% if mailServerSSL or admin %}
+
+                    <div class="col-md-4">
+                                    <a href="{% url 'sslForMailServer' %}" title="{% trans 'MailServer SSL' %}" class="tile-box tile-box-shortcut btn-primary">
+                                        <div class="tile-header">
+                                            {% trans "MailServer SSL" %}
+                                        </div>
+                                        <div class="tile-content-wrapper">
+                                            <i class="glyph-icon icon-dashboard"></i>
+                                        </div>
+                                    </a>
+                    </div>
+
+                {% endif %}
+
 
                 </div>
 
diff --git a/manageSSL/views.py b/manageSSL/views.py
index 2e4e48d6f..f3b515714 100644
--- a/manageSSL/views.py
+++ b/manageSSL/views.py
@@ -16,8 +16,9 @@ from plogical.acl import ACLManager
 
 def loadSSLHome(request):
     try:
-        val = request.session['userID']
-        return render(request, 'manageSSL/index.html')
+        userID = request.session['userID']
+        currentACL = ACLManager.loadedACL(userID)
+        return render(request, 'manageSSL/index.html', currentACL)
     except KeyError:
         return redirect(loadLoginPage)
 
diff --git a/plogical/CyberCPLogFileWriter.py b/plogical/CyberCPLogFileWriter.py
index 584f0ca95..dc2d11890 100644
--- a/plogical/CyberCPLogFileWriter.py
+++ b/plogical/CyberCPLogFileWriter.py
@@ -1,6 +1,7 @@
 import subprocess
 import time
 
+
 class CyberCPLogFileWriter:
     fileName = "/home/cyberpanel/error-logs.txt"