Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-08 14:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

enroute fixing https://github.com/usmannasir/cyberpanel/issues/527

Browse Source
This commit is contained in:
Usman Nasir
2021-02-22 10:18:50 +05:00
parent f421dfa549
commit 72ae933042
8 changed files with 948 additions and 1098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
baseTemplate/templates/baseTemplate/index.html
View File

@@ -62,7 +62,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<!--[if IE]><meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'><![endif]--> <!--[if IE]>
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'><![endif]-->
<title>{% block title %}Page Title{% endblock %}</title> <title>{% block title %}Page Title{% endblock %}</title>
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@@ -82,14 +83,15 @@
<link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/assets/finalBase/finalBaseTheme.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/assets/finalBase/finalBaseTheme.css' %}">
<link rel="stylesheet" type="text/css" href="/static/baseTemplate/assets/themes/admin/layout.css"> <link rel="stylesheet" type="text/css" href="/static/baseTemplate/assets/themes/admin/layout.css">
<link rel="stylesheet" type="text/css" href="/static/baseTemplate/assets/themes/admin/color-schemes/default.css"> <link rel="stylesheet" type="text/css"
href="/static/baseTemplate/assets/themes/admin/color-schemes/default.css">
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css"> href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css">
<link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/custom-js/pnotify.custom.min.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/custom-js/pnotify.custom.min.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'websiteFunctions/websiteFunctions.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'websiteFunctions/websiteFunctions.css' %}">
<link rel="stylesheet" type="text/css" href="https://www.jsdelivr.com/package/npm/fontawesome"> <link rel="stylesheet" type="text/css" href="https://www.jsdelivr.com/package/npm/fontawesome">
<link rel="icon" type="image/png" href="{% static 'baseTemplate/assets/finalBase/favicon.png' %}"> <link rel="icon" type="image/png" href="{% static 'baseTemplate/assets/finalBase/favicon.png' %}">
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /> <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet"/>
{% block styles %} {% block styles %}
{% endblock %} {% endblock %}
@@ -110,11 +112,11 @@
<!-- JS Ends --> <!-- JS Ends -->
</head> </head>
<body> <body>
<div id="sb-site"> <div id="sb-site">
<!------- ng-controller="systemStatusInfo" ------------> <!------- ng-controller="systemStatusInfo" ------------>
@@ -204,7 +206,8 @@
</div> </div>
<div id="header-nav-left"> <div id="header-nav-left">
<div ng-controller="adminController" class="user-account-btn dropdown"> <div ng-controller="adminController" class="user-account-btn dropdown">
<a href="#" title="{% trans 'My Account' %}" class="user-profile clearfix" data-toggle="dropdown"> <a href="#" title="{% trans 'My Account' %}" class="user-profile clearfix"
data-toggle="dropdown">
<img width="28" src="{% static 'baseTemplate/assets/image-resources/gravatar.png' %}" <img width="28" src="{% static 'baseTemplate/assets/image-resources/gravatar.png' %}"
alt="Profile image"> alt="Profile image">
<span>{$ currentAdmin $}</span> <span>{$ currentAdmin $}</span>
@@ -215,7 +218,8 @@
<div class="login-box clearfix"> <div class="login-box clearfix">
<div class="user-img"> <div class="user-img">
<a href="#" title="{% trans '' %}" class="change-img">Change photo</a> <a href="#" title="{% trans '' %}" class="change-img">Change photo</a>
<img src="{% static 'baseTemplate/assets/image-resources/gravatar.png' %}" alt=""> <img src="{% static 'baseTemplate/assets/image-resources/gravatar.png' %}"
alt="">
</div> </div>
<div class="user-info"> <div class="user-info">
<span> <span>
@@ -273,7 +277,8 @@
</span> </span>
{% trans "Websites" %} {% trans "Websites" %}
</a> </a>
<a href="{% url 'packagesHome' %}" class="btn vertical-button remove-border btn-danger" <a href="{% url 'packagesHome' %}"
class="btn vertical-button remove-border btn-danger"
title="{% trans '' %}"> title="{% trans '' %}">
<span class="glyph-icon icon-separator-vertical pad0A medium"> <span class="glyph-icon icon-separator-vertical pad0A medium">
<i class="glyph-icon icon-tags opacity-80 font-size-20"></i> <i class="glyph-icon icon-tags opacity-80 font-size-20"></i>
@@ -287,7 +292,8 @@
</span> </span>
{% trans "DNS" %} {% trans "DNS" %}
</a> </a>
<a href="{% url 'loadFTPHome' %}" class="btn vertical-button remove-border btn-azure" <a href="{% url 'loadFTPHome' %}"
class="btn vertical-button remove-border btn-azure"
title="{% trans '' %}"> title="{% trans '' %}">
<span class="glyph-icon icon-separator-vertical pad0A medium"> <span class="glyph-icon icon-separator-vertical pad0A medium">
<i class="glyph-icon icon-bar-chart-o opacity-80 font-size-20"></i> <i class="glyph-icon icon-bar-chart-o opacity-80 font-size-20"></i>
@@ -366,17 +372,26 @@
<li><a href="{% url 'viewProfile' %}" <li><a href="{% url 'viewProfile' %}"
title="{% trans 'View Profile' %}"><span>{% trans "View Profile" %}</span></a> title="{% trans 'View Profile' %}"><span>{% trans "View Profile" %}</span></a>
</li> </li>
<li class="createNewUser"><a href="{% url 'createUser' %}" {% if admin or createNewUser %}
<li><a href="{% url 'createUser' %}"
title="{% trans 'Create New User' %}"><span>{% trans "Create New User" %}</span></a> title="{% trans 'Create New User' %}"><span>{% trans "Create New User" %}</span></a>
</li> </li>
<li class="listUsers"><a href="{% url 'listUsers' %}"
{% endif %}
{% if admin or listUsers %}
<li><a href="{% url 'listUsers' %}"
title="{% trans 'List Users' %}"><span>{% trans "List Users" %}</span></a> title="{% trans 'List Users' %}"><span>{% trans "List Users" %}</span></a>
</li> </li>
{% endif %}
<li><a href="{% url 'modifyUsers' %}" <li><a href="{% url 'modifyUsers' %}"
title="{% trans 'Modify User' %}"><span>{% trans "Modify User" %}</span></a></li> title="{% trans 'Modify User' %}"><span>{% trans "Modify User" %}</span></a>
<li class="resellerCenter"><a href="{% url 'resellerCenter' %}" </li>
{% if admin or resellerCenter %}
<li><a href="{% url 'resellerCenter' %}"
title="{% trans 'Reseller Center' %}"><span>{% trans "Reseller Center" %}</span></a> title="{% trans 'Reseller Center' %}"><span>{% trans "Reseller Center" %}</span></a>
</li> </li>
{% endif %}
<li class="serverACL"><a href="{% url 'createNewACL' %}" <li class="serverACL"><a href="{% url 'createNewACL' %}"
title="{% trans 'Create New ACL' %}"><span>{% trans "Create New ACL" %}</span></a> title="{% trans 'Create New ACL' %}"><span>{% trans "Create New ACL" %}</span></a>
</li> </li>
@@ -466,7 +481,9 @@
<li class="listDatabases"><a href="{% url 'listDBs' %}" <li class="listDatabases"><a href="{% url 'listDBs' %}"
title="{% trans 'List Databases' %}"><span>{% trans "List Databases" %}</span></a> title="{% trans 'List Databases' %}"><span>{% trans "List Databases" %}</span></a>
</li> </li>
<li><a href="{% url 'phpMyAdmin' %}" title="{% trans 'PHPMYAdmin' %}"><span>{% trans "PHPMYAdmin" %}</span></a></li> <li><a href="{% url 'phpMyAdmin' %}"
title="{% trans 'PHPMYAdmin' %}"><span>{% trans "PHPMYAdmin" %}</span></a>
</li>
<!----<li><a href="{% url 'modifyPackage' %}" title="Change Password"><span>Change Password</span></a></li>---> <!----<li><a href="{% url 'modifyPackage' %}" title="Change Password"><span>Change Password</span></a></li>--->
</ul> </ul>
@@ -594,7 +611,7 @@
<li> <li>
<a href="{% url 'loadBackupHome' %}" title="{% trans 'Incremental Back up - Beta' %}"> <a href="{% url 'loadBackupHome' %}" title="{% trans 'Incremental Back up - Beta' %}">
<i class="glyph-icon tooltip-button icon-copy" title=".icon-folder"></i> <i class="glyph-icon tooltip-button icon-save" title="Incremental Back up"></i>
<span>{% trans "Incremental Back up" %}</span> <span>{% trans "Incremental Back up" %}</span>
</a> </a>
<div class="sidebar-submenu"> <div class="sidebar-submenu">
@@ -739,7 +756,8 @@
title="{% trans 'LiteSpeed Tuning' %}"><span>{% trans "LiteSpeed Tuning" %}</span></a> title="{% trans 'LiteSpeed Tuning' %}"><span>{% trans "LiteSpeed Tuning" %}</span></a>
</li> </li>
<li><a href="{% url 'phpTuning' %}" <li><a href="{% url 'phpTuning' %}"
title="{% trans 'PHP Tuning' %}"><span>{% trans "PHP Tuning" %}</span></a></li> title="{% trans 'PHP Tuning' %}"><span>{% trans "PHP Tuning" %}</span></a>
</li>
</ul> </ul>
</div><!-- .sidebar-submenu --> </div><!-- .sidebar-submenu -->
@@ -804,13 +822,17 @@
<ul> <ul>
<li><a href="{% url 'serverMail' %}" <li><a href="{% url 'serverMail' %}"
title="{% trans 'Server Mail' %}"><span>{% trans "Server Mail" %}</span></a></li> title="{% trans 'Server Mail' %}"><span>{% trans "Server Mail" %}</span></a>
</li>
<li><a href="{% url 'accessLogs' %}" <li><a href="{% url 'accessLogs' %}"
title="{% trans 'Access Log' %}"><span>{% trans "Access Log" %}</span></a></li> title="{% trans 'Access Log' %}"><span>{% trans "Access Log" %}</span></a>
</li>
<li><a href="{% url 'errorLogs' %}" <li><a href="{% url 'errorLogs' %}"
title="{% trans 'Error Logs' %}"><span>{% trans "Error Logs" %}</span></a></li> title="{% trans 'Error Logs' %}"><span>{% trans "Error Logs" %}</span></a>
</li>
<li><a href="{% url 'emaillogs' %}" <li><a href="{% url 'emaillogs' %}"
title="{% trans 'Email Logs' %}"><span>{% trans "Email Log" %}</span></a></li> title="{% trans 'Email Logs' %}"><span>{% trans "Email Log" %}</span></a>
</li>
<li><a href="{% url 'ftplogs' %}" <li><a href="{% url 'ftplogs' %}"
title="{% trans 'FTP Logs' %}"><span>{% trans "FTP Logs" %}</span></a></li> title="{% trans 'FTP Logs' %}"><span>{% trans "FTP Logs" %}</span></a></li>
<li><a href="{% url 'modSecAuditLogs' %}" <li><a href="{% url 'modSecAuditLogs' %}"
@@ -830,9 +852,11 @@
<ul> <ul>
<li><a href="{% url 'firewallHome' %}" <li><a href="{% url 'firewallHome' %}"
title="{% trans 'Firewall Home' %}"><span>{% trans "Firewall" %}</span></a></li> title="{% trans 'Firewall Home' %}"><span>{% trans "Firewall" %}</span></a>
</li>
<li><a href="{% url 'secureSSH' %}" <li><a href="{% url 'secureSSH' %}"
title="{% trans 'Secure SSH' %}"><span>{% trans "Secure SSH" %}</span></a></li> title="{% trans 'Secure SSH' %}"><span>{% trans "Secure SSH" %}</span></a>
</li>
<li><a href="{% url 'modSecurity' %}" <li><a href="{% url 'modSecurity' %}"
title="{% trans 'ModSecurity Configurations' %}"><span>{% trans "ModSecurity Conf" %}</span></a> title="{% trans 'ModSecurity Configurations' %}"><span>{% trans "ModSecurity Conf" %}</span></a>
</li> </li>
@@ -900,7 +924,8 @@
<ul> <ul>
<li><a href="{% url 'manageApplications' %}" <li><a href="{% url 'manageApplications' %}"
title="{% trans 'Manage Applications' %}"><span>{% trans "Applications" %}</span></a></li> title="{% trans 'Manage Applications' %}"><span>{% trans "Applications" %}</span></a>
</li>
<li><a href="{% url 'managePowerDNS' %}" <li><a href="{% url 'managePowerDNS' %}"
title="{% trans 'Manage PowerDNS' %}"><span>{% trans "Manage PowerDNS" %}</span></a> title="{% trans 'Manage PowerDNS' %}"><span>{% trans "Manage PowerDNS" %}</span></a>
</li> </li>
@@ -908,7 +933,8 @@
title="{% trans 'Manage Postfix' %}"><span>{% trans "Manage Postfix" %}</span></a> title="{% trans 'Manage Postfix' %}"><span>{% trans "Manage Postfix" %}</span></a>
</li> </li>
<li><a href="{% url 'managePureFtpd' %}" <li><a href="{% url 'managePureFtpd' %}"
title="{% trans 'Manage FTP' %}"><span>{% trans "Manage FTP" %}</span></a></li> title="{% trans 'Manage FTP' %}"><span>{% trans "Manage FTP" %}</span></a>
</li>
</ul> </ul>
</div><!-- .sidebar-submenu --> </div><!-- .sidebar-submenu -->
@@ -987,8 +1013,8 @@
{% endwith %} {% endwith %}
</div> </div>
{% block footer_scripts %} {% block footer_scripts %}
{% endblock %} {% endblock %}
</body> </body>
</html> </html>

23
baseTemplate/views.py
View File

@@ -1,6 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.shortcuts import render,redirect from django.shortcuts import render,redirect
from django.http import HttpResponse from django.http import HttpResponse
from plogical.getSystemInformation import SystemInformation from plogical.getSystemInformation import SystemInformation
@@ -16,6 +14,7 @@ from plogical.acl import ACLManager
from manageServices.models import PDNSStatus from manageServices.models import PDNSStatus
from django.views.decorators.csrf import ensure_csrf_cookie from django.views.decorators.csrf import ensure_csrf_cookie
from plogical.processUtilities import ProcessUtilities from plogical.processUtilities import ProcessUtilities
from plogical.httpProc import httpProc
# Create your views here. # Create your views here.
VERSION = '2.0' VERSION = '2.0'
@@ -23,22 +22,12 @@ BUILD = 3
@ensure_csrf_cookie @ensure_csrf_cookie
def renderBase(request): def renderBase(request):
try: template = 'baseTemplate/homePage.html'
userID = request.session['userID']
currentACL = ACLManager.loadedACL(userID)
if currentACL['admin'] == 1:
admin = 1
else:
admin = 0
cpuRamDisk = SystemInformation.cpuRamDisk() cpuRamDisk = SystemInformation.cpuRamDisk()
finaData = {'ramUsage': cpuRamDisk['ramUsage'], 'cpuUsage': cpuRamDisk['cpuUsage'],
finaData = {"admin": admin,'ramUsage':cpuRamDisk['ramUsage'],'cpuUsage':cpuRamDisk['cpuUsage'],'diskUsage':cpuRamDisk['diskUsage'] } 'diskUsage': cpuRamDisk['diskUsage']}
proc = httpProc(request, template, finaData)
return render(request, 'baseTemplate/homePage.html', finaData) return proc.render()
except KeyError:
return redirect(loadLoginPage)
def getAdminStatus(request): def getAdminStatus(request):
try: try:

79
plogical/acl.py
View File

@@ -76,73 +76,76 @@ class ACLManager:
else: else:
finalResponse['admin'] = 0 finalResponse['admin'] = 0
config = json.loads(admin.acl.config)
acl = ACL.objects.get(name=admin.acl.name) acl = ACL.objects.get(name=admin.acl.name)
finalResponse['versionManagement'] = acl.versionManagement finalResponse['versionManagement'] = config['versionManagement']
## User Management ## User Management
finalResponse['createNewUser'] = acl.createNewUser finalResponse['createNewUser'] = config['createNewUser']
finalResponse['listUsers'] = acl.listUsers finalResponse['listUsers'] = config['listUsers']
finalResponse['deleteUser'] = acl.deleteUser finalResponse['deleteUser'] = config['deleteUser']
finalResponse['changeUserACL'] = acl.changeUserACL finalResponse['changeUserACL'] = config['changeUserACL']
finalResponse['resellerCenter'] = acl.resellerCenter finalResponse['resellerCenter'] = config['resellerCenter']
## Website Management ## Website Management
finalResponse['createWebsite'] = acl.createWebsite finalResponse['createWebsite'] = config['createWebsite']
finalResponse['modifyWebsite'] = acl.modifyWebsite finalResponse['modifyWebsite'] = config['modifyWebsite']
finalResponse['suspendWebsite'] = acl.suspendWebsite finalResponse['suspendWebsite'] = config['suspendWebsite']
finalResponse['deleteWebsite'] = acl.deleteWebsite finalResponse['deleteWebsite'] = config['deleteWebsite']
## Package Management ## Package Management
finalResponse['createPackage'] = acl.createPackage finalResponse['createPackage'] = config['createPackage']
finalResponse['listPackages'] = acl.listPackages finalResponse['listPackages'] = config['listPackages']
finalResponse['deletePackage'] = acl.deletePackage finalResponse['deletePackage'] = config['deletePackage']
finalResponse['modifyPackage'] = acl.modifyPackage finalResponse['modifyPackage'] = config['modifyPackage']
## Database Management ## Database Management
finalResponse['createDatabase'] = acl.createDatabase finalResponse['createDatabase'] = config['createDatabase']
finalResponse['deleteDatabase'] = acl.deleteDatabase finalResponse['deleteDatabase'] = config['deleteDatabase']
finalResponse['listDatabases'] = acl.listDatabases finalResponse['listDatabases'] = config['listDatabases']
## DNS Management ## DNS Management
finalResponse['createNameServer'] = acl.createNameServer finalResponse['createNameServer'] = config['createNameServer']
finalResponse['createDNSZone'] = acl.createDNSZone finalResponse['createDNSZone'] = config['createDNSZone']
finalResponse['deleteZone'] = acl.deleteZone finalResponse['deleteZone'] = config['deleteZone']
finalResponse['addDeleteRecords'] = acl.addDeleteRecords finalResponse['addDeleteRecords'] = config['addDeleteRecords']
## Email Management ## Email Management
finalResponse['createEmail'] = acl.createEmail finalResponse['createEmail'] = config['createEmail']
finalResponse['listEmails'] = acl.listEmails finalResponse['listEmails'] = config['listEmails']
finalResponse['deleteEmail'] = acl.deleteEmail finalResponse['deleteEmail'] = config['deleteEmail']
finalResponse['emailForwarding'] = acl.emailForwarding finalResponse['emailForwarding'] = config['emailForwarding']
finalResponse['changeEmailPassword'] = acl.changeEmailPassword finalResponse['changeEmailPassword'] = config['changeEmailPassword']
finalResponse['dkimManager'] = acl.dkimManager finalResponse['dkimManager'] = config['dkimManager']
## FTP Management ## FTP Management
finalResponse['createFTPAccount'] = acl.createFTPAccount finalResponse['createFTPAccount'] = config['createFTPAccount']
finalResponse['deleteFTPAccount'] = acl.deleteFTPAccount finalResponse['deleteFTPAccount'] = config['deleteFTPAccount']
finalResponse['listFTPAccounts'] = acl.listFTPAccounts finalResponse['listFTPAccounts'] = config['listFTPAccounts']
## Backup Management ## Backup Management
finalResponse['createBackup'] = acl.createBackup finalResponse['createBackup'] = config['createBackup']
finalResponse['restoreBackup'] = acl.restoreBackup finalResponse['googleDriveBackups'] = config['googleDriveBackups']
finalResponse['addDeleteDestinations'] = acl.addDeleteDestinations finalResponse['restoreBackup'] = config['restoreBackup']
finalResponse['scheDuleBackups'] = acl.scheDuleBackups finalResponse['addDeleteDestinations'] = config['addDeleteDestinations']
finalResponse['remoteBackups'] = acl.remoteBackups finalResponse['scheDuleBackups'] = config['scheDuleBackups']
finalResponse['remoteBackups'] = config['remoteBackups']
## SSL Management ## SSL Management
finalResponse['manageSSL'] = acl.manageSSL finalResponse['manageSSL'] = config['manageSSL']
finalResponse['hostnameSSL'] = acl.hostnameSSL finalResponse['hostnameSSL'] = config['hostnameSSL']
finalResponse['mailServerSSL'] = acl.mailServerSSL finalResponse['mailServerSSL'] = config['mailServerSSL']
return finalResponse return finalResponse

9
plogical/httpProc.py
View File

@@ -12,18 +12,17 @@ class httpProc:
def render(self): def render(self):
try: try:
from loginSystem.models import Administrator
from plogical.acl import ACLManager
userID = self.request.session['userID'] userID = self.request.session['userID']
admin = self.data['admin'] admin = Administrator.objects.get(pk=userID)
### ###
if self.data == None: if self.data == None:
self.data = {} self.data = {}
self.data['fullName'] = admin.fullName self.data.update(ACLManager.loadedACL(userID))
self.data['ownerEmail'] = admin.email
return render(self.request, self.templateName, self.data) return render(self.request, self.templateName, self.data)
except BaseException as msg: except BaseException as msg:

6
userManagment/static/userManagment/userManagment.js
View File

@@ -458,6 +458,7 @@ app.controller('deleteUser', function ($scope, $http) {
/* Java script code to create acl */ /* Java script code to create acl */
app.controller('createACLCTRL', function ($scope, $http) { app.controller('createACLCTRL', function ($scope, $http) {
$scope.aclLoading = true; $scope.aclLoading = true;
@@ -520,11 +521,13 @@ app.controller('createACLCTRL', function ($scope, $http) {
// Backup Management // Backup Management
$scope.createBackup = true; $scope.createBackup = true;
$scope.googleDriveBackups = true;
$scope.restoreBackup = false; $scope.restoreBackup = false;
$scope.addDeleteDestinations = false; $scope.addDeleteDestinations = false;
$scope.scheDuleBackups = false; $scope.scheDuleBackups = false;
$scope.remoteBackups = false; $scope.remoteBackups = false;
// SSL Management // SSL Management
$scope.manageSSL = true; $scope.manageSSL = true;
@@ -599,6 +602,7 @@ app.controller('createACLCTRL', function ($scope, $http) {
// Backup Management // Backup Management
createBackup: $scope.createBackup, createBackup: $scope.createBackup,
googleDriveBackups: $scope.googleDriveBackups,
restoreBackup: $scope.restoreBackup, restoreBackup: $scope.restoreBackup,
addDeleteDestinations: $scope.addDeleteDestinations, addDeleteDestinations: $scope.addDeleteDestinations,
scheDuleBackups: $scope.scheDuleBackups, scheDuleBackups: $scope.scheDuleBackups,
@@ -976,6 +980,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
// Backup Management // Backup Management
$scope.createBackup = Boolean(response.data.createBackup); $scope.createBackup = Boolean(response.data.createBackup);
$scope.googleDriveBackups = Boolean(response.data.googleDriveBackups);
$scope.restoreBackup = Boolean(response.data.restoreBackup); $scope.restoreBackup = Boolean(response.data.restoreBackup);
$scope.addDeleteDestinations = Boolean(response.data.addDeleteDestinations); $scope.addDeleteDestinations = Boolean(response.data.addDeleteDestinations);
$scope.scheDuleBackups = Boolean(response.data.scheDuleBackups); $scope.scheDuleBackups = Boolean(response.data.scheDuleBackups);
@@ -1076,6 +1081,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
// Backup Management // Backup Management
createBackup: $scope.createBackup, createBackup: $scope.createBackup,
googleDriveBackups: $scope.googleDriveBackups,
restoreBackup: $scope.restoreBackup, restoreBackup: $scope.restoreBackup,
addDeleteDestinations: $scope.addDeleteDestinations, addDeleteDestinations: $scope.addDeleteDestinations,
scheDuleBackups: $scope.scheDuleBackups, scheDuleBackups: $scope.scheDuleBackups,

11
userManagment/templates/userManagment/createACL.html
View File

@@ -353,6 +353,17 @@
</label> </label>
</div> </div>
</div> </div>
<label class="col-sm-3 control-label"></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
<input ng-model="googleDriveBackups" type="checkbox" value="">
{% trans "Google Drive Backups" %}
</label>
</div>
</div>
<label class="col-sm-3 control-label"></label> <label class="col-sm-3 control-label"></label>
<div class="col-sm-9"> <div class="col-sm-9">
<div class="checkbox"> <div class="checkbox">

11
userManagment/templates/userManagment/modifyACL.html
View File

@@ -357,6 +357,17 @@
</label> </label>
</div> </div>
</div> </div>
<label class="col-sm-3 control-label">{% trans "" %}</label>
<div class="col-sm-9">
<div class="checkbox">
<label>
<input ng-model="googleDriveBackups" type="checkbox" value="">
{% trans "Google Drive Backups" %}
</label>
</div>
</div>
<label class="col-sm-3 control-label"></label> <label class="col-sm-3 control-label"></label>
<div class="col-sm-9"> <div class="col-sm-9">
<div class="checkbox"> <div class="checkbox">

209
userManagment/views.py
View File

@@ -514,74 +514,12 @@ def createACLFunc(request):
## Version Management ## Version Management
newACL = ACL(name=data['aclName'], if data['makeAdmin']:
adminStatus=int(data['makeAdmin']), data['adminStatus'] = 1
else:
data['adminStatus'] = 0
versionManagement=int(data['versionManagement']), newACL = ACL(name=data['aclName'],config=json.dumps(data))
## User Management
createNewUser=int(data['createNewUser']),
listUsers=int(data['listUsers']),
resellerCenter=int(data['resellerCenter']),
deleteUser=int(data['deleteUser']),
changeUserACL=int(data['changeUserACL']),
## Website Management
createWebsite=int(data['createWebsite']),
modifyWebsite=int(data['modifyWebsite']),
suspendWebsite=int(data['suspendWebsite']),
deleteWebsite=int(data['deleteWebsite']),
## Package Management
createPackage=int(data['createPackage']),
listPackages=int(data['listPackages']),
deletePackage=int(data['deletePackage']),
modifyPackage=int(data['modifyPackage']),
## Database Management
createDatabase=int(data['createDatabase']),
deleteDatabase=int(data['deleteDatabase']),
listDatabases=int(data['listDatabases']),
## DNS Management
createNameServer=int(data['createNameServer']),
createDNSZone=int(data['createDNSZone']),
deleteZone=int(data['deleteZone']),
addDeleteRecords=int(data['addDeleteRecords']),
## Email Management
createEmail=int(data['createEmail']),
listEmails=int(data['listEmails']),
deleteEmail=int(data['deleteEmail']),
emailForwarding=int(data['emailForwarding']),
changeEmailPassword=int(data['changeEmailPassword']),
dkimManager=int(data['dkimManager']),
## FTP Management
createFTPAccount=int(data['createFTPAccount']),
deleteFTPAccount=int(data['deleteFTPAccount']),
listFTPAccounts=int(data['listFTPAccounts']),
## Backup Management
createBackup=int(data['createBackup']),
restoreBackup=int(data['restoreBackup']),
addDeleteDestinations=int(data['addDeleteDestinations']),
scheDuleBackups=int(data['scheDuleBackups']),
remoteBackups=int(data['remoteBackups']),
## SSL Management
manageSSL=int(data['manageSSL']),
hostnameSSL=int(data['hostnameSSL']),
mailServerSSL=int(data['mailServerSSL']),
)
newACL.save() newACL.save()
finalResponse = {'status': 1} finalResponse = {'status': 1}
@@ -658,75 +596,8 @@ def fetchACLDetails(request):
## Version Management ## Version Management
finalResponse = {} finalResponse = {}
acl = ACL.objects.get(name=data['aclToModify']) acl = ACL.objects.get(name=data['aclToModify'])
finalResponse['versionManagement'] = acl.versionManagement finalResponse = json.loads(acl.config)
finalResponse['adminStatus'] = acl.adminStatus
## User Management
finalResponse['createNewUser'] = acl.createNewUser
finalResponse['listUsers'] = acl.listUsers
finalResponse['resellerCenter'] = acl.resellerCenter
finalResponse['deleteUser'] = acl.deleteUser
finalResponse['changeUserACL'] = acl.changeUserACL
## Website Management
finalResponse['createWebsite'] = acl.createWebsite
finalResponse['modifyWebsite'] = acl.modifyWebsite
finalResponse['suspendWebsite'] = acl.suspendWebsite
finalResponse['deleteWebsite'] = acl.deleteWebsite
## Package Management
finalResponse['createPackage'] = acl.createPackage
finalResponse['listPackages'] = acl.listPackages
finalResponse['deletePackage'] = acl.deletePackage
finalResponse['modifyPackage'] = acl.modifyPackage
## Database Management
finalResponse['createDatabase'] = acl.createDatabase
finalResponse['deleteDatabase'] = acl.deleteDatabase
finalResponse['listDatabases'] = acl.listDatabases
## DNS Management
finalResponse['createNameServer'] = acl.createNameServer
finalResponse['createDNSZone'] = acl.createDNSZone
finalResponse['deleteZone'] = acl.deleteZone
finalResponse['addDeleteRecords'] = acl.addDeleteRecords
## Email Management
finalResponse['createEmail'] = acl.createEmail
finalResponse['listEmails'] = acl.listEmails
finalResponse['deleteEmail'] = acl.deleteEmail
finalResponse['emailForwarding'] = acl.emailForwarding
finalResponse['changeEmailPassword'] = acl.changeEmailPassword
finalResponse['dkimManager'] = acl.dkimManager
## FTP Management
finalResponse['createFTPAccount'] = acl.createFTPAccount
finalResponse['deleteFTPAccount'] = acl.deleteFTPAccount
finalResponse['listFTPAccounts'] = acl.listFTPAccounts
## Backup Management
finalResponse['createBackup'] = acl.createBackup
finalResponse['restoreBackup'] = acl.restoreBackup
finalResponse['addDeleteDestinations'] = acl.addDeleteDestinations
finalResponse['scheDuleBackups'] = acl.scheDuleBackups
finalResponse['remoteBackups'] = acl.remoteBackups
## SSL Management
finalResponse['manageSSL'] = acl.manageSSL
finalResponse['hostnameSSL'] = acl.hostnameSSL
finalResponse['mailServerSSL'] = acl.mailServerSSL
finalResponse['status'] = 1 finalResponse['status'] = 1
else: else:
return ACLManager.loadErrorJson() return ACLManager.loadErrorJson()
@@ -750,73 +621,7 @@ def submitACLModifications(request):
## Version Management ## Version Management
acl = ACL.objects.get(name=data['aclToModify']) acl = ACL.objects.get(name=data['aclToModify'])
acl.adminStatus = int(data['adminStatus']) acl.config=json.dumps(data)
acl.versionManagement = int(data['versionManagement'])
## User Management
acl.createNewUser = int(data['createNewUser'])
acl.listUsers = int(data['listUsers'])
acl.resellerCenter = int(data['resellerCenter'])
acl.deleteUser = int(data['deleteUser'])
acl.changeUserACL = int(data['changeUserACL'])
## Website Management
acl.createWebsite = int(data['createWebsite'])
acl.modifyWebsite = int(data['modifyWebsite'])
acl.suspendWebsite = int(data['suspendWebsite'])
acl.deleteWebsite = int(data['deleteWebsite'])
## Package Management
acl.createPackage = int(data['createPackage'])
acl.listPackages = int(data['listPackages'])
acl.deletePackage = int(data['deletePackage'])
acl.modifyPackage = int(data['modifyPackage'])
## Database Management
acl.createDatabase = int(data['createDatabase'])
acl.deleteDatabase = int(data['deleteDatabase'])
acl.listDatabases = int(data['listDatabases'])
## DNS Management
acl.createNameServer = int(data['createNameServer'])
acl.createDNSZone = int(data['createDNSZone'])
acl.deleteZone = int(data['deleteZone'])
acl.addDeleteRecords = int(data['addDeleteRecords'])
## Email Management
acl.createEmail = int(data['createEmail'])
acl.listEmails = int(data['listEmails'])
acl.deleteEmail = int(data['deleteEmail'])
acl.emailForwarding = int(data['emailForwarding'])
acl.changeEmailPassword = int(data['changeEmailPassword'])
acl.dkimManager = int(data['dkimManager'])
## FTP Management
acl.createFTPAccount = int(data['createFTPAccount'])
acl.deleteFTPAccount = int(data['deleteFTPAccount'])
acl.listFTPAccounts = int(data['listFTPAccounts'])
## Backup Management
acl.createBackup = int(data['createBackup'])
acl.restoreBackup = int(data['restoreBackup'])
acl.addDeleteDestinations = int(data['addDeleteDestinations'])
acl.scheDuleBackups = int(data['scheDuleBackups'])
acl.remoteBackups = int(data['remoteBackups'])
## SSL Management
acl.manageSSL = int(data['manageSSL'])
acl.hostnameSSL = int(data['hostnameSSL'])
acl.mailServerSSL = int(data['mailServerSSL'])
acl.save() acl.save()
if int(data['adminStatus']) == 1: if int(data['adminStatus']) == 1: