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

Adjust spelling for consistency

Browse Source
This commit is contained in:
Michael Ramsey
2021-04-15 19:47:12 -04:00
parent 11969008f9
commit 765359b2b1
15 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -4,3 +4,4 @@
*.pyc *.pyc
.idea .idea
venv venv
/.venv/

18
IncBackups/views.py
View File

@@ -500,7 +500,7 @@ def restore_point(request):
def schedule_backups(request): def schedule_backups(request):
try: try:
user_id, current_acl = _get_user_acl(request) user_id, current_acl = _get_user_acl(request)
if ACLManager.currentContextPermission(current_acl, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(current_acl, 'scheduleBackups') == 0:
return ACLManager.loadError() return ACLManager.loadError()
websites = ACLManager.findAllSites(current_acl, user_id) websites = ACLManager.findAllSites(current_acl, user_id)
@@ -508,7 +508,7 @@ def schedule_backups(request):
destinations = _get_destinations(local=True) destinations = _get_destinations(local=True)
return def_renderer(request, 'IncBackups/backupSchedule.html', return def_renderer(request, 'IncBackups/backupSchedule.html',
{'websiteList': websites, 'destinations': destinations}, 'scheDuleBackups') {'websiteList': websites, 'destinations': destinations}, 'scheduleBackups')
except BaseException as msg: except BaseException as msg:
logging.writeToFile(str(msg)) logging.writeToFile(str(msg))
return redirect(loadLoginPage) return redirect(loadLoginPage)
@@ -517,7 +517,7 @@ def schedule_backups(request):
def submit_backup_schedule(request): def submit_backup_schedule(request):
try: try:
user_id, current_acl = _get_user_acl(request) user_id, current_acl = _get_user_acl(request)
if ACLManager.currentContextPermission(current_acl, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(current_acl, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
data = json.loads(request.body) data = json.loads(request.body)
@@ -548,7 +548,7 @@ def submit_backup_schedule(request):
def get_current_backup_schedules(request): def get_current_backup_schedules(request):
try: try:
user_id, current_acl = _get_user_acl(request) user_id, current_acl = _get_user_acl(request)
if ACLManager.currentContextPermission(current_acl, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(current_acl, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('fetchStatus', 0) return ACLManager.loadErrorJson('fetchStatus', 0)
records = BackupJob.objects.all() records = BackupJob.objects.all()
@@ -571,7 +571,7 @@ def get_current_backup_schedules(request):
def fetch_sites(request): def fetch_sites(request):
try: try:
user_id, current_acl = _get_user_acl(request) user_id, current_acl = _get_user_acl(request)
if ACLManager.currentContextPermission(current_acl, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(current_acl, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('fetchStatus', 0) return ACLManager.loadErrorJson('fetchStatus', 0)
data = json.loads(request.body) data = json.loads(request.body)
@@ -596,7 +596,7 @@ def fetch_sites(request):
def schedule_delete(request): def schedule_delete(request):
try: try:
user_id, current_acl = _get_user_acl(request) user_id, current_acl = _get_user_acl(request)
if ACLManager.currentContextPermission(current_acl, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(current_acl, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
data = json.loads(request.body) data = json.loads(request.body)
@@ -633,7 +633,7 @@ def restore_remote_backups(request):
def save_changes(request): def save_changes(request):
try: try:
user_id, current_acl = _get_user_acl(request) user_id, current_acl = _get_user_acl(request)
if ACLManager.currentContextPermission(current_acl, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(current_acl, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
data = json.loads(request.body) data = json.loads(request.body)
@@ -661,7 +661,7 @@ def save_changes(request):
def remove_site(request): def remove_site(request):
try: try:
_, current_acl = _get_user_acl(request) _, current_acl = _get_user_acl(request)
if ACLManager.currentContextPermission(current_acl, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(current_acl, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
data = json.loads(request.body) data = json.loads(request.body)
@@ -682,7 +682,7 @@ def remove_site(request):
def add_website(request): def add_website(request):
try: try:
_, current_acl = _get_user_acl(request) _, current_acl = _get_user_acl(request)
if ACLManager.currentContextPermission(current_acl, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(current_acl, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
data = json.loads(request.body) data = json.loads(request.body)

22
backup/backupManager.py
View File

@@ -845,14 +845,14 @@ class BackupManager:
dests.append(dest.name) dests.append(dest.name)
websitesName = ACLManager.findAllSites(currentACL, userID) websitesName = ACLManager.findAllSites(currentACL, userID)
proc = httpProc(request, 'backup/backupSchedule.html', {'destinations': dests, 'websites': websitesName}, proc = httpProc(request, 'backup/backupSchedule.html', {'destinations': dests, 'websites': websitesName},
'scheDuleBackups') 'scheduleBackups')
return proc.render() return proc.render()
def getCurrentBackupSchedules(self, userID=None, data=None): def getCurrentBackupSchedules(self, userID=None, data=None):
try: try:
currentACL = ACLManager.loadedACL(userID) currentACL = ACLManager.loadedACL(userID)
if ACLManager.currentContextPermission(currentACL, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(currentACL, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('fetchStatus', 0) return ACLManager.loadErrorJson('fetchStatus', 0)
records = backupSchedules.objects.all() records = backupSchedules.objects.all()
@@ -889,7 +889,7 @@ class BackupManager:
currentACL = ACLManager.loadedACL(userID) currentACL = ACLManager.loadedACL(userID)
if ACLManager.currentContextPermission(currentACL, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(currentACL, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
nbd = NormalBackupDests.objects.get(name=selectedAccount) nbd = NormalBackupDests.objects.get(name=selectedAccount)
@@ -910,7 +910,7 @@ class BackupManager:
try: try:
currentACL = ACLManager.loadedACL(userID) currentACL = ACLManager.loadedACL(userID)
if ACLManager.currentContextPermission(currentACL, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(currentACL, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
backupDest = data['destLoc'] backupDest = data['destLoc']
@@ -1413,7 +1413,7 @@ class BackupManager:
page = int(str(data['page']).strip('\n')) page = int(str(data['page']).strip('\n'))
if ACLManager.currentContextPermission(currentACL, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(currentACL, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
nbd = NormalBackupJobs.objects.get(name=selectedAccount) nbd = NormalBackupJobs.objects.get(name=selectedAccount)
@@ -1499,7 +1499,7 @@ class BackupManager:
nbd = NormalBackupDests.objects.get(name=selectedAccount) nbd = NormalBackupDests.objects.get(name=selectedAccount)
if ACLManager.currentContextPermission(currentACL, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(currentACL, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
allJobs = nbd.normalbackupjobs_set.all() allJobs = nbd.normalbackupjobs_set.all()
@@ -1526,7 +1526,7 @@ class BackupManager:
data = json.loads(request.body) data = json.loads(request.body)
if ACLManager.currentContextPermission(currentACL, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(currentACL, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
selectedJob = data['selectedJob'] selectedJob = data['selectedJob']
@@ -1587,7 +1587,7 @@ class BackupManager:
nbj = NormalBackupJobs.objects.get(name=selectedJob) nbj = NormalBackupJobs.objects.get(name=selectedJob)
website = Websites.objects.get(domain=selectedWebsite) website = Websites.objects.get(domain=selectedWebsite)
if ACLManager.currentContextPermission(currentACL, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(currentACL, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
try: try:
@@ -1618,7 +1618,7 @@ class BackupManager:
nbj = NormalBackupJobs.objects.get(name=selectedJob) nbj = NormalBackupJobs.objects.get(name=selectedJob)
if ACLManager.currentContextPermission(currentACL, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(currentACL, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
config = json.loads(nbj.config) config = json.loads(nbj.config)
@@ -1649,7 +1649,7 @@ class BackupManager:
nbj = NormalBackupJobs.objects.get(name=selectedJob) nbj = NormalBackupJobs.objects.get(name=selectedJob)
if ACLManager.currentContextPermission(currentACL, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(currentACL, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
nbj.delete() nbj.delete()
@@ -1676,7 +1676,7 @@ class BackupManager:
recordsToShow = int(data['recordsToShow']) recordsToShow = int(data['recordsToShow'])
page = int(str(data['page']).strip('\n')) page = int(str(data['page']).strip('\n'))
if ACLManager.currentContextPermission(currentACL, 'scheDuleBackups') == 0: if ACLManager.currentContextPermission(currentACL, 'scheduleBackups') == 0:
return ACLManager.loadErrorJson('scheduleStatus', 0) return ACLManager.loadErrorJson('scheduleStatus', 0)
nbj = NormalBackupJobs.objects.get(name=selectedJob) nbj = NormalBackupJobs.objects.get(name=selectedJob)

2
backup/templates/backup/index.html
View File

@@ -69,7 +69,7 @@
{% endif %} {% endif %}
{% if scheDuleBackups or admin %} {% if scheduleBackups or admin %}
<div class="col-md-3 btn-min-width"> <div class="col-md-3 btn-min-width">
<a href="{% url 'scheduleBackup' %}" title="{% trans 'Schedule Back up' %}" class="tile-box tile-box-shortcut btn-primary"> <a href="{% url 'scheduleBackup' %}" title="{% trans 'Schedule Back up' %}" class="tile-box tile-box-shortcut btn-primary">

4
baseTemplate/static/baseTemplate/custom-js/system-status.js
View File

@@ -317,8 +317,8 @@ app.controller('adminController', function ($scope, $http, $timeout) {
$('.addDeleteDestinations').hide(); $('.addDeleteDestinations').hide();
} }
if (!Boolean(response.data.scheDuleBackups)) { if (!Boolean(response.data.scheduleBackups)) {
$('.scheDuleBackups').hide(); $('.scheduleBackups').hide();
} }
if (!Boolean(response.data.remoteBackups)) { if (!Boolean(response.data.remoteBackups)) {

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

@@ -657,7 +657,7 @@
title="{% trans 'Add Destination' %}"><span>{% trans "Add/Delete Destination" %}</span></a> title="{% trans 'Add Destination' %}"><span>{% trans "Add/Delete Destination" %}</span></a>
</li> </li>
{% endif %} {% endif %}
{% if admin or scheDuleBackups %} {% if admin or scheduleBackups %}
<li><a href="{% url 'scheduleBackup' %}" <li><a href="{% url 'scheduleBackup' %}"
title="{% trans 'Schedule Back up' %}"><span>{% trans "Schedule Back up" %}</span></a> title="{% trans 'Schedule Back up' %}"><span>{% trans "Schedule Back up" %}</span></a>
</li> </li>

2
loginSystem/models.py
View File

@@ -64,7 +64,7 @@ class ACL(models.Model):
createBackup = models.IntegerField(default=1) createBackup = models.IntegerField(default=1)
restoreBackup = models.IntegerField(default=0) restoreBackup = models.IntegerField(default=0)
addDeleteDestinations = models.IntegerField(default=0) addDeleteDestinations = models.IntegerField(default=0)
scheDuleBackups = models.IntegerField(default=0) scheduleBackups = models.IntegerField(default=0)
remoteBackups = models.IntegerField(default=0) remoteBackups = models.IntegerField(default=0)
## SSL Management ## SSL Management

8
plogical/acl.py
View File

@@ -23,7 +23,7 @@ class ACLManager:
'"listDatabases": 1, "createNameServer": 1, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \ '"listDatabases": 1, "createNameServer": 1, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \
'"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \ '"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \
'"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \ '"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \
' "restoreBackup": 1, "addDeleteDestinations": 1, "scheDuleBackups": 1, "remoteBackups": 1, "googleDriveBackups": 1, "manageSSL": 1, ' \ ' "restoreBackup": 1, "addDeleteDestinations": 1, "scheduleBackups": 1, "remoteBackups": 1, "googleDriveBackups": 1, "manageSSL": 1, ' \
'"hostnameSSL": 1, "mailServerSSL": 1 }' '"hostnameSSL": 1, "mailServerSSL": 1 }'
ResellerACL = '{"adminStatus":0, "versionManagement": 1, "createNewUser": 1, "listUsers": 1, "deleteUser": 1 , "resellerCenter": 1, ' \ ResellerACL = '{"adminStatus":0, "versionManagement": 1, "createNewUser": 1, "listUsers": 1, "deleteUser": 1 , "resellerCenter": 1, ' \
@@ -32,7 +32,7 @@ class ACLManager:
'"listDatabases": 1, "createNameServer": 1, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \ '"listDatabases": 1, "createNameServer": 1, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \
'"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \ '"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \
'"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \ '"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \
' "restoreBackup": 1, "addDeleteDestinations": 0, "scheDuleBackups": 0, "remoteBackups": 0, "googleDriveBackups": 1, "manageSSL": 1, ' \ ' "restoreBackup": 1, "addDeleteDestinations": 0, "scheduleBackups": 0, "remoteBackups": 0, "googleDriveBackups": 1, "manageSSL": 1, ' \
'"hostnameSSL": 0, "mailServerSSL": 0 }' '"hostnameSSL": 0, "mailServerSSL": 0 }'
UserACL = '{"adminStatus":0, "versionManagement": 1, "createNewUser": 0, "listUsers": 0, "deleteUser": 0 , "resellerCenter": 0, ' \ UserACL = '{"adminStatus":0, "versionManagement": 1, "createNewUser": 0, "listUsers": 0, "deleteUser": 0 , "resellerCenter": 0, ' \
@@ -41,7 +41,7 @@ class ACLManager:
'"listDatabases": 1, "createNameServer": 0, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \ '"listDatabases": 1, "createNameServer": 0, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \
'"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \ '"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \
'"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \ '"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \
' "restoreBackup": 0, "addDeleteDestinations": 0, "scheDuleBackups": 0, "remoteBackups": 0, "googleDriveBackups": 1, "manageSSL": 1, ' \ ' "restoreBackup": 0, "addDeleteDestinations": 0, "scheduleBackups": 0, "remoteBackups": 0, "googleDriveBackups": 1, "manageSSL": 1, ' \
'"hostnameSSL": 0, "mailServerSSL": 0 }' '"hostnameSSL": 0, "mailServerSSL": 0 }'
@staticmethod @staticmethod
def FindIfChild(): def FindIfChild():
@@ -180,7 +180,7 @@ class ACLManager:
finalResponse['googleDriveBackups'] = config['googleDriveBackups'] finalResponse['googleDriveBackups'] = config['googleDriveBackups']
finalResponse['restoreBackup'] = config['restoreBackup'] finalResponse['restoreBackup'] = config['restoreBackup']
finalResponse['addDeleteDestinations'] = config['addDeleteDestinations'] finalResponse['addDeleteDestinations'] = config['addDeleteDestinations']
finalResponse['scheDuleBackups'] = config['scheDuleBackups'] finalResponse['scheduleBackups'] = config['scheduleBackups']
finalResponse['remoteBackups'] = config['remoteBackups'] finalResponse['remoteBackups'] = config['remoteBackups']
## SSL Management ## SSL Management

12
plogical/upgrade.py
View File

@@ -39,7 +39,7 @@ class Upgrade:
'"listDatabases": 1, "createNameServer": 1, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \ '"listDatabases": 1, "createNameServer": 1, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \
'"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \ '"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \
'"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \ '"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \
' "restoreBackup": 1, "addDeleteDestinations": 1, "scheDuleBackups": 1, "remoteBackups": 1, "googleDriveBackups": 1, "manageSSL": 1, ' \ ' "restoreBackup": 1, "addDeleteDestinations": 1, "scheduleBackups": 1, "remoteBackups": 1, "googleDriveBackups": 1, "manageSSL": 1, ' \
'"hostnameSSL": 1, "mailServerSSL": 1 }' '"hostnameSSL": 1, "mailServerSSL": 1 }'
ResellerACL = '{"adminStatus":0, "versionManagement": 1, "createNewUser": 1, "listUsers": 1, "deleteUser": 1 , "resellerCenter": 1, ' \ ResellerACL = '{"adminStatus":0, "versionManagement": 1, "createNewUser": 1, "listUsers": 1, "deleteUser": 1 , "resellerCenter": 1, ' \
@@ -48,7 +48,7 @@ class Upgrade:
'"listDatabases": 1, "createNameServer": 1, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \ '"listDatabases": 1, "createNameServer": 1, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \
'"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \ '"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \
'"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \ '"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \
' "restoreBackup": 1, "addDeleteDestinations": 0, "scheDuleBackups": 0, "remoteBackups": 0, "googleDriveBackups": 1, "manageSSL": 1, ' \ ' "restoreBackup": 1, "addDeleteDestinations": 0, "scheduleBackups": 0, "remoteBackups": 0, "googleDriveBackups": 1, "manageSSL": 1, ' \
'"hostnameSSL": 0, "mailServerSSL": 0 }' '"hostnameSSL": 0, "mailServerSSL": 0 }'
UserACL = '{"adminStatus":0, "versionManagement": 1, "createNewUser": 0, "listUsers": 0, "deleteUser": 0 , "resellerCenter": 0, ' \ UserACL = '{"adminStatus":0, "versionManagement": 1, "createNewUser": 0, "listUsers": 0, "deleteUser": 0 , "resellerCenter": 0, ' \
@@ -57,7 +57,7 @@ class Upgrade:
'"listDatabases": 1, "createNameServer": 0, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \ '"listDatabases": 1, "createNameServer": 0, "createDNSZone": 1, "deleteZone": 1, "addDeleteRecords": 1, ' \
'"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \ '"createEmail": 1, "listEmails": 1, "deleteEmail": 1, "emailForwarding": 1, "changeEmailPassword": 1, ' \
'"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \ '"dkimManager": 1, "createFTPAccount": 1, "deleteFTPAccount": 1, "listFTPAccounts": 1, "createBackup": 1,' \
' "restoreBackup": 0, "addDeleteDestinations": 0, "scheDuleBackups": 0, "remoteBackups": 0, "googleDriveBackups": 1, "manageSSL": 1, ' \ ' "restoreBackup": 0, "addDeleteDestinations": 0, "scheduleBackups": 0, "remoteBackups": 0, "googleDriveBackups": 1, "manageSSL": 1, ' \
'"hostnameSSL": 0, "mailServerSSL": 0 }' '"hostnameSSL": 0, "mailServerSSL": 0 }'
@staticmethod @staticmethod
@@ -602,7 +602,7 @@ imap_folder_list_limit = 0
try: try:
cursor.execute( cursor.execute(
'CREATE TABLE `loginSystem_acl` (`id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY, `name` varchar(50) NOT NULL UNIQUE, `adminStatus` integer NOT NULL DEFAULT 0, `versionManagement` integer NOT NULL DEFAULT 0, `createNewUser` integer NOT NULL DEFAULT 0, `deleteUser` integer NOT NULL DEFAULT 0, `resellerCenter` integer NOT NULL DEFAULT 0, `changeUserACL` integer NOT NULL DEFAULT 0, `createWebsite` integer NOT NULL DEFAULT 0, `modifyWebsite` integer NOT NULL DEFAULT 0, `suspendWebsite` integer NOT NULL DEFAULT 0, `deleteWebsite` integer NOT NULL DEFAULT 0, `createPackage` integer NOT NULL DEFAULT 0, `deletePackage` integer NOT NULL DEFAULT 0, `modifyPackage` integer NOT NULL DEFAULT 0, `createDatabase` integer NOT NULL DEFAULT 0, `deleteDatabase` integer NOT NULL DEFAULT 0, `listDatabases` integer NOT NULL DEFAULT 0, `createNameServer` integer NOT NULL DEFAULT 0, `createDNSZone` integer NOT NULL DEFAULT 0, `deleteZone` integer NOT NULL DEFAULT 0, `addDeleteRecords` integer NOT NULL DEFAULT 0, `createEmail` integer NOT NULL DEFAULT 0, `deleteEmail` integer NOT NULL DEFAULT 0, `emailForwarding` integer NOT NULL DEFAULT 0, `changeEmailPassword` integer NOT NULL DEFAULT 0, `dkimManager` integer NOT NULL DEFAULT 0, `createFTPAccount` integer NOT NULL DEFAULT 0, `deleteFTPAccount` integer NOT NULL DEFAULT 0, `listFTPAccounts` integer NOT NULL DEFAULT 0, `createBackup` integer NOT NULL DEFAULT 0, `restoreBackup` integer NOT NULL DEFAULT 0, `addDeleteDestinations` integer NOT NULL DEFAULT 0, `scheDuleBackups` integer NOT NULL DEFAULT 0, `remoteBackups` integer NOT NULL DEFAULT 0, `manageSSL` integer NOT NULL DEFAULT 0, `hostnameSSL` integer NOT NULL DEFAULT 0, `mailServerSSL` integer NOT NULL DEFAULT 0)') 'CREATE TABLE `loginSystem_acl` (`id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY, `name` varchar(50) NOT NULL UNIQUE, `adminStatus` integer NOT NULL DEFAULT 0, `versionManagement` integer NOT NULL DEFAULT 0, `createNewUser` integer NOT NULL DEFAULT 0, `deleteUser` integer NOT NULL DEFAULT 0, `resellerCenter` integer NOT NULL DEFAULT 0, `changeUserACL` integer NOT NULL DEFAULT 0, `createWebsite` integer NOT NULL DEFAULT 0, `modifyWebsite` integer NOT NULL DEFAULT 0, `suspendWebsite` integer NOT NULL DEFAULT 0, `deleteWebsite` integer NOT NULL DEFAULT 0, `createPackage` integer NOT NULL DEFAULT 0, `deletePackage` integer NOT NULL DEFAULT 0, `modifyPackage` integer NOT NULL DEFAULT 0, `createDatabase` integer NOT NULL DEFAULT 0, `deleteDatabase` integer NOT NULL DEFAULT 0, `listDatabases` integer NOT NULL DEFAULT 0, `createNameServer` integer NOT NULL DEFAULT 0, `createDNSZone` integer NOT NULL DEFAULT 0, `deleteZone` integer NOT NULL DEFAULT 0, `addDeleteRecords` integer NOT NULL DEFAULT 0, `createEmail` integer NOT NULL DEFAULT 0, `deleteEmail` integer NOT NULL DEFAULT 0, `emailForwarding` integer NOT NULL DEFAULT 0, `changeEmailPassword` integer NOT NULL DEFAULT 0, `dkimManager` integer NOT NULL DEFAULT 0, `createFTPAccount` integer NOT NULL DEFAULT 0, `deleteFTPAccount` integer NOT NULL DEFAULT 0, `listFTPAccounts` integer NOT NULL DEFAULT 0, `createBackup` integer NOT NULL DEFAULT 0, `restoreBackup` integer NOT NULL DEFAULT 0, `addDeleteDestinations` integer NOT NULL DEFAULT 0, `scheduleBackups` integer NOT NULL DEFAULT 0, `remoteBackups` integer NOT NULL DEFAULT 0, `manageSSL` integer NOT NULL DEFAULT 0, `hostnameSSL` integer NOT NULL DEFAULT 0, `mailServerSSL` integer NOT NULL DEFAULT 0)')
except: except:
pass pass
try: try:
@@ -2412,7 +2412,7 @@ vmail
if acl.name == 'admin' or acl.name == 'reseller' or acl.name == 'user': if acl.name == 'admin' or acl.name == 'reseller' or acl.name == 'user':
continue continue
elif acl.config == '{}': elif acl.config == '{}':
acl.config = '{"adminStatus":%s, "versionManagement": %s, "createNewUser": %s, "listUsers": %s, "deleteUser": %s, "resellerCenter": %s, "changeUserACL": %s, "createWebsite": %s, "modifyWebsite": %s, "suspendWebsite": %s, "deleteWebsite": %s, "createPackage": %s, "listPackages": %s, "deletePackage": %s, "modifyPackage": %s, "createDatabase": %s, "deleteDatabase": %s, "listDatabases": %s, "createNameServer": %s, "createDNSZone": %s, "deleteZone": %s, "addDeleteRecords": %s, "createEmail": %s, "listEmails": %s, "deleteEmail": %s, "emailForwarding": %s, "changeEmailPassword": %s, "dkimManager": %s, "createFTPAccount": %s, "deleteFTPAccount": %s, "listFTPAccounts": %s, "createBackup": %s, "restoreBackup": %s, "addDeleteDestinations": %s, "scheDuleBackups": %s, "remoteBackups": %s, "googleDriveBackups": %s, "manageSSL": %s, "hostnameSSL": %s, "mailServerSSL": %s }' \ acl.config = '{"adminStatus":%s, "versionManagement": %s, "createNewUser": %s, "listUsers": %s, "deleteUser": %s, "resellerCenter": %s, "changeUserACL": %s, "createWebsite": %s, "modifyWebsite": %s, "suspendWebsite": %s, "deleteWebsite": %s, "createPackage": %s, "listPackages": %s, "deletePackage": %s, "modifyPackage": %s, "createDatabase": %s, "deleteDatabase": %s, "listDatabases": %s, "createNameServer": %s, "createDNSZone": %s, "deleteZone": %s, "addDeleteRecords": %s, "createEmail": %s, "listEmails": %s, "deleteEmail": %s, "emailForwarding": %s, "changeEmailPassword": %s, "dkimManager": %s, "createFTPAccount": %s, "deleteFTPAccount": %s, "listFTPAccounts": %s, "createBackup": %s, "restoreBackup": %s, "addDeleteDestinations": %s, "scheduleBackups": %s, "remoteBackups": %s, "googleDriveBackups": %s, "manageSSL": %s, "hostnameSSL": %s, "mailServerSSL": %s }' \
% (str(acl.adminStatus), str(acl.versionManagement), str(acl.createNewUser), % (str(acl.adminStatus), str(acl.versionManagement), str(acl.createNewUser),
str(acl.listUsers), str(acl.deleteUser), str(acl.resellerCenter), str(acl.changeUserACL), str(acl.listUsers), str(acl.deleteUser), str(acl.resellerCenter), str(acl.changeUserACL),
str(acl.createWebsite), str(acl.modifyWebsite), str(acl.suspendWebsite), str(acl.deleteWebsite), str(acl.createWebsite), str(acl.modifyWebsite), str(acl.suspendWebsite), str(acl.deleteWebsite),
@@ -2421,7 +2421,7 @@ vmail
str(acl.createDNSZone), str(acl.deleteZone), str(acl.addDeleteRecords), str(acl.createEmail), str(acl.createDNSZone), str(acl.deleteZone), str(acl.addDeleteRecords), str(acl.createEmail),
str(acl.listEmails), str(acl.deleteEmail), str(acl.emailForwarding), str(acl.changeEmailPassword), str(acl.listEmails), str(acl.deleteEmail), str(acl.emailForwarding), str(acl.changeEmailPassword),
str(acl.dkimManager), str(acl.createFTPAccount), str(acl.deleteFTPAccount), str(acl.listFTPAccounts), str(acl.dkimManager), str(acl.createFTPAccount), str(acl.deleteFTPAccount), str(acl.listFTPAccounts),
str(acl.createBackup), str(acl.restoreBackup), str(acl.addDeleteDestinations), str(acl.scheDuleBackups), str(acl.remoteBackups), '1', str(acl.createBackup), str(acl.restoreBackup), str(acl.addDeleteDestinations), str(acl.scheduleBackups), str(acl.remoteBackups), '1',
str(acl.manageSSL), str(acl.hostnameSSL), str(acl.mailServerSSL)) str(acl.manageSSL), str(acl.hostnameSSL), str(acl.mailServerSSL))
acl.save() acl.save()

4
static/baseTemplate/custom-js/system-status.js
View File

@@ -317,8 +317,8 @@ app.controller('adminController', function ($scope, $http, $timeout) {
$('.addDeleteDestinations').hide(); $('.addDeleteDestinations').hide();
} }
if (!Boolean(response.data.scheDuleBackups)) { if (!Boolean(response.data.scheduleBackups)) {
$('.scheDuleBackups').hide(); $('.scheduleBackups').hide();
} }
if (!Boolean(response.data.remoteBackups)) { if (!Boolean(response.data.remoteBackups)) {

16
static/userManagment/userManagment.js
View File

@@ -524,7 +524,7 @@ app.controller('createACLCTRL', function ($scope, $http) {
$scope.googleDriveBackups = 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;
@@ -605,7 +605,7 @@ app.controller('createACLCTRL', function ($scope, $http) {
googleDriveBackups: $scope.googleDriveBackups, googleDriveBackups: $scope.googleDriveBackups,
restoreBackup: $scope.restoreBackup, restoreBackup: $scope.restoreBackup,
addDeleteDestinations: $scope.addDeleteDestinations, addDeleteDestinations: $scope.addDeleteDestinations,
scheDuleBackups: $scope.scheDuleBackups, scheduleBackups: $scope.scheduleBackups,
remoteBackups: $scope.remoteBackups, remoteBackups: $scope.remoteBackups,
// SSL Management // SSL Management
@@ -727,7 +727,7 @@ app.controller('createACLCTRL', function ($scope, $http) {
$scope.createBackup = true; $scope.createBackup = true;
$scope.restoreBackup = true; $scope.restoreBackup = true;
$scope.addDeleteDestinations = true; $scope.addDeleteDestinations = true;
$scope.scheDuleBackups = true; $scope.scheduleBackups = true;
$scope.remoteBackups = true; $scope.remoteBackups = true;
// SSL Management // SSL Management
@@ -798,7 +798,7 @@ app.controller('createACLCTRL', function ($scope, $http) {
$scope.createBackup = true; $scope.createBackup = 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
@@ -983,7 +983,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
$scope.googleDriveBackups = Boolean(response.data.googleDriveBackups); $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);
$scope.remoteBackups = Boolean(response.data.remoteBackups); $scope.remoteBackups = Boolean(response.data.remoteBackups);
// SSL Management // SSL Management
@@ -1084,7 +1084,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
googleDriveBackups: $scope.googleDriveBackups, googleDriveBackups: $scope.googleDriveBackups,
restoreBackup: $scope.restoreBackup, restoreBackup: $scope.restoreBackup,
addDeleteDestinations: $scope.addDeleteDestinations, addDeleteDestinations: $scope.addDeleteDestinations,
scheDuleBackups: $scope.scheDuleBackups, scheduleBackups: $scope.scheduleBackups,
remoteBackups: $scope.remoteBackups, remoteBackups: $scope.remoteBackups,
// SSL Management // SSL Management
@@ -1206,7 +1206,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
$scope.createBackup = true; $scope.createBackup = true;
$scope.restoreBackup = true; $scope.restoreBackup = true;
$scope.addDeleteDestinations = true; $scope.addDeleteDestinations = true;
$scope.scheDuleBackups = true; $scope.scheduleBackups = true;
$scope.remoteBackups = true; $scope.remoteBackups = true;
// SSL Management // SSL Management
@@ -1277,7 +1277,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
$scope.createBackup = true; $scope.createBackup = 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

16
userManagment/static/userManagment/userManagment.js
View File

@@ -524,7 +524,7 @@ app.controller('createACLCTRL', function ($scope, $http) {
$scope.googleDriveBackups = 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;
@@ -605,7 +605,7 @@ app.controller('createACLCTRL', function ($scope, $http) {
googleDriveBackups: $scope.googleDriveBackups, googleDriveBackups: $scope.googleDriveBackups,
restoreBackup: $scope.restoreBackup, restoreBackup: $scope.restoreBackup,
addDeleteDestinations: $scope.addDeleteDestinations, addDeleteDestinations: $scope.addDeleteDestinations,
scheDuleBackups: $scope.scheDuleBackups, scheduleBackups: $scope.scheduleBackups,
remoteBackups: $scope.remoteBackups, remoteBackups: $scope.remoteBackups,
// SSL Management // SSL Management
@@ -727,7 +727,7 @@ app.controller('createACLCTRL', function ($scope, $http) {
$scope.createBackup = true; $scope.createBackup = true;
$scope.restoreBackup = true; $scope.restoreBackup = true;
$scope.addDeleteDestinations = true; $scope.addDeleteDestinations = true;
$scope.scheDuleBackups = true; $scope.scheduleBackups = true;
$scope.remoteBackups = true; $scope.remoteBackups = true;
// SSL Management // SSL Management
@@ -798,7 +798,7 @@ app.controller('createACLCTRL', function ($scope, $http) {
$scope.createBackup = true; $scope.createBackup = 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
@@ -983,7 +983,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
$scope.googleDriveBackups = Boolean(response.data.googleDriveBackups); $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);
$scope.remoteBackups = Boolean(response.data.remoteBackups); $scope.remoteBackups = Boolean(response.data.remoteBackups);
// SSL Management // SSL Management
@@ -1084,7 +1084,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
googleDriveBackups: $scope.googleDriveBackups, googleDriveBackups: $scope.googleDriveBackups,
restoreBackup: $scope.restoreBackup, restoreBackup: $scope.restoreBackup,
addDeleteDestinations: $scope.addDeleteDestinations, addDeleteDestinations: $scope.addDeleteDestinations,
scheDuleBackups: $scope.scheDuleBackups, scheduleBackups: $scope.scheduleBackups,
remoteBackups: $scope.remoteBackups, remoteBackups: $scope.remoteBackups,
// SSL Management // SSL Management
@@ -1206,7 +1206,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
$scope.createBackup = true; $scope.createBackup = true;
$scope.restoreBackup = true; $scope.restoreBackup = true;
$scope.addDeleteDestinations = true; $scope.addDeleteDestinations = true;
$scope.scheDuleBackups = true; $scope.scheduleBackups = true;
$scope.remoteBackups = true; $scope.remoteBackups = true;
// SSL Management // SSL Management
@@ -1277,7 +1277,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
$scope.createBackup = true; $scope.createBackup = 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

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

@@ -388,7 +388,7 @@
<div class="col-sm-9"> <div class="col-sm-9">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input ng-model="scheDuleBackups" type="checkbox" value=""> <input ng-model="scheduleBackups" type="checkbox" value="">
{% trans "Schedule Back up" %} {% trans "Schedule Back up" %}
</label> </label>
</div> </div>

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

@@ -392,7 +392,7 @@
<div class="col-sm-9"> <div class="col-sm-9">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input ng-model="scheDuleBackups" type="checkbox" value=""> <input ng-model="scheduleBackups" type="checkbox" value="">
{% trans "Schedule Back up" %} {% trans "Schedule Back up" %}
</label> </label>
</div> </div>

4
userManagment/tests.py
View File

@@ -155,7 +155,7 @@ class TestUserManagement(TestCase):
'createBackup': 1, 'createBackup': 1,
'restoreBackup': 1, 'restoreBackup': 1,
'addDeleteDestinations': 1, 'addDeleteDestinations': 1,
'scheDuleBackups': 1, 'scheduleBackups': 1,
'remoteBackups': 1, 'remoteBackups': 1,
'manageSSL': 1, 'manageSSL': 1,
'hostnameSSL': 1, 'hostnameSSL': 1,
@@ -221,7 +221,7 @@ class TestUserManagement(TestCase):
'createBackup': 1, 'createBackup': 1,
'restoreBackup': 1, 'restoreBackup': 1,
'addDeleteDestinations': 1, 'addDeleteDestinations': 1,
'scheDuleBackups': 1, 'scheduleBackups': 1,
'remoteBackups': 1, 'remoteBackups': 1,
'manageSSL': 1, 'manageSSL': 1,
'hostnameSSL': 1, 'hostnameSSL': 1,