diff --git a/CLManager/urls.py b/CLManager/urls.py index 0f2aff59c..082dc0221 100644 --- a/CLManager/urls.py +++ b/CLManager/urls.py @@ -1,19 +1,19 @@ -from django.conf.urls import url +from django.urls import re_path from . import views urlpatterns = [ - url(r'^CreatePackage$', views.CreatePackage, name='CreatePackageCL'), - url(r'^listPackages$', views.listPackages, name='listPackagesCL'), - url(r'^monitorUsage$', views.monitorUsage, name='monitorUsage'), - url(r'^CageFS$', views.CageFS, name='CageFS'), - url(r'^submitCageFSInstall$', views.submitCageFSInstall, name='submitCageFSInstall'), + re_path(r'^CreatePackage$', views.CreatePackage, name='CreatePackageCL'), + re_path(r'^listPackages$', views.listPackages, name='listPackagesCL'), + re_path(r'^monitorUsage$', views.monitorUsage, name='monitorUsage'), + re_path(r'^CageFS$', views.CageFS, name='CageFS'), + re_path(r'^submitCageFSInstall$', views.submitCageFSInstall, name='submitCageFSInstall'), - # url(r'^submitWebsiteListing$', views.getFurtherAccounts, name='submitWebsiteListing'), - # url(r'^enableOrDisable$', views.enableOrDisable, name='enableOrDisable'), - # url(r'^submitCreatePackage$', views.submitCreatePackage, name='submitCreatePackageCL'), - # url(r'^fetchPackages$', views.fetchPackages, name='fetchPackagesCL'), - # url(r'^deleteCLPackage$', views.deleteCLPackage, name='deleteCLPackage'), - # url(r'^saveSettings$', views.saveSettings, name='saveSettings'), - # url(r'^manage/(?P(.*))$', views.websiteContainerLimit, name='websiteContainerLimitCL'), - # url(r'^getUsageData$', views.getUsageData, name='getUsageData'), -] \ No newline at end of file + # re_path(r'^submitWebsiteListing$', views.getFurtherAccounts, name='submitWebsiteListing'), + # re_path(r'^enableOrDisable$', views.enableOrDisable, name='enableOrDisable'), + # re_path(r'^submitCreatePackage$', views.submitCreatePackage, name='submitCreatePackageCL'), + # re_path(r'^fetchPackages$', views.fetchPackages, name='fetchPackagesCL'), + # re_path(r'^deleteCLPackage$', views.deleteCLPackage, name='deleteCLPackage'), + # re_path(r'^saveSettings$', views.saveSettings, name='saveSettings'), + # re_path(r'^manage/(?P(.*))$', views.websiteContainerLimit, name='websiteContainerLimitCL'), + # re_path(r'^getUsageData$', views.getUsageData, name='getUsageData'), +] diff --git a/CyberCP/settings.py b/CyberCP/settings.py index 031ca5f63..f5483e4d9 100755 --- a/CyberCP/settings.py +++ b/CyberCP/settings.py @@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/1.11/ref/settings/ """ import os -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/CyberCP/urls.py b/CyberCP/urls.py index 94902e562..39a993960 100755 --- a/CyberCP/urls.py +++ b/CyberCP/urls.py @@ -5,44 +5,44 @@ The `urlpatterns` list routes URLs to views. For more information please see: Examples: Function views 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') + 2. Add a URL to urlpatterns: path('', views.home, name='home') Class-based views 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') Including another URLconf - 1. Import the include() function: from django.conf.urls import url, include - 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) + 1. Import the include() function: from django.urls import path, include + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ -from django.conf.urls import url,include +from django.urls import path, re_path, include from django.contrib import admin urlpatterns = [ - url(r'^base/',include('baseTemplate.urls')), - url(r'^', include('loginSystem.urls')), - url(r'^packages/',include('packages.urls')), - url(r'^websites/',include('websiteFunctions.urls')), - url(r'^tuning/',include('tuning.urls')), - url(r'^ftp/',include('ftp.urls')), - url(r'^serverstatus/',include('serverStatus.urls')), - url(r'^dns/',include('dns.urls')), - url(r'^users/',include('userManagment.urls')), - url(r'^dataBases/',include('databases.urls')), - url(r'^email/',include('mailServer.urls')), - url(r'^serverlogs/',include('serverLogs.urls')), - url(r'^firewall/',include('firewall.urls')), - url(r'^backup/',include('backup.urls')), - url(r'^managephp/',include('managePHP.urls')), - url(r'^manageSSL/',include('manageSSL.urls')), - url(r'^api/',include('api.urls')), - url(r'^filemanager/',include('filemanager.urls')), - url(r'^emailPremium/',include('emailPremium.urls')), - url(r'^manageservices/',include('manageServices.urls')), - url(r'^plugins/',include('pluginHolder.urls')), - url(r'^emailMarketing/', include('emailMarketing.urls')), - url(r'^cloudAPI/', include('cloudAPI.urls')), - url(r'^docker/', include('dockerManager.urls')), - url(r'^container/', include('containerization.urls')), - url(r'^CloudLinux/', include('CLManager.urls')), - url(r'^IncrementalBackups/', include('IncBackups.urls')), -# url(r'^Terminal/', include('WebTerminal.urls')), + path('base/', include('baseTemplate.urls')), + path('', include('loginSystem.urls')), + path('packages/', include('packages.urls')), + path('websites/', include('websiteFunctions.urls')), + path('tuning/', include('tuning.urls')), + path('ftp/', include('ftp.urls')), + path('serverstatus/', include('serverStatus.urls')), + path('dns/', include('dns.urls')), + path('users/', include('userManagment.urls')), + path('dataBases/', include('databases.urls')), + path('email/', include('mailServer.urls')), + path('serverlogs/', include('serverLogs.urls')), + path('firewall/', include('firewall.urls')), + path('backup/', include('backup.urls')), + path('managephp/', include('managePHP.urls')), + path('manageSSL/', include('manageSSL.urls')), + path('api/', include('api.urls')), + path('filemanager/', include('filemanager.urls')), + path('emailPremium/', include('emailPremium.urls')), + path('manageservices/', include('manageServices.urls')), + path('plugins/', include('pluginHolder.urls')), + path('emailMarketing/', include('emailMarketing.urls')), + path('cloudAPI/', include('cloudAPI.urls')), + path('docker/', include('dockerManager.urls')), + path('container/', include('containerization.urls')), + path('CloudLinux/', include('CLManager.urls')), + path('IncrementalBackups/', include('IncBackups.urls')), + # path('Terminal/', include('WebTerminal.urls')), ] diff --git a/IncBackups/urls.py b/IncBackups/urls.py index 90845cf33..6c44fcf36 100644 --- a/IncBackups/urls.py +++ b/IncBackups/urls.py @@ -1,45 +1,45 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^createBackup$', views.create_backup, name='createBackupInc'), - url(r'^restoreRemoteBackups$', views.restore_remote_backups, name='restoreRemoteBackupsInc'), - url(r'^backupDestinations$', views.backup_destinations, name='backupDestinationsInc'), - url(r'^addDestination$', views.add_destination, name='addDestinationInc'), - url(r'^populateCurrentRecords$', views.populate_current_records, name='populateCurrentRecordsInc'), - url(r'^removeDestination$', views.remove_destination, name='removeDestinationInc'), - url(r'^fetchCurrentBackups$', views.fetch_current_backups, name='fetchCurrentBackupsInc'), - url(r'^submitBackupCreation$', views.submit_backup_creation, name='submitBackupCreationInc'), - url(r'^getBackupStatus$', views.get_backup_status, name='getBackupStatusInc'), - url(r'^deleteBackup$', views.delete_backup, name='deleteBackupInc'), - url(r'^fetchRestorePoints$', views.fetch_restore_points, name='fetchRestorePointsInc'), - url(r'^restorePoint$', views.restore_point, name='restorePointInc'), - url(r'^scheduleBackups$', views.schedule_backups, name='scheduleBackupsInc'), - url(r'^submitBackupSchedule$', views.submit_backup_schedule, name='submitBackupScheduleInc'), - url(r'^scheduleDelete$', views.schedule_delete, name='scheduleDeleteInc'), - url(r'^getCurrentBackupSchedules$', views.get_current_backup_schedules, name='getCurrentBackupSchedulesInc'), - url(r'^fetchSites$', views.fetch_sites, name='fetchSites'), - url(r'^saveChanges$', views.save_changes, name='saveChanges'), - url(r'^removeSite$', views.remove_site, name='removeSite'), - url(r'^addWebsite$', views.add_website, name='addWebsite'), - ### V2 Backups URls - url(r'^CreateV2Backup$', views.CreateV2Backup, name='CreateV2Backup'), - url(r'^ConfigureV2Backup$', views.ConfigureV2Backup, name='ConfigureV2Backup'), - url(r'^ConfigureV2BackupSetup$', views.ConfigureV2BackupSetup, name='ConfigureV2BackupSetup'), - url(r'^RestoreV2backupSite$', views.RestoreV2backupSite, name='RestoreV2backupSite'), - url(r'^selectwebsiteRetorev2$', views.selectwebsiteRetorev2, name='selectwebsiteRetorev2'), - url(r'^selectreporestorev2$', views.selectreporestorev2, name='selectreporestorev2'), - url(r'^RestorePathV2$', views.RestorePathV2, name='RestorePathV2'), - url(r'^DeleteSnapshotV2Final$', views.DeleteSnapshotV2Final, name='DeleteSnapshotV2Final'), - url(r'^CreateV2BackupButton$', views.CreateV2BackupButton, name='CreateV2BackupButton'), - url(r'^selectwebsiteCreatev2$', views.selectwebsiteCreatev2, name='selectwebsiteCreatev2'), - url(r'^CreateV2BackupStatus$', views.CreateV2BackupStatus, name='CreateV2BackupStatus'), - url(r'^ConfigureSftpV2Backup$', views.ConfigureSftpV2Backup, name='ConfigureSftpV2Backup'), + path('createBackup/', views.create_backup, name='createBackupInc'), + path('restoreRemoteBackups/', views.restore_remote_backups, name='restoreRemoteBackupsInc'), + path('backupDestinations/', views.backup_destinations, name='backupDestinationsInc'), + path('addDestination/', views.add_destination, name='addDestinationInc'), + path('populateCurrentRecords/', views.populate_current_records, name='populateCurrentRecordsInc'), + path('removeDestination/', views.remove_destination, name='removeDestinationInc'), + path('fetchCurrentBackups/', views.fetch_current_backups, name='fetchCurrentBackupsInc'), + path('submitBackupCreation/', views.submit_backup_creation, name='submitBackupCreationInc'), + path('getBackupStatus/', views.get_backup_status, name='getBackupStatusInc'), + path('deleteBackup/', views.delete_backup, name='deleteBackupInc'), + path('fetchRestorePoints/', views.fetch_restore_points, name='fetchRestorePointsInc'), + path('restorePoint/', views.restore_point, name='restorePointInc'), + path('scheduleBackups/', views.schedule_backups, name='scheduleBackupsInc'), + path('submitBackupSchedule/', views.submit_backup_schedule, name='submitBackupScheduleInc'), + path('scheduleDelete/', views.schedule_delete, name='scheduleDeleteInc'), + path('getCurrentBackupSchedules/', views.get_current_backup_schedules, name='getCurrentBackupSchedulesInc'), + path('fetchSites/', views.fetch_sites, name='fetchSites'), + path('saveChanges/', views.save_changes, name='saveChanges'), + path('removeSite/', views.remove_site, name='removeSite'), + path('addWebsite/', views.add_website, name='addWebsite'), - url(r'^schedulev2Backups$', views.schedulev2Backups, name='schedulev2Backups'), - url(r'^DeleteScheduleV2$', views.DeleteScheduleV2, name='DeleteScheduleV2'), - url(r'^CreateScheduleV2$', views.CreateScheduleV2, name='CreateScheduleV2'), - url(r'^DeleteRepoV2$', views.DeleteRepoV2, name='DeleteRepoV2'), - url(r'^DeleteV2BackupButton$', views.DeleteV2BackupButton, name='DeleteV2BackupButton'), + # V2 Backups URLs + path('CreateV2Backup/', views.CreateV2Backup, name='CreateV2Backup'), + path('ConfigureV2Backup/', views.ConfigureV2Backup, name='ConfigureV2Backup'), + path('ConfigureV2BackupSetup/', views.ConfigureV2BackupSetup, name='ConfigureV2BackupSetup'), + path('RestoreV2backupSite/', views.RestoreV2backupSite, name='RestoreV2backupSite'), + path('selectwebsiteRetorev2/', views.selectwebsiteRetorev2, name='selectwebsiteRetorev2'), + path('selectreporestorev2/', views.selectreporestorev2, name='selectreporestorev2'), + path('RestorePathV2/', views.RestorePathV2, name='RestorePathV2'), + path('DeleteSnapshotV2Final/', views.DeleteSnapshotV2Final, name='DeleteSnapshotV2Final'), + path('CreateV2BackupButton/', views.CreateV2BackupButton, name='CreateV2BackupButton'), + path('selectwebsiteCreatev2/', views.selectwebsiteCreatev2, name='selectwebsiteCreatev2'), + path('CreateV2BackupStatus/', views.CreateV2BackupStatus, name='CreateV2BackupStatus'), + path('ConfigureSftpV2Backup/', views.ConfigureSftpV2Backup, name='ConfigureSftpV2Backup'), -] \ No newline at end of file + path('schedulev2Backups/', views.schedulev2Backups, name='schedulev2Backups'), + path('DeleteScheduleV2/', views.DeleteScheduleV2, name='DeleteScheduleV2'), + path('CreateScheduleV2/', views.CreateScheduleV2, name='CreateScheduleV2'), + path('DeleteRepoV2/', views.DeleteRepoV2, name='DeleteRepoV2'), + path('DeleteV2BackupButton/', views.DeleteV2BackupButton, name='DeleteV2BackupButton'), +] diff --git a/WebTerminal/urls.py b/WebTerminal/urls.py index 73b52d1e5..77f6747b8 100755 --- a/WebTerminal/urls.py +++ b/WebTerminal/urls.py @@ -1,7 +1,7 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^$', views.terminal, name='terminal'), - url(r'^restart$', views.restart, name='restart'), -] \ No newline at end of file + path('', views.terminal, name='terminal'), + path('restart/', views.restart, name='restart'), +] diff --git a/api/urls.py b/api/urls.py index 13d27c7a2..f842bd2f6 100755 --- a/api/urls.py +++ b/api/urls.py @@ -1,32 +1,32 @@ -from django.conf.urls import url +from django.urls import re_path from . import views urlpatterns = [ - url(r'^createWebsite', views.createWebsite, name='createWebsiteAPI'), - url(r'^deleteWebsite', views.deleteWebsite, name='deleteWebsiteAPI'), - url(r'^submitWebsiteStatus', views.submitWebsiteStatus, name='submitWebsiteStatusAPI'), - url(r'^deleteFirewallRule$', views.deleteFirewallRule, name='deleteFirewallRule'), - url(r'^addFirewallRule$', views.addFirewallRule, name='addFirewallRule'), + re_path(r'^createWebsite$', views.createWebsite, name='createWebsiteAPI'), + re_path(r'^deleteWebsite$', views.deleteWebsite, name='deleteWebsiteAPI'), + re_path(r'^submitWebsiteStatus$', views.submitWebsiteStatus, name='submitWebsiteStatusAPI'), + re_path(r'^deleteFirewallRule$', views.deleteFirewallRule, name='deleteFirewallRule'), + re_path(r'^addFirewallRule$', views.addFirewallRule, name='addFirewallRule'), - url(r'^verifyConn', views.verifyConn, name='verifyConnAPI'), + re_path(r'^verifyConn$', views.verifyConn, name='verifyConnAPI'), - url(r'^loginAPI', views.loginAPI, name='loginAPI'), + re_path(r'^loginAPI$', views.loginAPI, name='loginAPI'), - url(r'^getUserInfo$', views.getUserInfo, name='getUserInfo'), - url(r'^changeUserPassAPI', views.changeUserPassAPI, name='changeUserPassAPI'), - url(r'^submitUserDeletion$', views.submitUserDeletion, name='submitUserDeletion'), + re_path(r'^getUserInfo$', views.getUserInfo, name='getUserInfo'), + re_path(r'^changeUserPassAPI$', views.changeUserPassAPI, name='changeUserPassAPI'), + re_path(r'^submitUserDeletion$', views.submitUserDeletion, name='submitUserDeletion'), - url(r'^listPackage',views.getPackagesListAPI,name='getPackagesListAPI'), - url(r'^changePackageAPI', views.changePackageAPI, name='changePackageAPI'), - url(r'^fetchSSHkey', views.fetchSSHkey, name='fetchSSHkey'), - url(r'^remoteTransfer', views.remoteTransfer, name='remoteTransfer'), - url(r'^fetchAccountsFromRemoteServer', views.fetchAccountsFromRemoteServer, name='fetchAccountsFromRemoteServer'), - url(r'^FetchRemoteTransferStatus', views.FetchRemoteTransferStatus, name='FetchRemoteTransferStatus'), - url(r'^cancelRemoteTransfer', views.cancelRemoteTransfer, name='cancelRemoteTransfer'), + re_path(r'^listPackage$', views.getPackagesListAPI, name='getPackagesListAPI'), + re_path(r'^changePackageAPI$', views.changePackageAPI, name='changePackageAPI'), + re_path(r'^fetchSSHkey$', views.fetchSSHkey, name='fetchSSHkey'), + re_path(r'^remoteTransfer$', views.remoteTransfer, name='remoteTransfer'), + re_path(r'^fetchAccountsFromRemoteServer$', views.fetchAccountsFromRemoteServer, name='fetchAccountsFromRemoteServer'), + re_path(r'^FetchRemoteTransferStatus$', views.FetchRemoteTransferStatus, name='FetchRemoteTransferStatus'), - url(r'^cyberPanelVersion', views.cyberPanelVersion, name='cyberPanelVersion'), - url(r'^runAWSBackups$', views.runAWSBackups, name='runAWSBackups'), - url(r'^submitUserCreation$', views.submitUserCreation, name='submitUserCreation'), + re_path(r'^cancelRemoteTransfer$', views.cancelRemoteTransfer, name='cancelRemoteTransfer'), + re_path(r'^cyberPanelVersion$', views.cyberPanelVersion, name='cyberPanelVersion'), + re_path(r'^runAWSBackups$', views.runAWSBackups, name='runAWSBackups'), + re_path(r'^submitUserCreation$', views.submitUserCreation, name='submitUserCreation'), ] diff --git a/backup/signals.py b/backup/signals.py index 848ecad17..2deddb920 100755 --- a/backup/signals.py +++ b/backup/signals.py @@ -3,73 +3,73 @@ from django.dispatch import Signal ## This event is fired before CyberPanel core load template for create backup page. -preBackupSite = Signal(providing_args=["request"]) +preBackupSite = Signal() ## This event is fired after CyberPanel core load template for create backup page. -postBackupSite = Signal(providing_args=["request", "response"]) +postBackupSite = Signal() ## This event is fired before CyberPanel core load template for restore backup page. -preRestoreSite = Signal(providing_args=["request"]) +preRestoreSite = Signal() ## This event is fired after CyberPanel core load template for restore backup page. -postRestoreSite = Signal(providing_args=["request", "response"]) +postRestoreSite = Signal() ## This event is fired before CyberPanel core start creating backup of a website -preSubmitBackupCreation = Signal(providing_args=["request"]) +preSubmitBackupCreation = Signal() ## This event is fired before CyberPanel core starts to load status of backup started earlier througb submitBackupCreation -preBackupStatus = Signal(providing_args=["request"]) +preBackupStatus = Signal() ## This event is fired after CyberPanel core has loaded backup status -postBackupStatus = Signal(providing_args=["request", "response"]) +postBackupStatus = Signal() ## This event is fired before CyberPanel core start deletion of a backup -preDeleteBackup = Signal(providing_args=["request"]) +preDeleteBackup = Signal() ## This event is fired after CyberPanel core finished the backup deletion -postDeleteBackup = Signal(providing_args=["request", "response"]) +postDeleteBackup = Signal() ## This event is fired before CyberPanel core start restoring a backup. -preSubmitRestore = Signal(providing_args=["request"]) +preSubmitRestore = Signal() ## This event is fired before CyberPanel core starts to add a remote backup destination -preSubmitDestinationCreation = Signal(providing_args=["request"]) +preSubmitDestinationCreation = Signal() ## This event is fired after CyberPanel core is finished adding remote backup destination -postSubmitDestinationCreation = Signal(providing_args=["request", "response"]) +postSubmitDestinationCreation = Signal() ## This event is fired before CyberPanel core starts to delete a backup destination -preDeleteDestination = Signal(providing_args=["request"]) +preDeleteDestination = Signal() ## This event is fired after CyberPanel core finished deleting a backup destination -postDeleteDestination = Signal(providing_args=["request", "response"]) +postDeleteDestination = Signal() ## This event is fired before CyberPanel core start adding a backup schedule -preSubmitBackupSchedule = Signal(providing_args=["request"]) +preSubmitBackupSchedule = Signal() ## This event is fired after CyberPanel core finished adding a backup schedule -postSubmitBackupSchedule = Signal(providing_args=["request", "response"]) +postSubmitBackupSchedule = Signal() ## This event is fired before CyberPanel core start the deletion of backup schedule -preScheduleDelete = Signal(providing_args=["request"]) +preScheduleDelete = Signal() ## This event is fired after CyberPanel core finished the deletion of backup schedule -postScheduleDelete = Signal(providing_args=["request", "response"]) +postScheduleDelete = Signal() ## This event is fired before CyberPanel core star the remote backup process -preSubmitRemoteBackups = Signal(providing_args=["request"]) +preSubmitRemoteBackups = Signal() ## This event is fired after CyberPanel core finished remote backup process -postSubmitRemoteBackups = Signal(providing_args=["request", "response"]) +postSubmitRemoteBackups = Signal() ## This event is fired before CyberPanel core star the remote backup process -preStarRemoteTransfer = Signal(providing_args=["request"]) +preStarRemoteTransfer = Signal() ## This event is fired after CyberPanel core finished remote backup process -postStarRemoteTransfer = Signal(providing_args=["request", "response"]) +postStarRemoteTransfer = Signal() ## This event is fired before CyberPanel core start restore of remote backups -preRemoteBackupRestore = Signal(providing_args=["request"]) +preRemoteBackupRestore = Signal() ## This event is fired after CyberPanel core finished restoring remote backups in local server -postRemoteBackupRestore = Signal(providing_args=["request", "response"]) +postRemoteBackupRestore = Signal() diff --git a/backup/templates/backup/oneClickBackups.html b/backup/templates/backup/oneClickBackups.html index 98063f6c1..902572294 100755 --- a/backup/templates/backup/oneClickBackups.html +++ b/backup/templates/backup/oneClickBackups.html @@ -118,9 +118,7 @@
-
- diff --git a/backup/urls.py b/backup/urls.py index d31bc8929..4c6ad42d1 100755 --- a/backup/urls.py +++ b/backup/urls.py @@ -1,74 +1,73 @@ -from django.conf.urls import url +from django.urls import re_path from . import views urlpatterns = [ - url(r'^$', views.loadBackupHome, name='loadBackupHome'), - url(r'^getCurrentBackups', views.getCurrentBackups, name='getCurrentBackups'), - url(r'^OneClickBackups', views.OneClickBackups, name='OneClickBackups'), - url(r'^ManageOCBackups', views.ManageOCBackups, name='ManageOCBackups'), - url(r'^RestoreOCBackups', views.RestoreOCBackups, name='RestoreOCBackups'), - url(r'^fetchOCSites', views.fetchOCSites, name='fetchOCSites'), - url(r'^StartOCRestore', views.StartOCRestore, name='StartOCRestore'), - url(r'^DeployAccount', views.DeployAccount, name='DeployAccount'), + re_path(r'^$', views.loadBackupHome, name='loadBackupHome'), + re_path(r'^getCurrentBackups$', views.getCurrentBackups, name='getCurrentBackups'), + re_path(r'^OneClickBackups$', views.OneClickBackups, name='OneClickBackups'), + re_path(r'^ManageOCBackups$', views.ManageOCBackups, name='ManageOCBackups'), + re_path(r'^RestoreOCBackups$', views.RestoreOCBackups, name='RestoreOCBackups'), + re_path(r'^fetchOCSites$', views.fetchOCSites, name='fetchOCSites'), + re_path(r'^StartOCRestore$', views.StartOCRestore, name='StartOCRestore'), + re_path(r'^DeployAccount$', views.DeployAccount, name='DeployAccount'), - url(r'^backupSite', views.backupSite, name='backupSite'), - url(r'^restoreSite', views.restoreSite, name='restoreSite'), - url(r'^gDrive$', views.gDrive, name='gDrive'), - url(r'^gDriveSetup$', views.gDriveSetup, name='gDriveSetup'), - url(r'^fetchgDriveSites$', views.fetchgDriveSites, name='fetchgDriveSites'), - url(r'^addSitegDrive$', views.addSitegDrive, name='addSitegDrive'), - url(r'^deleteAccountgDrive$', views.deleteAccountgDrive, name='deleteAccountgDrive'), - url(r'^changeAccountFrequencygDrive$', views.changeAccountFrequencygDrive, name='changeAccountFrequencygDrive'), - url(r'^changeFileRetention$', views.changeFileRetention, name='changeFileRetention'), - url(r'^deleteSitegDrive$', views.deleteSitegDrive, name='deleteSitegDrive'), - url(r'^fetchDriveLogs$', views.fetchDriveLogs, name='fetchDriveLogs'), + re_path(r'^backupSite$', views.backupSite, name='backupSite'), + re_path(r'^restoreSite$', views.restoreSite, name='restoreSite'), + re_path(r'^gDrive$', views.gDrive, name='gDrive'), + re_path(r'^gDriveSetup$', views.gDriveSetup, name='gDriveSetup'), + re_path(r'^fetchgDriveSites$', views.fetchgDriveSites, name='fetchgDriveSites'), + re_path(r'^addSitegDrive$', views.addSitegDrive, name='addSitegDrive'), + re_path(r'^deleteAccountgDrive$', views.deleteAccountgDrive, name='deleteAccountgDrive'), + re_path(r'^changeAccountFrequencygDrive$', views.changeAccountFrequencygDrive, name='changeAccountFrequencygDrive'), + re_path(r'^changeFileRetention$', views.changeFileRetention, name='changeFileRetention'), + re_path(r'^deleteSitegDrive$', views.deleteSitegDrive, name='deleteSitegDrive'), + re_path(r'^fetchDriveLogs$', views.fetchDriveLogs, name='fetchDriveLogs'), - url(r'^submitBackupCreation', views.submitBackupCreation, name='submitBackupCreation'), - url(r'^cancelBackupCreation', views.cancelBackupCreation, name='cancelBackupCreation'), - url(r'^backupStatus', views.backupStatus, name='backupStatus'), - url(r'^deleteBackup', views.deleteBackup, name='deleteBackup'), + re_path(r'^submitBackupCreation$', views.submitBackupCreation, name='submitBackupCreation'), + re_path(r'^cancelBackupCreation$', views.cancelBackupCreation, name='cancelBackupCreation'), + re_path(r'^backupStatus$', views.backupStatus, name='backupStatus'), + re_path(r'^deleteBackup$', views.deleteBackup, name='deleteBackup'), - url(r'^restoreStatus', views.restoreStatus, name='restoreStatus'), + re_path(r'^restoreStatus$', views.restoreStatus, name='restoreStatus'), - url(r'^submitRestore', views.submitRestore, name='submitRestore'), + re_path(r'^submitRestore$', views.submitRestore, name='submitRestore'), - url(r'^backupDestinations', views.backupDestinations, name='backupDestinations'), + re_path(r'^backupDestinations$', views.backupDestinations, name='backupDestinations'), - url(r'^getCurrentBackupDestinations', views.getCurrentBackupDestinations, name='getCurrentBackupDestinations'), + re_path(r'^getCurrentBackupDestinations$', views.getCurrentBackupDestinations, name='getCurrentBackupDestinations'), - url(r'^submitDestinationCreation', views.submitDestinationCreation, name='submitDestinationCreation'), + re_path(r'^submitDestinationCreation$', views.submitDestinationCreation, name='submitDestinationCreation'), - url(r'^getConnectionStatus', views.getConnectionStatus, name='getConnectionStatus'), + re_path(r'^getConnectionStatus$', views.getConnectionStatus, name='getConnectionStatus'), - url(r'^deleteDestination', views.deleteDestination, name='deleteDestination'), + re_path(r'^deleteDestination$', views.deleteDestination, name='deleteDestination'), - url(r'^scheduleBackup', views.scheduleBackup, name='scheduleBackup'), + re_path(r'^scheduleBackup$', views.scheduleBackup, name='scheduleBackup'), - url(r'^getCurrentBackupSchedules', views.getCurrentBackupSchedules, name='getCurrentBackupSchedules'), + re_path(r'^getCurrentBackupSchedules$', views.getCurrentBackupSchedules, name='getCurrentBackupSchedules'), - url(r'^submitBackupSchedule', views.submitBackupSchedule, name='submitBackupSchedule'), + re_path(r'^submitBackupSchedule$', views.submitBackupSchedule, name='submitBackupSchedule'), - url(r'^scheduleDelete', views.scheduleDelete, name='scheduleDelete'), + re_path(r'^scheduleDelete$', views.scheduleDelete, name='scheduleDelete'), - url(r'^remoteBackups', views.remoteBackups, name='remoteBackups'), - url(r'^submitRemoteBackups', views.submitRemoteBackups, name='submitRemoteBackups'), - url(r'^getRemoteTransferStatus', views.getRemoteTransferStatus, name='getRemoteTransferStatus'), - url(r'^remoteBackupRestore', views.remoteBackupRestore, name='remoteBackupRestore'), - url(r'^starRemoteTransfer', views.starRemoteTransfer, name='starRemoteTransfer'), - url(r'^localRestoreStatus', views.localRestoreStatus, name='localRestoreStatus'), + re_path(r'^remoteBackups$', views.remoteBackups, name='remoteBackups'), + re_path(r'^submitRemoteBackups$', views.submitRemoteBackups, name='submitRemoteBackups'), + re_path(r'^getRemoteTransferStatus$', views.getRemoteTransferStatus, name='getRemoteTransferStatus'), + re_path(r'^remoteBackupRestore$', views.remoteBackupRestore, name='remoteBackupRestore'), + re_path(r'^starRemoteTransfer$', views.starRemoteTransfer, name='starRemoteTransfer'), + re_path(r'^localRestoreStatus$', views.localRestoreStatus, name='localRestoreStatus'), - url(r'^cancelRemoteBackup', views.cancelRemoteBackup, name='cancelRemoteBackup'), + re_path(r'^cancelRemoteBackup$', views.cancelRemoteBackup, name='cancelRemoteBackup'), - url(r'^localInitiate$', views.localInitiate, name='localInitiate'), - - url(r'^backupLogs$', views.backupLogs, name='backupLogs'), - url(r'^fetchLogs$', views.fetchLogs, name='fetchLogs'), - url(r'^fetchgNormalSites$', views.fetchgNormalSites, name='fetchgNormalSites'), - url(r'^fetchNormalJobs$', views.fetchNormalJobs, name='fetchNormalJobs'), - url(r'^addSiteNormal$', views.addSiteNormal, name='addSiteNormal'), - url(r'^deleteSiteNormal$', views.deleteSiteNormal, name='deleteSiteNormal'), - url(r'^changeAccountFrequencyNormal$', views.changeAccountFrequencyNormal, name='changeAccountFrequencyNormal'), - url(r'^deleteAccountNormal$', views.deleteAccountNormal, name='deleteAccountNormal'), - url(r'^fetchNormalLogs$', views.fetchNormalLogs, name='fetchNormalLogs'), + re_path(r'^localInitiate$', views.localInitiate, name='localInitiate'), + re_path(r'^backupLogs$', views.backupLogs, name='backupLogs'), + re_path(r'^fetchLogs$', views.fetchLogs, name='fetchLogs'), + re_path(r'^fetchgNormalSites$', views.fetchgNormalSites, name='fetchgNormalSites'), + re_path(r'^fetchNormalJobs$', views.fetchNormalJobs, name='fetchNormalJobs'), + re_path(r'^addSiteNormal$', views.addSiteNormal, name='addSiteNormal'), + re_path(r'^deleteSiteNormal$', views.deleteSiteNormal, name='deleteSiteNormal'), + re_path(r'^changeAccountFrequencyNormal$', views.changeAccountFrequencyNormal, name='changeAccountFrequencyNormal'), + re_path(r'^deleteAccountNormal$', views.deleteAccountNormal, name='deleteAccountNormal'), + re_path(r'^fetchNormalLogs$', views.fetchNormalLogs, name='fetchNormalLogs'), ] diff --git a/baseTemplate/urls.py b/baseTemplate/urls.py index 31014df50..2d7230f66 100755 --- a/baseTemplate/urls.py +++ b/baseTemplate/urls.py @@ -1,21 +1,18 @@ -from django.conf.urls import url +from django.urls import re_path from . import views urlpatterns = [ - url(r'^$', views.renderBase, name='index'), - url(r'^getSystemStatus$',views.getSystemStatus, name='getSystemInformation'), - url(r'^getAdminStatus',views.getAdminStatus, name='getSystemInformation'), - url(r'^getLoadAverage',views.getLoadAverage, name='getLoadAverage'), - url(r'^versionManagment',views.versionManagment, name='versionManagment'), - url(r'^design', views.design, name='design'), - url(r'^getthemedata', views.getthemedata, name='getthemedata'), - - url(r'^upgrade',views.upgrade, name='upgrade'), - url(r'^onboarding$', views.onboarding, name='onboarding'), - url(r'^RestartCyberPanel$', views.RestartCyberPanel, name='RestartCyberPanel'), - url(r'^runonboarding', views.runonboarding, name='runonboarding'), - - url(r'^UpgradeStatus',views.upgradeStatus, name='UpgradeStatus'), - url(r'^upgradeVersion',views.upgradeVersion, name='upgradeVersion'), - -] \ No newline at end of file + re_path(r'^$', views.renderBase, name='index'), + re_path(r'^getSystemStatus$', views.getSystemStatus, name='getSystemInformation'), + re_path(r'^getAdminStatus$', views.getAdminStatus, name='getSystemInformation'), + re_path(r'^getLoadAverage$', views.getLoadAverage, name='getLoadAverage'), + re_path(r'^versionManagment$', views.versionManagment, name='versionManagment'), + re_path(r'^design$', views.design, name='design'), + re_path(r'^getthemedata$', views.getthemedata, name='getthemedata'), + re_path(r'^upgrade$', views.upgrade, name='upgrade'), + re_path(r'^onboarding$', views.onboarding, name='onboarding'), + re_path(r'^RestartCyberPanel$', views.RestartCyberPanel, name='RestartCyberPanel'), + re_path(r'^runonboarding$', views.runonboarding, name='runonboarding'), + re_path(r'^UpgradeStatus$', views.upgradeStatus, name='UpgradeStatus'), + re_path(r'^upgradeVersion$', views.upgradeVersion, name='upgradeVersion'), +] diff --git a/cloudAPI/urls.py b/cloudAPI/urls.py index f87e369b5..617dd936e 100755 --- a/cloudAPI/urls.py +++ b/cloudAPI/urls.py @@ -1,7 +1,7 @@ -from django.conf.urls import url +from django.urls import re_path from . import views urlpatterns = [ - url(r'^$', views.router, name='router'), - url(r'^access$', views.access, name='access'), -] \ No newline at end of file + re_path(r'^$', views.router, name='router'), + re_path(r'^access$', views.access, name='access'), +] diff --git a/containerization/urls.py b/containerization/urls.py index dafc7e031..8ecebec31 100755 --- a/containerization/urls.py +++ b/containerization/urls.py @@ -1,11 +1,11 @@ -from django.conf.urls import url +from django.urls import re_path from . import views urlpatterns = [ - url(r'^$', views.cHome, name='cHome'), - url(r'^submitContainerInstall$', views.submitContainerInstall, name='submitContainerInstall'), - url(r'^manage/(?P(.*))$', views.websiteContainerLimit, name='websiteContainerLimit'), - url(r'^fetchWebsiteLimits$', views.fetchWebsiteLimits, name='fetchWebsiteLimits'), - url(r'^saveWebsiteLimits$', views.saveWebsiteLimits, name='saveWebsiteLimits'), - url(r'^getUsageData$', views.getUsageData, name='getUsageData'), -] \ No newline at end of file + re_path(r'^$', views.cHome, name='cHome'), + re_path(r'^submitContainerInstall$', views.submitContainerInstall, name='submitContainerInstall'), + re_path(r'^manage/(?P.*)$', views.websiteContainerLimit, name='websiteContainerLimit'), + re_path(r'^fetchWebsiteLimits$', views.fetchWebsiteLimits, name='fetchWebsiteLimits'), + re_path(r'^saveWebsiteLimits$', views.saveWebsiteLimits, name='saveWebsiteLimits'), + re_path(r'^getUsageData$', views.getUsageData, name='getUsageData'), +] diff --git a/databases/signals.py b/databases/signals.py index 6794f097e..ea934e267 100755 --- a/databases/signals.py +++ b/databases/signals.py @@ -4,25 +4,25 @@ from django.dispatch import Signal ## This event is fired before CyberPanel core load the create database template, this special event is used ## to create a beautiful names official plugin. Actual FTP account creation happens with event named preSubmitDBCreation and postSubmitDBCreation. -preCreateDatabase = Signal(providing_args=["request"]) +preCreateDatabase = Signal() ## See preCreateDatabase -postCreateDatabase = Signal(providing_args=["request", "response"]) +postCreateDatabase = Signal() ## This event is fired before CyberPanel core start creation of a database. -preSubmitDBCreation = Signal(providing_args=["request"]) +preSubmitDBCreation = Signal() ## This event is fired after CyberPanel core finished creation of a database. -postSubmitDBCreation = Signal(providing_args=["request", "response"]) +postSubmitDBCreation = Signal() ## This event is fired before CyberPanel core start deletion of a database -preSubmitDatabaseDeletion = Signal(providing_args=["request"]) +preSubmitDatabaseDeletion = Signal() ## This event is fired after CyberPanel core finished deletion of a database. -postSubmitDatabaseDeletion = Signal(providing_args=["request", "response"]) +postSubmitDatabaseDeletion = Signal() ## This event is fired before CyberPanel core start to change a database password. -preChangePassword = Signal(providing_args=["request"]) +preChangePassword = Signal() ## This event is fired after CyberPanel core finished changing database password. -postChangePassword = Signal(providing_args=["request", "response"]) \ No newline at end of file +postChangePassword = Signal() \ No newline at end of file diff --git a/databases/urls.py b/databases/urls.py index 683981300..f5f3d2971 100755 --- a/databases/urls.py +++ b/databases/urls.py @@ -1,31 +1,27 @@ -from django.conf.urls import url +from django.urls import re_path from . import views urlpatterns = [ - url(r'^$', views.loadDatabaseHome, name='loadDatabaseHome'), - url(r'^createDatabase', views.createDatabase, name='createDatabase'), - url(r'^submitDBCreation', views.submitDBCreation, name='submitDBCreation'), - url(r'^deleteDatabase', views.deleteDatabase, name='deleteDatabase'), - url(r'^fetchDatabases', views.fetchDatabases, name='fetchDatabases'), - url(r'^MysqlManager', views.MySQLManager, name='MysqlManager'), - url(r'^OptimizeMySQL', views.OptimizeMySQL, name='OptimizeMySQL'), - url(r'^upgrademysqlnow', views.upgrademysqlnow, name='upgrademysqlnow'), - url(r'^UpgradeMySQL', views.UpgradeMySQL, name='UpgradeMySQL'), - url(r'^upgrademysqlstatus', views.upgrademysqlstatus, name='upgrademysqlstatus'), - url(r'^getMysqlstatus', views.getMysqlstatus, name='getMysqlstatus'), - url(r'^restartMySQL', views.restartMySQL, name='restartMySQL'), - url(r'^generateRecommendations', views.generateRecommendations, name='generateRecommendations'), - url(r'^applyMySQLChanges', views.applyMySQLChanges, name='applyMySQLChanges'), - - - url(r'^submitDatabaseDeletion', views.submitDatabaseDeletion, name='submitDatabaseDeletion'), - - url(r'^listDBs', views.listDBs, name='listDBs'), - - url(r'^changePassword$', views.changePassword, name='changePassword'), - url(r'^remoteAccess$', views.remoteAccess, name='remoteAccess'), - url(r'^allowRemoteIP$', views.allowRemoteIP, name='allowRemoteIP'), - url(r'^phpMyAdmin$', views.phpMyAdmin, name='phpMyAdmin'), - url(r'^generateAccess$', views.generateAccess, name='generateAccess'), - url(r'^fetchDetailsPHPMYAdmin$', views.fetchDetailsPHPMYAdmin, name='fetchDetailsPHPMYAdmin'), -] \ No newline at end of file + re_path(r'^$', views.loadDatabaseHome, name='loadDatabaseHome'), + re_path(r'^createDatabase$', views.createDatabase, name='createDatabase'), + re_path(r'^submitDBCreation$', views.submitDBCreation, name='submitDBCreation'), + re_path(r'^deleteDatabase$', views.deleteDatabase, name='deleteDatabase'), + re_path(r'^fetchDatabases$', views.fetchDatabases, name='fetchDatabases'), + re_path(r'^MysqlManager$', views.MySQLManager, name='MysqlManager'), + re_path(r'^OptimizeMySQL$', views.OptimizeMySQL, name='OptimizeMySQL'), + re_path(r'^upgrademysqlnow$', views.upgrademysqlnow, name='upgrademysqlnow'), + re_path(r'^UpgradeMySQL$', views.UpgradeMySQL, name='UpgradeMySQL'), + re_path(r'^upgrademysqlstatus$', views.upgrademysqlstatus, name='upgrademysqlstatus'), + re_path(r'^getMysqlstatus$', views.getMysqlstatus, name='getMysqlstatus'), + re_path(r'^restartMySQL$', views.restartMySQL, name='restartMySQL'), + re_path(r'^generateRecommendations$', views.generateRecommendations, name='generateRecommendations'), + re_path(r'^applyMySQLChanges$', views.applyMySQLChanges, name='applyMySQLChanges'), + re_path(r'^submitDatabaseDeletion$', views.submitDatabaseDeletion, name='submitDatabaseDeletion'), + re_path(r'^listDBs$', views.listDBs, name='listDBs'), + re_path(r'^changePassword$', views.changePassword, name='changePassword'), + re_path(r'^remoteAccess$', views.remoteAccess, name='remoteAccess'), + re_path(r'^allowRemoteIP$', views.allowRemoteIP, name='allowRemoteIP'), + re_path(r'^phpMyAdmin$', views.phpMyAdmin, name='phpMyAdmin'), + re_path(r'^generateAccess$', views.generateAccess, name='generateAccess'), + re_path(r'^fetchDetailsPHPMYAdmin$', views.fetchDetailsPHPMYAdmin, name='fetchDetailsPHPMYAdmin'), +] diff --git a/dns/signals.py b/dns/signals.py index c7c9c4e5e..d25b0de6d 100755 --- a/dns/signals.py +++ b/dns/signals.py @@ -3,31 +3,31 @@ from django.dispatch import Signal ## This event is fired before CyberPanel core start creation of NS Records. -preNSCreation = Signal(providing_args=["request"]) +preNSCreation = Signal() ## This event is fired after CyberPanel core finished creation NS Records. -postNSCreation = Signal(providing_args=["request", "response"]) +postNSCreation = Signal() ## This event is fired before CyberPanel core start creation DNS Zone. -preZoneCreation = Signal(providing_args=["request"]) +preZoneCreation = Signal() ## This event is fired after CyberPanel core finished creation of DNS Zone. -postZoneCreation = Signal(providing_args=["request", "response"]) +postZoneCreation = Signal() ## This event is fired before CyberPanel core start to add an DNS record. -preAddDNSRecord = Signal(providing_args=["request"]) +preAddDNSRecord = Signal() ## This event is fired after CyberPanel core finished adding DNS record. -postAddDNSRecord = Signal(providing_args=["request", "response"]) +postAddDNSRecord = Signal() ## This event is fired before CyberPanel core start deletion of DNS Record. -preDeleteDNSRecord = Signal(providing_args=["request"]) +preDeleteDNSRecord = Signal() ## This event is fired after CyberPanel core finished deletion DNS Record. -postDeleteDNSRecord = Signal(providing_args=["request", "response"]) +postDeleteDNSRecord = Signal() ## This event is fired before CyberPanel core start deletion of a DNS Zone. -preSubmitZoneDeletion = Signal(providing_args=["request"]) +preSubmitZoneDeletion = Signal() ## This event is fired after CyberPanel core finished deletion of DNS Zone. -postSubmitZoneDeletion = Signal(providing_args=["request", "response"]) \ No newline at end of file +postSubmitZoneDeletion = Signal() \ No newline at end of file diff --git a/dns/urls.py b/dns/urls.py index dcb5a3963..00f019f68 100755 --- a/dns/urls.py +++ b/dns/urls.py @@ -1,32 +1,32 @@ -from django.conf.urls import url +from django.urls import re_path from . import views urlpatterns = [ - url(r'^$', views.loadDNSHome, name='dnsHome'), - url(r'^createNameserver', views.createNameserver, name='createNameserver'), - url(r'^configureDefaultNameServers$', views.configureDefaultNameServers, name='configureDefaultNameServers'), - url(r'^createDNSZone', views.createDNSZone, name='createDNSZone'), - url(r'^addDeleteDNSRecords$', views.addDeleteDNSRecords, name='addDeleteDNSRecords'), - url(r'^addDeleteDNSRecordsCloudFlare$', views.addDeleteDNSRecordsCloudFlare, name='addDeleteDNSRecordsCloudFlare'), - url(r'^ResetDNSConfigurations$', views.ResetDNSConfigurations, name='ResetDNSConfigurations'), - url(r'^resetDNSnow$', views.resetDNSnow, name='resetDNSnow'), - url(r'^getresetstatus', views.getresetstatus, name='getresetstatus'), + re_path(r'^$', views.loadDNSHome, name='dnsHome'), + re_path(r'^createNameserver$', views.createNameserver, name='createNameserver'), + re_path(r'^configureDefaultNameServers$', views.configureDefaultNameServers, name='configureDefaultNameServers'), + re_path(r'^createDNSZone$', views.createDNSZone, name='createDNSZone'), + re_path(r'^addDeleteDNSRecords$', views.addDeleteDNSRecords, name='addDeleteDNSRecords'), + re_path(r'^addDeleteDNSRecordsCloudFlare$', views.addDeleteDNSRecordsCloudFlare, name='addDeleteDNSRecordsCloudFlare'), + re_path(r'^ResetDNSConfigurations$', views.ResetDNSConfigurations, name='ResetDNSConfigurations'), + re_path(r'^resetDNSnow$', views.resetDNSnow, name='resetDNSnow'), + re_path(r'^getresetstatus$', views.getresetstatus, name='getresetstatus'), # JS Functions - url(r'^NSCreation',views.NSCreation,name="NSCreation"), - url(r'^zoneCreation', views.zoneCreation, name='zoneCreation'), - url(r'^getCurrentRecordsForDomain$',views.getCurrentRecordsForDomain,name='getCurrentRecordsForDomain'), - url(r'^addDNSRecord$',views.addDNSRecord,name='addDNSRecord'), - url(r'^deleteDNSRecord$',views.deleteDNSRecord,name='deleteDNSRecord'), - url(r'^deleteDNSZone',views.deleteDNSZone,name='deleteDNSZone'), - url(r'^submitZoneDeletion',views.submitZoneDeletion,name='submitZoneDeletion'), - url(r'^saveNSConfigurations$', views.saveNSConfigurations, name='saveNSConfigurations'), - url(r'^saveCFConfigs$', views.saveCFConfigs, name='saveCFConfigs'), - url(r'^updateRecord$', views.updateRecord, name='updateRecord'), + re_path(r'^NSCreation$', views.NSCreation, name='NSCreation'), + re_path(r'^zoneCreation$', views.zoneCreation, name='zoneCreation'), + re_path(r'^getCurrentRecordsForDomain$', views.getCurrentRecordsForDomain, name='getCurrentRecordsForDomain'), + re_path(r'^addDNSRecord$', views.addDNSRecord, name='addDNSRecord'), + re_path(r'^deleteDNSRecord$', views.deleteDNSRecord, name='deleteDNSRecord'), + re_path(r'^deleteDNSZone$', views.deleteDNSZone, name='deleteDNSZone'), + re_path(r'^submitZoneDeletion$', views.submitZoneDeletion, name='submitZoneDeletion'), + re_path(r'^saveNSConfigurations$', views.saveNSConfigurations, name='saveNSConfigurations'), + re_path(r'^saveCFConfigs$', views.saveCFConfigs, name='saveCFConfigs'), + re_path(r'^updateRecord$', views.updateRecord, name='updateRecord'), - url(r'^getCurrentRecordsForDomainCloudFlare$', views.getCurrentRecordsForDomainCloudFlare, name='getCurrentRecordsForDomainCloudFlare'), - url(r'^deleteDNSRecordCloudFlare$', views.deleteDNSRecordCloudFlare, name='deleteDNSRecordCloudFlare'), - url(r'^addDNSRecordCloudFlare$', views.addDNSRecordCloudFlare,name='addDNSRecordCloudFlare'), - url(r'^syncCF$', views.syncCF, name='syncCF'), - url(r'^enableProxy$', views.enableProxy, name='enableProxy') -] \ No newline at end of file + re_path(r'^getCurrentRecordsForDomainCloudFlare$', views.getCurrentRecordsForDomainCloudFlare, name='getCurrentRecordsForDomainCloudFlare'), + re_path(r'^deleteDNSRecordCloudFlare$', views.deleteDNSRecordCloudFlare, name='deleteDNSRecordCloudFlare'), + re_path(r'^addDNSRecordCloudFlare$', views.addDNSRecordCloudFlare, name='addDNSRecordCloudFlare'), + re_path(r'^syncCF$', views.syncCF, name='syncCF'), + re_path(r'^enableProxy$', views.enableProxy, name='enableProxy'), +] diff --git a/dockerManager/signals.py b/dockerManager/signals.py index 81a43e415..6e1c4d1e0 100755 --- a/dockerManager/signals.py +++ b/dockerManager/signals.py @@ -4,7 +4,7 @@ from django.dispatch import Signal ## This event is fired before CyberPanel core start installation of Docker -preDockerInstallation = Signal(providing_args=["request"]) +preDockerInstallation = Signal() ## This event is fired after CyberPanel core finished intallation of Docker. -postDockerInstallation = Signal(providing_args=["request", "response"]) +postDockerInstallation = Signal() diff --git a/dockerManager/urls.py b/dockerManager/urls.py index 2fdfb1ef4..2c145162b 100755 --- a/dockerManager/urls.py +++ b/dockerManager/urls.py @@ -1,34 +1,33 @@ -from django.conf.urls import url -from django.urls import path +from django.urls import path, re_path from . import views from websiteFunctions.views import Dockersitehome urlpatterns = [ - url(r'^$', views.loadDockerHome, name='dockerHome'), -# url(r'^images', views.loadImages, name='loadImages'), - url(r'^getTags', views.getTags, name='getTags'), - url(r'^runContainer', views.runContainer, name='runContainer'), - url(r'^submitContainerCreation', views.submitContainerCreation, name='submitContainerCreation'), - url(r'^listContainers', views.listContainers, name='listContainers'), - url(r'^getContainerList', views.getContainerList, name='getContainerList'), - url(r'^getContainerLogs', views.getContainerLogs, name='getContainerLogs'), - url(r'^installImage', views.installImage, name='installImage'), - url(r'^delContainer', views.delContainer, name='delContainer'), - url(r'^doContainerAction', views.doContainerAction, name='doContainerAction'), - url(r'^getContainerStatus', views.getContainerStatus, name='getContainerStatus'), - url(r'^exportContainer', views.exportContainer, name='exportContainer'), - url(r'^saveContainerSettings', views.saveContainerSettings, name='saveContainerSettings'), - url(r'^getContainerTop', views.getContainerTop, name='getContainerTop'), - url(r'^assignContainer', views.assignContainer, name='assignContainer'), - url(r'^searchImage', views.searchImage, name='searchImage'), - url(r'^manageImages', views.manageImages, name='manageImages'), - url(r'^getImageHistory', views.getImageHistory, name='getImageHistory'), - url(r'^removeImage', views.removeImage, name='removeImage'), - url(r'^recreateContainer', views.recreateContainer, name='recreateContainer'), - url(r'^installDocker', views.installDocker, name='installDocker'), - url(r'^images', views.images, name='containerImage'), - url(r'^view/(?P(.*))$', views.viewContainer, name='viewContainer'), + re_path(r'^$', views.loadDockerHome, name='dockerHome'), + # re_path(r'^images$', views.loadImages, name='loadImages'), + re_path(r'^getTags$', views.getTags, name='getTags'), + re_path(r'^runContainer$', views.runContainer, name='runContainer'), + re_path(r'^submitContainerCreation$', views.submitContainerCreation, name='submitContainerCreation'), + re_path(r'^listContainers$', views.listContainers, name='listContainers'), + re_path(r'^getContainerList$', views.getContainerList, name='getContainerList'), + re_path(r'^getContainerLogs$', views.getContainerLogs, name='getContainerLogs'), + re_path(r'^installImage$', views.installImage, name='installImage'), + re_path(r'^delContainer$', views.delContainer, name='delContainer'), + re_path(r'^doContainerAction$', views.doContainerAction, name='doContainerAction'), + re_path(r'^getContainerStatus$', views.getContainerStatus, name='getContainerStatus'), + re_path(r'^exportContainer$', views.exportContainer, name='exportContainer'), + re_path(r'^saveContainerSettings$', views.saveContainerSettings, name='saveContainerSettings'), + re_path(r'^getContainerTop$', views.getContainerTop, name='getContainerTop'), + re_path(r'^assignContainer$', views.assignContainer, name='assignContainer'), + re_path(r'^searchImage$', views.searchImage, name='searchImage'), + re_path(r'^manageImages$', views.manageImages, name='manageImages'), + re_path(r'^getImageHistory$', views.getImageHistory, name='getImageHistory'), + re_path(r'^removeImage$', views.removeImage, name='removeImage'), + re_path(r'^recreateContainer$', views.recreateContainer, name='recreateContainer'), + re_path(r'^installDocker$', views.installDocker, name='installDocker'), + re_path(r'^images$', views.images, name='containerImage'), + re_path(r'^view/(?P.+)$', views.viewContainer, name='viewContainer'), path('manage//app', Dockersitehome, name='Dockersitehome'), path('getDockersiteList', views.getDockersiteList, name='getDockersiteList'), @@ -37,4 +36,4 @@ urlpatterns = [ path('recreateappcontainer', views.recreateappcontainer, name='recreateappcontainer'), path('RestartContainerAPP', views.RestartContainerAPP, name='RestartContainerAPP'), path('StopContainerAPP', views.StopContainerAPP, name='StopContainerAPP'), -] \ No newline at end of file +] diff --git a/emailMarketing/urls.py b/emailMarketing/urls.py index 287e1dc4b..fd54fe972 100755 --- a/emailMarketing/urls.py +++ b/emailMarketing/urls.py @@ -1,30 +1,31 @@ -from django.conf.urls import url +from django.urls import path, re_path from . import views + urlpatterns = [ - url(r'^$', views.emailMarketing, name='emailMarketing'), - url(r'^fetchUsers$', views.fetchUsers, name='fetchUsers'), - url(r'^enableDisableMarketing$', views.enableDisableMarketing, name='enableDisableMarketing'), - url(r'^saveConfigureVerify$', views.saveConfigureVerify, name='saveConfigureVerify'), - url(r'^fetchVerifyLogs$', views.fetchVerifyLogs, name='fetchVerifyLogs'), - url(r'^(?P(.*))/emailLists$', views.createEmailList, name='createEmailList'), - url(r'^submitEmailList$', views.submitEmailList, name='submitEmailList'), - url(r'^(?P(.*))/manageLists$', views.manageLists, name='manageLists'), - url(r'^(?P(.*))/manageSMTP$', views.manageSMTP, name='manageSMTP'), - url(r'^(?P(.*))/configureVerify$', views.configureVerify, name='configureVerify'), - url(r'^fetchEmails$', views.fetchEmails, name='fetchEmails'), - url(r'^deleteList$', views.deleteList, name='deleteList'), - url(r'^emailVerificationJob$', views.emailVerificationJob, name='emailVerificationJob'), - url(r'^deleteEmail$', views.deleteEmail, name='deleteEmail'), - url(r'^saveSMTPHost$', views.saveSMTPHost, name='saveSMTPHost'), - url(r'^fetchSMTPHosts$', views.fetchSMTPHosts, name='fetchSMTPHosts'), - url(r'^smtpHostOperations$', views.smtpHostOperations, name='smtpHostOperations'), - url(r'^composeEmailMessage$', views.composeEmailMessage, name='composeEmailMessage'), - url(r'^saveEmailTemplate$', views.saveEmailTemplate, name='saveEmailTemplate'), - url(r'^sendEmails$', views.sendEmails, name='sendEmails'), - url(r'^preview/(?P[-\w]+)/$', views.templatePreview, name='templatePreview'), - url(r'^fetchJobs$', views.fetchJobs, name='fetchJobs'), - url(r'^startEmailJob$', views.startEmailJob, name='startEmailJob'), - url(r'^deleteTemplate$', views.deleteTemplate, name='deleteTemplate'), - url(r'^deleteJob$', views.deleteJob, name='deleteJob'), - url(r'^remove/(?P[-\w]+)/(?P\w+@.+)$', views.remove, name='remove'), -] \ No newline at end of file + path('', views.emailMarketing, name='emailMarketing'), + path('fetchUsers', views.fetchUsers, name='fetchUsers'), + path('enableDisableMarketing', views.enableDisableMarketing, name='enableDisableMarketing'), + path('saveConfigureVerify', views.saveConfigureVerify, name='saveConfigureVerify'), + path('fetchVerifyLogs', views.fetchVerifyLogs, name='fetchVerifyLogs'), + re_path(r'^(?P.+)/emailLists$', views.createEmailList, name='createEmailList'), + path('submitEmailList', views.submitEmailList, name='submitEmailList'), + re_path(r'^(?P.+)/manageLists$', views.manageLists, name='manageLists'), + re_path(r'^(?P.+)/manageSMTP$', views.manageSMTP, name='manageSMTP'), + re_path(r'^(?P.+)/configureVerify$', views.configureVerify, name='configureVerify'), + path('fetchEmails', views.fetchEmails, name='fetchEmails'), + path('deleteList', views.deleteList, name='deleteList'), + path('emailVerificationJob', views.emailVerificationJob, name='emailVerificationJob'), + path('deleteEmail', views.deleteEmail, name='deleteEmail'), + path('saveSMTPHost', views.saveSMTPHost, name='saveSMTPHost'), + path('fetchSMTPHosts', views.fetchSMTPHosts, name='fetchSMTPHosts'), + path('smtpHostOperations', views.smtpHostOperations, name='smtpHostOperations'), + path('composeEmailMessage', views.composeEmailMessage, name='composeEmailMessage'), + path('saveEmailTemplate', views.saveEmailTemplate, name='saveEmailTemplate'), + path('sendEmails', views.sendEmails, name='sendEmails'), + re_path(r'^preview/(?P[-\w]+)/$', views.templatePreview, name='templatePreview'), + path('fetchJobs', views.fetchJobs, name='fetchJobs'), + path('startEmailJob', views.startEmailJob, name='startEmailJob'), + path('deleteTemplate', views.deleteTemplate, name='deleteTemplate'), + path('deleteJob', views.deleteJob, name='deleteJob'), + re_path(r'^remove/(?P[-\w]+)/(?P\w+@.+)$', views.remove, name='remove'), +] diff --git a/emailPremium/urls.py b/emailPremium/urls.py index ba29c3fd2..1141e4558 100755 --- a/emailPremium/urls.py +++ b/emailPremium/urls.py @@ -1,80 +1,58 @@ -from django.conf.urls import url +from django.urls import path, re_path from . import views urlpatterns = [ + path('emailPolicyServer', views.emailPolicyServer, name='emailPolicyServer'), + path('listDomains', views.listDomains, name='listDomains'), + path('getFurtherDomains', views.getFurtherDomains, name='getFurtherDomains'), + path('enableDisableEmailLimits', views.enableDisableEmailLimits, name='enableDisableEmailLimits'), + path('changeDomainLimit', views.changeDomainLimit, name='changeDomainLimit'), + path('getFurtherEmail', views.getFurtherEmail, name='getFurtherEmail'), + path('enableDisableIndividualEmailLimits', views.enableDisableIndividualEmailLimits, name='enableDisableIndividualEmailLimits'), + re_path(r'(?P\w+@.+)', views.emailPage, name='emailPage'), + path('getEmailStats', views.getEmailStats, name='getEmailStats'), + path('enableDisableIndividualEmailLogs', views.enableDisableIndividualEmailLogs, name='enableDisableIndividualEmailLogs'), + path('changeDomainEmailLimitsIndividual', views.changeDomainEmailLimitsIndividual, name='changeDomainEmailLimitsIndividual'), + path('getEmailLogs', views.getEmailLogs, name='getEmailLogs'), + path('flushEmailLogs', views.flushEmailLogs, name='flushEmailLogs'), - url(r'^emailPolicyServer$', views.emailPolicyServer, name='emailPolicyServer'), - url(r'^listDomains$', views.listDomains, name='listDomains'), - url(r'^getFurtherDomains$', views.getFurtherDomains, name='getFurtherDomains'), - url(r'^enableDisableEmailLimits$', views.enableDisableEmailLimits, name='enableDisableEmailLimits'), + # SpamAssassin + path('SpamAssassin', views.spamAssassinHome, name='SpamAssassin'), + path('installSpamAssassin', views.installSpamAssassin, name='installSpamAssassin'), + path('installStatusSpamAssassin', views.installStatusSpamAssassin, name='installStatusSpamAssassin'), + path('fetchSpamAssassinSettings', views.fetchSpamAssassinSettings, name='fetchSpamAssassinSettings'), + path('saveSpamAssassinConfigurations', views.saveSpamAssassinConfigurations, name='saveSpamAssassinConfigurations'), + path('fetchPolicyServerStatus', views.fetchPolicyServerStatus, name='fetchPolicyServerStatus'), + path('savePolicyServerStatus', views.savePolicyServerStatus, name='savePolicyServerStatus'), + path('mailQueue', views.mailQueue, name='mailQueue'), + path('fetchMailQueue', views.fetchMailQueue, name='fetchMailQueue'), + path('fetchMessage', views.fetchMessage, name='fetchMessage'), + path('flushQueue', views.flushQueue, name='flushQueue'), + path('delete', views.delete, name='delete'), + path('MailScanner', views.MailScanner, name='MailScanner'), + path('installMailScanner', views.installMailScanner, name='installMailScanner'), + path('installStatusMailScanner', views.installStatusMailScanner, name='installStatusMailScanner'), - url(r'^changeDomainLimit$', views.changeDomainLimit, name='changeDomainLimit'), - url(r'^getFurtherEmail$', views.getFurtherEmail, name='getFurtherEmail'), + # Rspamd + path('Rspamd', views.Rspamd, name='Rspamd'), + path('installRspamd', views.installRspamd, name='installRspamd'), + path('installStatusRspamd', views.installStatusRspamd, name='installStatusRspamd'), + path('fetchRspamdSettings', views.fetchRspamdSettings, name='fetchRspamdSettings'), + path('saveRspamdConfigurations', views.saveRspamdConfigurations, name='saveRspamdConfigurations'), + path('savepostfixConfigurations', views.savepostfixConfigurations, name='savepostfixConfigurations'), + path('saveRedisConfigurations', views.saveRedisConfigurations, name='saveRedisConfigurations'), + path('saveclamavConfigurations', views.saveclamavConfigurations, name='saveclamavConfigurations'), + path('unistallRspamd', views.unistallRspamd, name='unistallRspamd'), + path('uninstallStatusRspamd', views.uninstallStatusRspamd, name='uninstallStatusRspamd'), + path('FetchRspamdLog', views.FetchRspamdLog, name='FetchRspamdLog'), + path('RestartRspamd', views.RestartRspamd, name='RestartRspamd'), - url(r'^enableDisableIndividualEmailLimits$', views.enableDisableIndividualEmailLimits, name='enableDisableIndividualEmailLimits'), - - url(r'(?P\w+@.+)', views.emailPage, name='emailPage'), - url(r'^getEmailStats$', views.getEmailStats, name='getEmailStats'), - - - url(r'^enableDisableIndividualEmailLogs$', views.enableDisableIndividualEmailLogs, name='enableDisableIndividualEmailLogs'), - url(r'^changeDomainEmailLimitsIndividual$', views.changeDomainEmailLimitsIndividual, name='changeDomainEmailLimitsIndividual'), - url(r'^getEmailLogs$', views.getEmailLogs, name='getEmailLogs'), - url(r'^flushEmailLogs$', views.flushEmailLogs, name='flushEmailLogs'), - - ## SpamAssassin - - url(r'^SpamAssassin$', views.spamAssassinHome, name='SpamAssassin'), - - url(r'^installSpamAssassin$', views.installSpamAssassin, name='installSpamAssassin'), - url(r'^installStatusSpamAssassin$', views.installStatusSpamAssassin, name='installStatusSpamAssassin'), - url(r'^fetchSpamAssassinSettings$', views.fetchSpamAssassinSettings, name='fetchSpamAssassinSettings'), - url(r'^saveSpamAssassinConfigurations$', views.saveSpamAssassinConfigurations, name='saveSpamAssassinConfigurations'), - url(r'^fetchPolicyServerStatus$', views.fetchPolicyServerStatus, name='fetchPolicyServerStatus'), - - url(r'^savePolicyServerStatus$', views.savePolicyServerStatus, name='savePolicyServerStatus'), - url(r'^mailQueue$', views.mailQueue, name='mailQueue'), - url(r'^fetchMailQueue$', views.fetchMailQueue, name='fetchMailQueue'), - url(r'^fetchMessage$', views.fetchMessage, name='fetchMessage'), - url(r'^flushQueue$', views.flushQueue, name='flushQueue'), - url(r'^delete$', views.delete, name='delete'), - url(r'^MailScanner$', views.MailScanner, name='MailScanner'), - url(r'^installMailScanner$', views.installMailScanner, name='installMailScanner'), - url(r'^installStatusMailScanner$', views.installStatusMailScanner, name='installStatusMailScanner'), - - - - url(r'^Rspamd$', views.Rspamd, name='Rspamd'), - - url(r'^installRspamd$', views.installRspamd, name='installRspamd'), - url(r'^installStatusRspamd$', views.installStatusRspamd, name='installStatusRspamd'), - url(r'^fetchRspamdSettings$', views.fetchRspamdSettings, name='fetchRspamdSettings'), - url(r'^saveRspamdConfigurations$', views.saveRspamdConfigurations, name='saveRspamdConfigurations'), - url(r'^savepostfixConfigurations$', views.savepostfixConfigurations, name='savepostfixConfigurations'), - url(r'^saveRedisConfigurations$', views.saveRedisConfigurations, name='saveRedisConfigurations'), - url(r'^saveclamavConfigurations$', views.saveclamavConfigurations, name='saveclamavConfigurations'), - url(r'^unistallRspamd$', views.unistallRspamd, name='unistallRspamd'), - url(r'^uninstallStatusRspamd$', views.uninstallStatusRspamd, name='uninstallStatusRspamd'), - url(r'^FetchRspamdLog$', views.FetchRspamdLog, name='FetchRspamdLog'), - url(r'^RestartRspamd$', views.RestartRspamd, name='RestartRspamd'), - - url(r'^EmailDebugger$', views.EmailDebugger, name='EmailDebugger'), - - url(r'^RunServerLevelEmailChecks$', views.RunServerLevelEmailChecks, name='RunServerLevelEmailChecks'), - url(r'^ResetEmailConfigurations$', views.ResetEmailConfigurations, name='ResetEmailConfigurations'), - url(r'^statusFunc$', views.statusFunc, name='statusFunc'), - url(r'^ReadReport$', views.ReadReport, name='ReadReport'), - - - url(r'^debugEmailForSite$', views.debugEmailForSite, name='debugEmailForSite'), - url(r'^fixMailSSL$', views.fixMailSSL, name='fixMailSSL'), - - - url(r'^(?P(.*))$', views.emailLimits, name='emailLimits'), - - - - - - -] \ No newline at end of file + path('EmailDebugger', views.EmailDebugger, name='EmailDebugger'), + path('RunServerLevelEmailChecks', views.RunServerLevelEmailChecks, name='RunServerLevelEmailChecks'), + path('ResetEmailConfigurations', views.ResetEmailConfigurations, name='ResetEmailConfigurations'), + path('statusFunc', views.statusFunc, name='statusFunc'), + path('ReadReport', views.ReadReport, name='ReadReport'), + path('debugEmailForSite', views.debugEmailForSite, name='debugEmailForSite'), + path('fixMailSSL', views.fixMailSSL, name='fixMailSSL'), + re_path(r'^(?P.*)$', views.emailLimits, name='emailLimits'), +] diff --git a/examplePlugin/urls.py b/examplePlugin/urls.py index a05d18e24..421972e1a 100755 --- a/examplePlugin/urls.py +++ b/examplePlugin/urls.py @@ -1,6 +1,7 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^$', views.examplePlugin, name='examplePlugin'), + path('', views.examplePlugin, name='examplePlugin'), ] + diff --git a/filemanager/urls.py b/filemanager/urls.py index bd58d4934..dd223e7ca 100755 --- a/filemanager/urls.py +++ b/filemanager/urls.py @@ -1,15 +1,13 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^upload$',views.upload, name='upload'), - url(r'^changePermissions$',views.changePermissions, name='changePermissions'), - url(r'^controller$',views.controller, name='controller'), - url(r'^downloadFile$',views.downloadFile, name='downloadFile'), - url(r'^RootDownloadFile$',views.RootDownloadFile, name='RootDownloadFile'), - url(r'^editFile$', views.editFile, name='editFile'), - url('^Filemanager', views.FileManagerRoot, name='Filemanager'), - url(r'^(?P(.*))$', views.loadFileManagerHome, name='loadFileManagerHome'), - + path('upload/', views.upload, name='upload'), + path('changePermissions/', views.changePermissions, name='changePermissions'), + path('controller/', views.controller, name='controller'), + path('downloadFile/', views.downloadFile, name='downloadFile'), + path('RootDownloadFile/', views.RootDownloadFile, name='RootDownloadFile'), + path('editFile/', views.editFile, name='editFile'), + path('Filemanager/', views.FileManagerRoot, name='Filemanager'), + path('/', views.loadFileManagerHome, name='loadFileManagerHome'), ] - diff --git a/firewall/signals.py b/firewall/signals.py index b7605748d..00c9dfb84 100755 --- a/firewall/signals.py +++ b/firewall/signals.py @@ -4,149 +4,149 @@ from django.dispatch import Signal ## This event is fired before CyberPanel core load Firewall home template. -preFirewallHome = Signal(providing_args=["request"]) +preFirewallHome = Signal() ## This event is fired after CyberPanel core finished loading Firewall home template. -postFirewallHome = Signal(providing_args=["request", "response"]) +postFirewallHome = Signal() ## This event is fired before CyberPanel core start adding a firewall rule. -preAddRule = Signal(providing_args=["request"]) +preAddRule = Signal() ## This event is fired after CyberPanel core finished adding a firewall rule. -postAddRule = Signal(providing_args=["request", "response"]) +postAddRule = Signal() ## This event is fired before CyberPanel core start deleting a firewall rule. -preDeleteRule = Signal(providing_args=["request"]) +preDeleteRule = Signal() ## This event is fired after CyberPanel core finished deleting a firewall rule. -postDeleteRule = Signal(providing_args=["request", "response"]) +postDeleteRule = Signal() ## This event is fired before CyberPanel core start to reload firewalld. -preReloadFirewall = Signal(providing_args=["request"]) +preReloadFirewall = Signal() ## This event is fired after CyberPanel core finished reloading firewalld. -postReloadFirewall = Signal(providing_args=["request", "response"]) +postReloadFirewall = Signal() ## This event is fired before CyberPanel core start firewalld. -preStartFirewall = Signal(providing_args=["request"]) +preStartFirewall = Signal() ## This event is fired after CyberPanel core finished starting firewalld. -postStartFirewall = Signal(providing_args=["request", "response"]) +postStartFirewall = Signal() ## This event is fired before CyberPanel core stop firewalld. -preStopFirewall = Signal(providing_args=["request"]) +preStopFirewall = Signal() ## This event is fired after CyberPanel core finished stopping firewalld. -postStopFirewall = Signal(providing_args=["request", "response"]) +postStopFirewall = Signal() ## This event is fired before CyberPanel core start to fetch firewalld status. -preFirewallStatus = Signal(providing_args=["request"]) +preFirewallStatus = Signal() ## This event is fired after CyberPanel core finished getting firewalld status. -postFirewallStatus = Signal(providing_args=["request", "response"]) +postFirewallStatus = Signal() ## This event is fired before CyberPanel core start loading template for securing ssh page. -preSecureSSH = Signal(providing_args=["request"]) +preSecureSSH = Signal() ## This event is fired after CyberPanel core finished oading template for securing ssh page. -postSecureSSH = Signal(providing_args=["request", "response"]) +postSecureSSH = Signal() ## This event is fired before CyberPanel core start saving SSH configs. -preSaveSSHConfigs = Signal(providing_args=["request"]) +preSaveSSHConfigs = Signal() ## This event is fired after CyberPanel core finished saving saving SSH configs. -postSaveSSHConfigs = Signal(providing_args=["request", "response"]) +postSaveSSHConfigs = Signal() ## This event is fired before CyberPanel core start deletion of an SSH key. -preDeleteSSHKey = Signal(providing_args=["request"]) +preDeleteSSHKey = Signal() ## This event is fired after CyberPanel core finished deletion of an SSH key. -postDeleteSSHKey = Signal(providing_args=["request", "response"]) +postDeleteSSHKey = Signal() ## This event is fired before CyberPanel core start adding an ssh key. -preAddSSHKey = Signal(providing_args=["request"]) +preAddSSHKey = Signal() ## This event is fired after CyberPanel core finished adding ssh key. -postAddSSHKey = Signal(providing_args=["request", "response"]) +postAddSSHKey = Signal() ## This event is fired before CyberPanel core load template for Mod Security Page. -preLoadModSecurityHome = Signal(providing_args=["request"]) +preLoadModSecurityHome = Signal() ## This event is fired after CyberPanel core is finished loading template for Mod Security Page. -postLoadModSecurityHome = Signal(providing_args=["request", "response"]) +postLoadModSecurityHome = Signal() ## This event is fired before CyberPanel core start saving ModSecurity configurations. -preSaveModSecConfigurations = Signal(providing_args=["request"]) +preSaveModSecConfigurations = Signal() ## This event is fired after CyberPanel core is saving ModSecurity configurations. -postSaveModSecConfigurations = Signal(providing_args=["request", "response"]) +postSaveModSecConfigurations = Signal() ## This event is fired before CyberPanel core start to load Mod Sec Rules Template Page. -preModSecRules = Signal(providing_args=["request"]) +preModSecRules = Signal() ## This event is fired after CyberPanel core is finished loading Mod Sec Rules Template Page. -postModSecRules = Signal(providing_args=["request", "response"]) +postModSecRules = Signal() ## This event is fired before CyberPanel core start saving custom Mod Sec rules. -preSaveModSecRules = Signal(providing_args=["request"]) +preSaveModSecRules = Signal() ## This event is fired after CyberPanel core is finished saving custom Mod Sec rules. -postSaveModSecRules = Signal(providing_args=["request", "response"]) +postSaveModSecRules = Signal() ## This event is fired before CyberPanel core start to load template for Mod Sec rules packs. -preModSecRulesPacks = Signal(providing_args=["request"]) +preModSecRulesPacks = Signal() ## This event is fired after CyberPanel core is finished loading template for Mod Sec rules packs. -postModSecRulesPacks = Signal(providing_args=["request", "response"]) +postModSecRulesPacks = Signal() ## This event is fired before CyberPanel core fetch status of Comodo or OWASP rules. -preGetOWASPAndComodoStatus = Signal(providing_args=["request"]) +preGetOWASPAndComodoStatus = Signal() ## This event is fired after CyberPanel core is finished fetching status of Comodo or OWASP rules. -postGetOWASPAndComodoStatus = Signal(providing_args=["request", "response"]) +postGetOWASPAndComodoStatus = Signal() ## This event is fired before CyberPanel core start installing Comodo or OWASP rules. -preInstallModSecRulesPack = Signal(providing_args=["request"]) +preInstallModSecRulesPack = Signal() ## This event is fired after CyberPanel core is finished installing Comodo or OWASP rules. -postInstallModSecRulesPack = Signal(providing_args=["request", "response"]) +postInstallModSecRulesPack = Signal() ## This event is fired before CyberPanel core fetch available rules file for Comodo or OWASP. -preGetRulesFiles = Signal(providing_args=["request"]) +preGetRulesFiles = Signal() ## This event is fired after CyberPanel core is finished fetching available rules file for Comodo or OWASP. -postGetRulesFiles = Signal(providing_args=["request", "response"]) +postGetRulesFiles = Signal() ## This event is fired before CyberPanel core start to enable or disable a rule file. -preEnableDisableRuleFile = Signal(providing_args=["request"]) +preEnableDisableRuleFile = Signal() ## This event is fired after CyberPanel core is finished enabling or disabling a rule file. -postEnableDisableRuleFile = Signal(providing_args=["request", "response"]) +postEnableDisableRuleFile = Signal() ## This event is fired before CyberPanel core start to load template for CSF. -preCSF = Signal(providing_args=["request"]) +preCSF = Signal() ## This event is fired after CyberPanel core is finished loading template for CSF. -postCSF = Signal(providing_args=["request", "response"]) +postCSF = Signal() ## This event is fired before CyberPanel core start to enable/disable CSF firewall. -preChangeStatus = Signal(providing_args=["request"]) +preChangeStatus = Signal() ## This event is fired after CyberPanel core is finished enabling/disabling CSF firewall. -postChangeStatus = Signal(providing_args=["request", "response"]) +postChangeStatus = Signal() ## This event is fired before CyberPanel core start modifying CSF ports. -preModifyPorts = Signal(providing_args=["request"]) +preModifyPorts = Signal() ## This event is fired after CyberPanel core is finished modifying CSF ports. -postModifyPorts = Signal(providing_args=["request", "response"]) +postModifyPorts = Signal() ## This event is fired before CyberPanel core start modifying IPs. -preModifyIPs = Signal(providing_args=["request"]) +preModifyIPs = Signal() ## This event is fired after CyberPanel core is finished modifying IPs. -postModifyIPs = Signal(providing_args=["request", "response"]) \ No newline at end of file +postModifyIPs = Signal() \ No newline at end of file diff --git a/firewall/urls.py b/firewall/urls.py index 6b96c589b..afe28b37a 100755 --- a/firewall/urls.py +++ b/firewall/urls.py @@ -1,72 +1,60 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^securityHome', views.securityHome, name='securityHome'), - url(r'^$', views.firewallHome, name='firewallHome'), - url(r'^getCurrentRules', views.getCurrentRules, name='getCurrentRules'), - url(r'^addRule', views.addRule, name='addRule'), - url(r'^deleteRule', views.deleteRule, name='deleteRule'), + path('securityHome/', views.securityHome, name='securityHome'), + path('', views.firewallHome, name='firewallHome'), + path('getCurrentRules/', views.getCurrentRules, name='getCurrentRules'), + path('addRule/', views.addRule, name='addRule'), + path('deleteRule/', views.deleteRule, name='deleteRule'), + path('reloadFirewall/', views.reloadFirewall, name='reloadFirewall'), + path('stopFirewall/', views.stopFirewall, name='stopFirewall'), + path('startFirewall/', views.startFirewall, name='startFirewall'), + path('firewallStatus/', views.firewallStatus, name='firewallStatus'), - url(r'^reloadFirewall', views.reloadFirewall, name='reloadFirewall'), - url(r'^stopFirewall', views.stopFirewall, name='stopFirewall'), - url(r'^startFirewall', views.startFirewall, name='startFirewall'), - url(r'^firewallStatus', views.firewallStatus, name='firewallStatus'), + # Secure SSH + path('secureSSH/', views.secureSSH, name='secureSSH'), + path('getSSHConfigs/', views.getSSHConfigs, name='getSSHConfigs'), + path('saveSSHConfigs/', views.saveSSHConfigs, name='saveSSHConfigs'), + path('deleteSSHKey/', views.deleteSSHKey, name='deleteSSHKey'), + path('addSSHKey/', views.addSSHKey, name='addSSHKey'), - ## secure SSH + # ModSecurity + path('modSecurity/', views.loadModSecurityHome, name='modSecurity'), + path('installModSec/', views.installModSec, name='installModSec'), + path('installStatusModSec/', views.installStatusModSec, name='installStatusModSec'), + path('fetchModSecSettings/', views.fetchModSecSettings, name='fetchModSecSettings'), + path('saveModSecConfigurations/', views.saveModSecConfigurations, name='saveModSecConfigurations'), + path('modSecRules/', views.modSecRules, name='modSecRules'), + path('fetchModSecRules/', views.fetchModSecRules, name='fetchModSecRules'), + path('saveModSecRules/', views.saveModSecRules, name='saveModSecRules'), + path('modSecRulesPacks/', views.modSecRulesPacks, name='modSecRulesPacks'), + path('getOWASPAndComodoStatus/', views.getOWASPAndComodoStatus, name='getOWASPAndComodoStatus'), + path('installModSecRulesPack/', views.installModSecRulesPack, name='installModSecRulesPack'), + path('getRulesFiles/', views.getRulesFiles, name='getRulesFiles'), + path('enableDisableRuleFile/', views.enableDisableRuleFile, name='enableDisableRuleFile'), - url(r'^secureSSH', views.secureSSH, name='secureSSH'), - url(r'^getSSHConfigs', views.getSSHConfigs, name='getSSHConfigs'), - url(r'^saveSSHConfigs', views.saveSSHConfigs, name='saveSSHConfigs'), - url(r'^deleteSSHKey', views.deleteSSHKey, name='deleteSSHKey'), - url(r'^addSSHKey', views.addSSHKey, name='addSSHKey'), + # CSF + path('csf/', views.csf, name='csf'), + path('installCSF/', views.installCSF, name='installCSF'), + path('installStatusCSF/', views.installStatusCSF, name='installStatusCSF'), + path('removeCSF/', views.removeCSF, name='removeCSF'), + path('fetchCSFSettings/', views.fetchCSFSettings, name='fetchCSFSettings'), + path('changeStatus/', views.changeStatus, name='changeStatus'), + path('modifyPorts/', views.modifyPorts, name='modifyPorts'), + path('modifyIPs/', views.modifyIPs, name='modifyIPs'), + # Imunify + path('imunify/', views.imunify, name='imunify'), + path('submitinstallImunify/', views.submitinstallImunify, name='submitinstallImunify'), - ## ModSecurity + # ImunifyAV + path('imunifyAV/', views.imunifyAV, name='imunifyAV'), + path('submitinstallImunifyAV/', views.submitinstallImunifyAV, name='submitinstallImunifyAV'), - url(r'^modSecurity$', views.loadModSecurityHome, name='modSecurity'), - url(r'^installModSec$', views.installModSec, name='installModSec'), - url(r'^installStatusModSec$', views.installStatusModSec, name='installStatusModSec'), - url(r'^fetchModSecSettings$', views.fetchModSecSettings, name='fetchModSecSettings'), - url(r'^saveModSecConfigurations$', views.saveModSecConfigurations, name='saveModSecConfigurations'), - url(r'^modSecRules$', views.modSecRules, name='modSecRules'), - url(r'^fetchModSecRules$', views.fetchModSecRules, name='fetchModSecRules'), - url(r'^saveModSecRules$', views.saveModSecRules, name='saveModSecRules'), - url(r'^modSecRulesPacks$', views.modSecRulesPacks, name='modSecRulesPacks'), - url(r'^getOWASPAndComodoStatus$', views.getOWASPAndComodoStatus, name='getOWASPAndComodoStatus'), - url(r'^installModSecRulesPack$', views.installModSecRulesPack, name='installModSecRulesPack'), - url(r'^getRulesFiles$', views.getRulesFiles, name='getRulesFiles'), - url(r'^enableDisableRuleFile$', views.enableDisableRuleFile, name='enableDisableRuleFile'), - - ## CSF - - url(r'^csf$', views.csf, name='csf'), - url(r'^installCSF$', views.installCSF, name='installCSF'), - url(r'^installStatusCSF$', views.installStatusCSF, name='installStatusCSF'), - url(r'^removeCSF$', views.removeCSF, name='removeCSF'), - url(r'^fetchCSFSettings$', views.fetchCSFSettings, name='fetchCSFSettings'), - - url(r'^changeStatus$', views.changeStatus, name='changeStatus'), - url(r'^modifyPorts$', views.modifyPorts, name='modifyPorts'), - url(r'^modifyIPs$', views.modifyIPs, name='modifyIPs'), - - ## Imunify - - url(r'^imunify$', views.imunify, name='imunify'), - url(r'^submitinstallImunify$', views.submitinstallImunify, name='submitinstallImunify'), - - ## ImunifyAV - - url(r'^imunifyAV$', views.imunifyAV, name='imunifyAV'), - url(r'^submitinstallImunifyAV$', views.submitinstallImunifyAV, name='submitinstallImunifyAV'), - - - url(r'^litespeed_ent_conf$', views.litespeed_ent_conf, name='litespeed_ent_conf'), - url(r'^fetchlitespeed_conf', views.fetchlitespeed_conf, name='fetchlitespeed_conf'), - url(r'^saveLitespeed_conf', views.saveLitespeed_conf, name='saveLitespeed_conf'), - - - - -] \ No newline at end of file + # Litespeed + path('litespeed_ent_conf/', views.litespeed_ent_conf, name='litespeed_ent_conf'), + path('fetchlitespeed_conf/', views.fetchlitespeed_conf, name='fetchlitespeed_conf'), + path('saveLitespeed_conf/', views.saveLitespeed_conf, name='saveLitespeed_conf'), +] diff --git a/ftp/signals.py b/ftp/signals.py index 3a34c2eac..874ee0421 100755 --- a/ftp/signals.py +++ b/ftp/signals.py @@ -5,25 +5,25 @@ from django.dispatch import Signal ## This event is fired before CyberPanel core load the create ftp template, this special event is used ## to create a beautiful names official plugin. Actual FTP account creation happens with event named preSubmitFTPCreation and postSubmitFTPCreation. -preCreateFTPAccount = Signal(providing_args=["request"]) +preCreateFTPAccount = Signal() ## See preCreateFTPAccount -postCreateFTPAccount = Signal(providing_args=["request", "response"]) +postCreateFTPAccount = Signal() ## This event is fired before CyberPanel core start creation of a FTP account. -preSubmitFTPCreation = Signal(providing_args=["request"]) +preSubmitFTPCreation = Signal() ## This event is fired after CyberPanel core finished creation of a FTP account. -postSubmitFTPCreation = Signal(providing_args=["request", "response"]) +postSubmitFTPCreation = Signal() ## This event is fired before CyberPanel core start deletion of a FTP account. -preSubmitFTPDelete = Signal(providing_args=["request"]) +preSubmitFTPDelete = Signal() ## This event is fired after CyberPanel core finished deletion of website -postSubmitFTPDelete = Signal(providing_args=["request", "response"]) +postSubmitFTPDelete = Signal() ## This event is fired before CyberPanel core start deletion of child-domain -preChangePassword = Signal(providing_args=["request"]) +preChangePassword = Signal() ## This event is fired after CyberPanel core finished deletion of child-domain -postChangePassword = Signal(providing_args=["request", "response"]) \ No newline at end of file +postChangePassword = Signal() \ No newline at end of file diff --git a/ftp/urls.py b/ftp/urls.py index e0392037e..e9d561f2e 100755 --- a/ftp/urls.py +++ b/ftp/urls.py @@ -1,23 +1,18 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^$', views.loadFTPHome, name='loadFTPHome'), - url(r'^createFTPAccount', views.createFTPAccount, name='createFTPAccount'), - url(r'^submitFTPCreation', views.submitFTPCreation, name='ftpHome'), - url(r'^ResetFTPConfigurations', views.ResetFTPConfigurations, name='ResetFTPConfigurations'), - url(r'^resetftpnow', views.resetftpnow, name='resetftpnow'), - url(r'^getresetstatus', views.getresetstatus, name='getresetstatus'), - - url(r'^deleteFTPAccount', views.deleteFTPAccount, name='deleteFTPAccount'), - - url(r'^fetchFTPAccounts', views.fetchFTPAccounts, name='fetchFTPAccounts'), - url(r'^submitFTPDelete', views.submitFTPDelete, name='submitFTPDelete'), - - url(r'^listFTPAccounts', views.listFTPAccounts, name='listFTPAccounts'), - - url(r'^getAllFTPAccounts', views.getAllFTPAccounts, name='getAllFTPAccounts'), - - url(r'^changePassword', views.changePassword, name='changePassword'), + path('', views.loadFTPHome, name='loadFTPHome'), + path('createFTPAccount/', views.createFTPAccount, name='createFTPAccount'), + path('submitFTPCreation/', views.submitFTPCreation, name='ftpHome'), + path('ResetFTPConfigurations/', views.ResetFTPConfigurations, name='ResetFTPConfigurations'), + path('resetftpnow/', views.resetftpnow, name='resetftpnow'), + path('getresetstatus/', views.getresetstatus, name='getresetstatus'), + path('deleteFTPAccount/', views.deleteFTPAccount, name='deleteFTPAccount'), + path('fetchFTPAccounts/', views.fetchFTPAccounts, name='fetchFTPAccounts'), + path('submitFTPDelete/', views.submitFTPDelete, name='submitFTPDelete'), + path('listFTPAccounts/', views.listFTPAccounts, name='listFTPAccounts'), + path('getAllFTPAccounts/', views.getAllFTPAccounts, name='getAllFTPAccounts'), + path('changePassword/', views.changePassword, name='changePassword'), ] diff --git a/loginSystem/urls.py b/loginSystem/urls.py index 1abdedada..b9c7ac0d0 100755 --- a/loginSystem/urls.py +++ b/loginSystem/urls.py @@ -1,8 +1,8 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^$', views.loadLoginPage, name='adminLogin'), - url(r'^verifyLogin$', views.verifyLogin, name='verifyLogin'), - url(r'^logout$', views.logout, name='logout'), + path('', views.loadLoginPage, name='adminLogin'), + path('verifyLogin/', views.verifyLogin, name='verifyLogin'), + path('logout/', views.logout, name='logout'), ] diff --git a/mailServer/signals.py b/mailServer/signals.py index dda86a3c9..b11fe6b6f 100755 --- a/mailServer/signals.py +++ b/mailServer/signals.py @@ -4,37 +4,37 @@ from django.dispatch import Signal ## This event is fired before CyberPanel core start creation of an email account. -preSubmitEmailCreation = Signal(providing_args=["request"]) +preSubmitEmailCreation = Signal() ## This event is fired after CyberPanel core finished creation of an email account. -postSubmitEmailCreation = Signal(providing_args=["request", "response"]) +postSubmitEmailCreation = Signal() ## This event is fired before CyberPanel core start deletion of an email account -preSubmitEmailDeletion = Signal(providing_args=["request"]) +preSubmitEmailDeletion = Signal() ## This event is fired after CyberPanel core finished deletion of an email account -postSubmitEmailDeletion = Signal(providing_args=["request", "response"]) +postSubmitEmailDeletion = Signal() ## This event is fired before CyberPanel core start deletion of email forwarding. -preSubmitForwardDeletion = Signal(providing_args=["request"]) +preSubmitForwardDeletion = Signal() ## This event is fired after CyberPanel core finished deletion of email forwarding. -postSubmitForwardDeletion = Signal(providing_args=["request", "response"]) +postSubmitForwardDeletion = Signal() ## This event is fired before CyberPanel core start creation of email forwarding. -preSubmitEmailForwardingCreation = Signal(providing_args=["request"]) +preSubmitEmailForwardingCreation = Signal() ## This event is fired after CyberPanel core finished creation of email forwarding. -postSubmitEmailForwardingCreation = Signal(providing_args=["request", "response"]) +postSubmitEmailForwardingCreation = Signal() ## This event is fired before CyberPanel core start changing password for email account. -preSubmitPasswordChange = Signal(providing_args=["request"]) +preSubmitPasswordChange = Signal() ## This event is fired after CyberPanel core finished changing password for email account. -postSubmitPasswordChange = Signal(providing_args=["request", "response"]) +postSubmitPasswordChange = Signal() ## This event is fired before CyberPanel core start generating dkim keys. -preGenerateDKIMKeys = Signal(providing_args=["request"]) +preGenerateDKIMKeys = Signal() ## This event is fired after CyberPanel core finished generating dkim keys. -postGenerateDKIMKeys = Signal(providing_args=["request", "response"]) \ No newline at end of file +postGenerateDKIMKeys = Signal() \ No newline at end of file diff --git a/mailServer/urls.py b/mailServer/urls.py index 8ecd7cb95..91cd9aeeb 100755 --- a/mailServer/urls.py +++ b/mailServer/urls.py @@ -1,41 +1,38 @@ -from django.conf.urls import url +from django.urls import re_path from . import views urlpatterns = [ - url(r'^$', views.loadEmailHome, name='loadEmailHome'), - url(r'^createEmailAccount', views.createEmailAccount, name='createEmailAccount'), - url(r'^listEmails$', views.listEmails, name='listEmails'), - url(r'^submitEmailCreation', views.submitEmailCreation, name='submitEmailCreation'), - url(r'^fetchEmails$', views.fetchEmails, name='fetchEmails'), + re_path(r'^$', views.loadEmailHome, name='loadEmailHome'), + re_path(r'^createEmailAccount$', views.createEmailAccount, name='createEmailAccount'), + re_path(r'^listEmails$', views.listEmails, name='listEmails'), + re_path(r'^submitEmailCreation$', views.submitEmailCreation, name='submitEmailCreation'), + re_path(r'^fetchEmails$', views.fetchEmails, name='fetchEmails'), ## Mail Forwardings - url(r'^emailForwarding$', views.emailForwarding, name='emailForwarding'), - url(r'^submitEmailForwardingCreation$', views.submitEmailForwardingCreation, name='submitEmailForwardingCreation'), - url(r'^fetchCurrentForwardings$', views.fetchCurrentForwardings, name='fetchCurrentForwardings'), - url(r'^submitForwardDeletion$', views.submitForwardDeletion, name='submitForwardDeletion'), + re_path(r'^emailForwarding$', views.emailForwarding, name='emailForwarding'), + re_path(r'^submitEmailForwardingCreation$', views.submitEmailForwardingCreation, name='submitEmailForwardingCreation'), + re_path(r'^fetchCurrentForwardings$', views.fetchCurrentForwardings, name='fetchCurrentForwardings'), + re_path(r'^submitForwardDeletion$', views.submitForwardDeletion, name='submitForwardDeletion'), ## Delete email - url(r'^deleteEmailAccount', views.deleteEmailAccount, name='deleteEmailAccount'), - url(r'^getEmailsForDomain$', views.getEmailsForDomain, name='getEmailsForDomain'), - url(r'^submitEmailDeletion', views.submitEmailDeletion, name='submitEmailDeletion'), - url(r'^fixMailSSL', views.fixMailSSL, name='fixMailSSL'), + re_path(r'^deleteEmailAccount$', views.deleteEmailAccount, name='deleteEmailAccount'), + re_path(r'^getEmailsForDomain$', views.getEmailsForDomain, name='getEmailsForDomain'), + re_path(r'^submitEmailDeletion$', views.submitEmailDeletion, name='submitEmailDeletion'), + re_path(r'^fixMailSSL$', views.fixMailSSL, name='fixMailSSL'), ## Change email password - url(r'^changeEmailAccountPassword', views.changeEmailAccountPassword, name='changeEmailAccountPassword'), - url(r'^submitPasswordChange', views.submitPasswordChange, name='submitPasswordChange'), + re_path(r'^changeEmailAccountPassword$', views.changeEmailAccountPassword, name='changeEmailAccountPassword'), + re_path(r'^submitPasswordChange$', views.submitPasswordChange, name='submitPasswordChange'), ## DKIM Manager + re_path(r'^dkimManager$', views.dkimManager, name='dkimManager'), + re_path(r'^fetchDKIMKeys$', views.fetchDKIMKeys, name='fetchDKIMKeys'), + re_path(r'^generateDKIMKeys$', views.generateDKIMKeys, name='generateDKIMKeys'), - url(r'^dkimManager', views.dkimManager, name='dkimManager'), - url(r'^fetchDKIMKeys', views.fetchDKIMKeys, name='fetchDKIMKeys'), - url(r'^generateDKIMKeys$', views.generateDKIMKeys, name='generateDKIMKeys'), - - url(r'^installOpenDKIM', views.installOpenDKIM, name='installOpenDKIM'), - url(r'^installStatusOpenDKIM', views.installStatusOpenDKIM, name='installStatusOpenDKIM'), + re_path(r'^installOpenDKIM$', views.installOpenDKIM, name='installOpenDKIM'), + re_path(r'^installStatusOpenDKIM$', views.installStatusOpenDKIM, name='installStatusOpenDKIM'), ### email limits - - url(r'^EmailLimits$', views.EmailLimits, name='EmailLimits'), - url(r'^SaveEmailLimitsNew$', views.SaveEmailLimitsNew, name='SaveEmailLimitsNew'), - + re_path(r'^EmailLimits$', views.EmailLimits, name='EmailLimits'), + re_path(r'^SaveEmailLimitsNew$', views.SaveEmailLimitsNew, name='SaveEmailLimitsNew'), ] diff --git a/managePHP/urls.py b/managePHP/urls.py index 1b9cafc46..a6d4815c0 100755 --- a/managePHP/urls.py +++ b/managePHP/urls.py @@ -1,18 +1,16 @@ -from django.conf.urls import url +from django.urls import path from . 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'), - url(r'^restartPHP', views.restartPHP, name='restartPHP'), - - -] \ No newline at end of file + path('', views.loadPHPHome, name='loadPHPHome'), + path('installExtensions/', views.installExtensions, name='installExtensions'), + path('getExtensionsInformation/', views.getExtensionsInformation, name='getExtensionsInformation'), + path('submitExtensionRequest/', views.submitExtensionRequest, name='submitExtensionRequest'), + path('getRequestStatus/', views.getRequestStatus, name='getRequestStatus'), + path('editPHPConfigs/', views.editPHPConfigs, name='editPHPConfigs'), + path('getCurrentPHPConfig/', views.getCurrentPHPConfig, name='getCurrentPHPConfig'), + path('savePHPConfigBasic/', views.savePHPConfigBasic, name='savePHPConfigBasic'), + path('getCurrentAdvancedPHPConfig/', views.getCurrentAdvancedPHPConfig, name='getCurrentAdvancedPHPConfig'), + path('savePHPConfigAdvance/', views.savePHPConfigAdvance, name='savePHPConfigAdvance'), + path('restartPHP/', views.restartPHP, name='restartPHP'), +] diff --git a/manageSSL/urls.py b/manageSSL/urls.py index 6f47abbad..e8b4eafc5 100755 --- a/manageSSL/urls.py +++ b/manageSSL/urls.py @@ -1,20 +1,19 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^$', views.loadSSLHome, name='loadSSLHome'), + path('', views.loadSSLHome, name='loadSSLHome'), - url(r'^manageSSL', views.manageSSL, name='manageSSL'), - url(r'^issueSSL', views.issueSSL, name='issueSSL'), + path('manageSSL/', views.manageSSL, name='manageSSL'), + path('issueSSL/', views.issueSSL, name='issueSSL'), - url(r'^sslForHostName', views.sslForHostName, name='sslForHostName'), - url(r'^obtainHostNameSSL$', views.obtainHostNameSSL, name='obtainHostNameSSL'), + path('sslForHostName/', views.sslForHostName, name='sslForHostName'), + path('obtainHostNameSSL/', views.obtainHostNameSSL, name='obtainHostNameSSL'), - url(r'^sslForMailServer', views.sslForMailServer, name='sslForMailServer'), - url(r'^obtainMailServerSSL', views.obtainMailServerSSL, name='obtainMailServerSSL'), + path('sslForMailServer/', views.sslForMailServer, name='sslForMailServer'), + path('obtainMailServerSSL/', views.obtainMailServerSSL, name='obtainMailServerSSL'), - ## v2 functions - - url(r'^v2ManageSSL', views.v2ManageSSL, name='v2ManageSSL'), - url(r'^v2IssueSSL', views.v2IssueSSL, name='v2IssueSSL'), -] \ No newline at end of file + # v2 functions + path('v2ManageSSL/', views.v2ManageSSL, name='v2ManageSSL'), + path('v2IssueSSL/', views.v2IssueSSL, name='v2IssueSSL'), +] diff --git a/manageServices/urls.py b/manageServices/urls.py index 2139ba709..1ff4f2581 100755 --- a/manageServices/urls.py +++ b/manageServices/urls.py @@ -1,15 +1,14 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^managePowerDNS$', views.managePowerDNS, name='managePowerDNS'), - url(r'^managePostfix$', views.managePostfix, name='managePostfix'), - url(r'^managePureFtpd$', views.managePureFtpd, name='managePureFtpd'), + path('managePowerDNS/', views.managePowerDNS, name='managePowerDNS'), + path('managePostfix/', views.managePostfix, name='managePostfix'), + path('managePureFtpd/', views.managePureFtpd, name='managePureFtpd'), + path('fetchStatus/', views.fetchStatus, name='fetchStatus'), + path('saveStatus/', views.saveStatus, name='saveStatus'), - url(r'^fetchStatus$', views.fetchStatus, name='fetchStatus'), - url(r'^saveStatus$', views.saveStatus, name='saveStatus'), - - url(r'^manageApplications$', views.manageApplications, name='manageApplications'), - url(r'^removeInstall$', views.removeInstall, name='removeInstall'), -] \ No newline at end of file + path('manageApplications/', views.manageApplications, name='manageApplications'), + path('removeInstall/', views.removeInstall, name='removeInstall'), +] diff --git a/packages/signals.py b/packages/signals.py index 1f5fe585a..1636d8439 100755 --- a/packages/signals.py +++ b/packages/signals.py @@ -5,25 +5,25 @@ from django.dispatch import Signal ## This event is fired before CyberPanel core load the create package template, this special event is used ## to create a beautiful names official plugin. Actual package creation happes with event named preSubmitPackage and postSubmitPackage. -preCreatePacakge = Signal(providing_args=["request"]) +preCreatePacakge = Signal() ## See info for preCreatePacakge -postCreatePacakge = Signal(providing_args=["request", "response"]) +postCreatePacakge = Signal() ## This event is fired before CyberPanel core start creation a package. -preSubmitPackage = Signal(providing_args=["request"]) +preSubmitPackage = Signal() ## This event is fired after CyberPanel core finished creation of a package. -postSubmitPackage = Signal(providing_args=["request", "response"]) +postSubmitPackage = Signal() ## This event is fired before CyberPanel core start deletion of a package. -preSubmitDelete = Signal(providing_args=["request"]) +preSubmitDelete = Signal() ## This event is fired after CyberPanel core finished deletion of a package. -postSubmitDelete = Signal(providing_args=["request", "response"]) +postSubmitDelete = Signal() ## This event is fired before CyberPanel core start to modify a package. -preSaveChanges = Signal(providing_args=["request"]) +preSaveChanges = Signal() ## This event is fired after CyberPanel core finished modifying a package. -postSaveChanges = Signal(providing_args=["request", "response"]) \ No newline at end of file +postSaveChanges = Signal() \ No newline at end of file diff --git a/packages/urls.py b/packages/urls.py index fe335e206..95897415b 100755 --- a/packages/urls.py +++ b/packages/urls.py @@ -1,20 +1,17 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^$', views.packagesHome, name='packagesHome'), - url(r'^createPackage$', views.createPacakge, name='createPackage'), - url(r'^deletePacakge$', views.deletePacakge, name='deletePackage'), - url(r'^modifyPackage$', views.modifyPackage, name='modifyPackage'), - url(r'^listPackages$', views.listPackages, name='listPackages'), - url(r'^fetchPackagesTable$', views.fetchPackagesTable, name='fetchPackagesTable'), + path('', views.packagesHome, name='packagesHome'), + path('createPackage/', views.createPacakge, name='createPackage'), + path('deletePackage/', views.deletePacakge, name='deletePackage'), + path('modifyPackage/', views.modifyPackage, name='modifyPackage'), + path('listPackages/', views.listPackages, name='listPackages'), + path('fetchPackagesTable/', views.fetchPackagesTable, name='fetchPackagesTable'), - # Pacakge Modification URLs - - url(r'^submitPackage', views.submitPackage, name='submitPackage'), - url(r'^submitDelete', views.submitDelete, name='submitDelete'), - url(r'^submitModify', views.submitModify, name='submitModify'), - url(r'^saveChanges', views.saveChanges, name='saveChanges'), - - -] \ No newline at end of file + # Package Modification URLs + path('submitPackage/', views.submitPackage, name='submitPackage'), + path('submitDelete/', views.submitDelete, name='submitDelete'), + path('submitModify/', views.submitModify, name='submitModify'), + path('saveChanges/', views.saveChanges, name='saveChanges'), +] diff --git a/pluginHolder/urls.py b/pluginHolder/urls.py index b975e079d..c19bfd237 100755 --- a/pluginHolder/urls.py +++ b/pluginHolder/urls.py @@ -1,8 +1,6 @@ - -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - - url(r'^installed$', views.installed, name='installed'), -] \ No newline at end of file + path('installed/', views.installed, name='installed'), +] diff --git a/serverLogs/urls.py b/serverLogs/urls.py index c1bc9748f..90753effd 100755 --- a/serverLogs/urls.py +++ b/serverLogs/urls.py @@ -1,15 +1,15 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^$', views.logsHome, name='logsHome'), - url(r'^accessLogs', views.accessLogs, name='accessLogs'), - url(r'^errorLogs', views.errorLogs, name='errorLogs'), - url(r'^emaillogs', views.emailLogs, name='emaillogs'), - url(r'^ftplogs', views.ftplogs, name='ftplogs'), - url(r'^modSecAuditLogs', views.modSecAuditLogs, name='modSecAuditLogs'), - url(r'^getLogsFromFile',views.getLogsFromFile, name="getLogsFromFile"), - url(r'^clearLogFile',views.clearLogFile, name="clearLogFile"), - url(r'^serverMail$', views.serverMail, name="serverMail"), - url(r'^saveSMTPSettings$', views.saveSMTPSettings, name="saveSMTPSettings"), -] \ No newline at end of file + path('', views.logsHome, name='logsHome'), + path('accessLogs/', views.accessLogs, name='accessLogs'), + path('errorLogs/', views.errorLogs, name='errorLogs'), + path('emaillogs/', views.emailLogs, name='emaillogs'), + path('ftplogs/', views.ftplogs, name='ftplogs'), + path('modSecAuditLogs/', views.modSecAuditLogs, name='modSecAuditLogs'), + path('getLogsFromFile/', views.getLogsFromFile, name='getLogsFromFile'), + path('clearLogFile/', views.clearLogFile, name='clearLogFile'), + path('serverMail/', views.serverMail, name='serverMail'), + path('saveSMTPSettings/', views.saveSMTPSettings, name='saveSMTPSettings'), +] diff --git a/serverStatus/urls.py b/serverStatus/urls.py index 16dc14003..df18acb81 100755 --- a/serverStatus/urls.py +++ b/serverStatus/urls.py @@ -1,34 +1,32 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^$', views.serverStatusHome, name='serverStatusHome'), - url(r'^litespeedStatus$', views.litespeedStatus, name='litespeedStatus'), - url(r'^startorstopLitespeed$', views.stopOrRestartLitespeed, name='startorstopLitespeed'), - url(r'^cyberCPMainLogFile$', views.cyberCPMainLogFile, name='cyberCPMainLogFile'), - url(r'^getFurtherDataFromLogFile$',views.getFurtherDataFromLogFile,name='getFurtherDataFromLogFile'), + path('', views.serverStatusHome, name='serverStatusHome'), + path('litespeedStatus/', views.litespeedStatus, name='litespeedStatus'), + path('startorstopLitespeed/', views.stopOrRestartLitespeed, name='startorstopLitespeed'), + path('cyberCPMainLogFile/', views.cyberCPMainLogFile, name='cyberCPMainLogFile'), + path('getFurtherDataFromLogFile/', views.getFurtherDataFromLogFile, name='getFurtherDataFromLogFile'), - url(r'^servicesStatus$', views.servicesStatus, name='servicesStatus'), - url(r'^servicesAction$', views.servicesAction, name='servicesAction'), - url(r'^services$', views.services, name='services'), - url(r'^switchTOLSWS$', views.switchTOLSWS, name='switchTOLSWS'), - url(r'^switchTOLSWSStatus$', views.switchTOLSWSStatus, name='switchTOLSWSStatus'), - url(r'^licenseStatus$', views.licenseStatus, name='licenseStatus'), - url(r'^changeLicense$', views.changeLicense, name='changeLicense'), - url(r'^refreshLicense$', views.refreshLicense, name='refreshLicense'), - url(r'^topProcesses$', views.topProcesses, name='topProcesses'), - url(r'^topProcessesStatus$', views.topProcessesStatus, name='topProcessesStatus'), - url(r'^killProcess$', views.killProcess, name='killProcess'), - url(r'^packageManager$', views.packageManager, name='packageManager'), - url(r'^fetchPackages$', views.fetchPackages, name='fetchPackages'), - url(r'^fetchPackageDetails$', views.fetchPackageDetails, name='fetchPackageDetails'), - url(r'^updatePackage$', views.updatePackage, name='updatePackage'), - url(r'^lockStatus$', views.lockStatus, name='lockStatus'), - url(r'^CyberPanelPort$', views.CyberPanelPort, name='CyberPanelPort'), - url(r'^submitPortChange$', views.submitPortChange, name='submitPortChange'), + path('servicesStatus/', views.servicesStatus, name='servicesStatus'), + path('servicesAction/', views.servicesAction, name='servicesAction'), + path('services/', views.services, name='services'), + path('switchTOLSWS/', views.switchTOLSWS, name='switchTOLSWS'), + path('switchTOLSWSStatus/', views.switchTOLSWSStatus, name='switchTOLSWSStatus'), + path('licenseStatus/', views.licenseStatus, name='licenseStatus'), + path('changeLicense/', views.changeLicense, name='changeLicense'), + path('refreshLicense/', views.refreshLicense, name='refreshLicense'), + path('topProcesses/', views.topProcesses, name='topProcesses'), + path('topProcessesStatus/', views.topProcessesStatus, name='topProcessesStatus'), + path('killProcess/', views.killProcess, name='killProcess'), + path('packageManager/', views.packageManager, name='packageManager'), + path('fetchPackages/', views.fetchPackages, name='fetchPackages'), + path('fetchPackageDetails/', views.fetchPackageDetails, name='fetchPackageDetails'), + path('updatePackage/', views.updatePackage, name='updatePackage'), + path('lockStatus/', views.lockStatus, name='lockStatus'), + path('CyberPanelPort/', views.CyberPanelPort, name='CyberPanelPort'), + path('submitPortChange/', views.submitPortChange, name='submitPortChange'), - - url(r'^Switchoffsecurity$', views.Switchoffsecurity, name='Switchoffsecurity'), - url(r'^securityruleUpdate$', views.securityruleUpdate, name='securityruleUpdate'), - -] \ No newline at end of file + path('Switchoffsecurity/', views.Switchoffsecurity, name='Switchoffsecurity'), + path('securityruleUpdate/', views.securityruleUpdate, name='securityruleUpdate'), +] diff --git a/tuning/urls.py b/tuning/urls.py index 8eccf9958..d084411d2 100755 --- a/tuning/urls.py +++ b/tuning/urls.py @@ -1,14 +1,10 @@ -from django.conf.urls import url,include +from django.urls import path from . import views urlpatterns = [ - url(r'^$', views.loadTuningHome, name='loadTuningHome'), - url(r'^litespeedTuning', views.liteSpeedTuning, name='liteSpeedTuning'), - url(r'^phpTuning', views.phpTuning, name='phpTuning'), - - - - url(r'^tuneLitespeed', views.tuneLitespeed, name='tuneLitespeed'), - url(r'^tunePHP', views.tunePHP, name='tunePHP'), - -] \ No newline at end of file + path('', views.loadTuningHome, name='loadTuningHome'), + path('litespeedTuning/', views.liteSpeedTuning, name='liteSpeedTuning'), + path('phpTuning/', views.phpTuning, name='phpTuning'), + path('tuneLitespeed/', views.tuneLitespeed, name='tuneLitespeed'), + path('tunePHP/', views.tunePHP, name='tunePHP'), +] diff --git a/userManagment/urls.py b/userManagment/urls.py index d203dde4f..fff5630a3 100755 --- a/userManagment/urls.py +++ b/userManagment/urls.py @@ -1,36 +1,30 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - - url(r'^$', views.loadUserHome, name='loadUsersHome'), - url(r'^viewProfile', views.viewProfile, name='viewProfile'), - url(r'^createUser', views.createUser, name='createUser'), - - - url(r'^submitUserCreation', views.submitUserCreation, name='submitUserCreation'), - url(r'^modifyUsers', views.modifyUsers, name="modifyUsers"), - url(r'^fetchUserDetails', views.fetchUserDetails, name="fetchUserDetails"), - url(r'^saveModifications', views.saveModifications, name="saveModifications"), - - - url(r'^deleteUser', views.deleteUser, name="deleteUser"), - url(r'^submitUserDeletion', views.submitUserDeletion, name="submitUserDeletion"), - - url(r'^createNewACL$', views.createNewACL, name="createNewACL"), - url(r'^createACLFunc$', views.createACLFunc, name="createACLFunc"), - url(r'^deleteACL$', views.deleteACL, name="deleteACL"), - url(r'^deleteACLFunc$', views.deleteACLFunc, name="deleteACLFunc"), - url(r'^modifyACL$', views.modifyACL, name="modifyACL"), - url(r'^fetchACLDetails$', views.fetchACLDetails, name="fetchACLDetails"), - url(r'^submitACLModifications$', views.submitACLModifications, name="submitACLModifications"), - url(r'^changeUserACL$', views.changeUserACL, name="changeUserACL"), - url(r'^changeACLFunc$', views.changeACLFunc, name="changeACLFunc"), - url(r'^resellerCenter$', views.resellerCenter, name="resellerCenter"), - url(r'^saveResellerChanges$', views.saveResellerChanges, name="saveResellerChanges"), - url(r'^apiAccess$', views.apiAccess, name="apiAccess"), - url(r'^saveChangesAPIAccess$', views.saveChangesAPIAccess, name="saveChangesAPIAccess"), - url(r'^listUsers$', views.listUsers, name="listUsers"), - url(r'^fetchTableUsers$', views.fetchTableUsers, name="fetchTableUsers"), - url(r'^controlUserState$', views.controlUserState, name="controlUserState"), + path('', views.loadUserHome, name='loadUsersHome'), + path('viewProfile/', views.viewProfile, name='viewProfile'), + path('createUser/', views.createUser, name='createUser'), + path('submitUserCreation/', views.submitUserCreation, name='submitUserCreation'), + path('modifyUsers/', views.modifyUsers, name='modifyUsers'), + path('fetchUserDetails/', views.fetchUserDetails, name='fetchUserDetails'), + path('saveModifications/', views.saveModifications, name='saveModifications'), + path('deleteUser/', views.deleteUser, name='deleteUser'), + path('submitUserDeletion/', views.submitUserDeletion, name='submitUserDeletion'), + path('createNewACL/', views.createNewACL, name='createNewACL'), + path('createACLFunc/', views.createACLFunc, name='createACLFunc'), + path('deleteACL/', views.deleteACL, name='deleteACL'), + path('deleteACLFunc/', views.deleteACLFunc, name='deleteACLFunc'), + path('modifyACL/', views.modifyACL, name='modifyACL'), + path('fetchACLDetails/', views.fetchACLDetails, name='fetchACLDetails'), + path('submitACLModifications/', views.submitACLModifications, name='submitACLModifications'), + path('changeUserACL/', views.changeUserACL, name='changeUserACL'), + path('changeACLFunc/', views.changeACLFunc, name='changeACLFunc'), + path('resellerCenter/', views.resellerCenter, name='resellerCenter'), + path('saveResellerChanges/', views.saveResellerChanges, name='saveResellerChanges'), + path('apiAccess/', views.apiAccess, name='apiAccess'), + path('saveChangesAPIAccess/', views.saveChangesAPIAccess, name='saveChangesAPIAccess'), + path('listUsers/', views.listUsers, name='listUsers'), + path('fetchTableUsers/', views.fetchTableUsers, name='fetchTableUsers'), + path('controlUserState/', views.controlUserState, name='controlUserState'), ] diff --git a/websiteFunctions/signals.py b/websiteFunctions/signals.py index 3876b7461..f4b33aabe 100755 --- a/websiteFunctions/signals.py +++ b/websiteFunctions/signals.py @@ -4,98 +4,98 @@ from django.dispatch import Signal ## This event is fired before CyberPanel core start creation of website -preWebsiteCreation = Signal(providing_args=["request"]) +preWebsiteCreation = Signal() ## This event is fired after CyberPanel core finished creation of website. -postWebsiteCreation = Signal(providing_args=["request", "response"]) +postWebsiteCreation = Signal() ## This event is fired before CyberPanel core start creation of child-domain -preDomainCreation = Signal(providing_args=["request"]) +preDomainCreation = Signal() ## This event is fired after CyberPanel core finished creation of child-domain. -postDomainCreation = Signal(providing_args=["request", "response"]) +postDomainCreation = Signal() ## This event is fired before CyberPanel core start deletion of website -preWebsiteDeletion = Signal(providing_args=["request"]) +preWebsiteDeletion = Signal() ## This event is fired after CyberPanel core finished deletion of website -postWebsiteDeletion = Signal(providing_args=["request", "response"]) +postWebsiteDeletion = Signal() ## This event is fired before CyberPanel core start deletion of child-domain -preDomainDeletion = Signal(providing_args=["request"]) +preDomainDeletion = Signal() ## This event is fired after CyberPanel core finished deletion of child-domain -postDomainDeletion = Signal(providing_args=["request", "response"]) +postDomainDeletion = Signal() ## This event is fired before CyberPanel core start suspension of website -preWebsiteSuspension = Signal(providing_args=["request"]) +preWebsiteSuspension = Signal() ## This event is fired after CyberPanel core finished suspension of website -postWebsiteSuspension = Signal(providing_args=["request", "response"]) +postWebsiteSuspension = Signal() ## This event is fired before CyberPanel core start suspension of website -preWebsiteModification = Signal(providing_args=["request"]) +preWebsiteModification = Signal() ## This event is fired after CyberPanel core finished suspension of website -postWebsiteModification = Signal(providing_args=["request", "response"]) +postWebsiteModification = Signal() ## This event is fired before CyberPanel core load website launcher -preDomain = Signal(providing_args=["request"]) +preDomain = Signal() ## This event is fired after CyberPanel core finished loading website launcher -postDomain = Signal(providing_args=["request", "response"]) +postDomain = Signal() ## This event is fired before CyberPanel core start saving changes to vhost conf -preSaveConfigsToFile = Signal(providing_args=["request"]) +preSaveConfigsToFile = Signal() ## This event is fired after CyberPanel core finished saving changes to vhost conf -postSaveConfigsToFile = Signal(providing_args=["request", "response"]) +postSaveConfigsToFile = Signal() ## This event is fired before CyberPanel core start saving changes to vhost rewrite file -preSaveRewriteRules = Signal(providing_args=["request"]) +preSaveRewriteRules = Signal() ## This event is fired after CyberPanel core finished saving changes to vhost rewrite file -postSaveRewriteRules = Signal(providing_args=["request", "response"]) +postSaveRewriteRules = Signal() ## This event is fired before CyberPanel core start saving custom SSL -preSaveSSL = Signal(providing_args=["request"]) +preSaveSSL = Signal() ## This event is fired after CyberPanel core finished saving saving custom SSL -postSaveSSL = Signal(providing_args=["request", "response"]) +postSaveSSL = Signal() ## This event is fired before CyberPanel core start changing php version of domain or website -preChangePHP = Signal(providing_args=["request"]) +preChangePHP = Signal() ## This event is fired after CyberPanel core finished change php version of domain or website -postChangePHP = Signal(providing_args=["request", "response"]) +postChangePHP = Signal() ## This event is fired before CyberPanel core start changing open_basdir status for domain or website -preChangeOpenBasedir = Signal(providing_args=["request"]) +preChangeOpenBasedir = Signal() ## This event is fired after CyberPanel core finished changing open_basdir status for domain or website -postChangeOpenBasedir = Signal(providing_args=["request", "response"]) +postChangeOpenBasedir = Signal() ## This event is fired before CyberPanel core start adding new cron -preAddNewCron = Signal(providing_args=["request"]) +preAddNewCron = Signal() ## This event is fired after CyberPanel core is finished adding new cron -postAddNewCron = Signal(providing_args=["request", "response"]) +postAddNewCron = Signal() ## This event is fired before CyberPanel core start removing cron -preRemCronbyLine = Signal(providing_args=["request"]) +preRemCronbyLine = Signal() ## This event is fired after CyberPanel core is finished removing cron -postRemCronbyLine = Signal(providing_args=["request", "response"]) +postRemCronbyLine = Signal() ## This event is fired before CyberPanel core start creating domain alias -preSubmitAliasCreation = Signal(providing_args=["request"]) +preSubmitAliasCreation = Signal() ## This event is fired after CyberPanel core is finished creating domain alias -postSubmitAliasCreation = Signal(providing_args=["request", "response"]) +postSubmitAliasCreation = Signal() ## This event is fired before CyberPanel core start deleting domain alais -preDelateAlias = Signal(providing_args=["request"]) +preDelateAlias = Signal() ## This event is fired after CyberPanel core is finished deleting domain alias -postDelateAlias = Signal(providing_args=["request", "response"]) \ No newline at end of file +postDelateAlias = Signal() \ No newline at end of file diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index 5dd72b4c9..5962b06f9 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -11658,4 +11658,311 @@ app.controller('ListDockersitecontainer', function ($scope, $http) { }; +}) + + +app.controller('BuyAddons', function ($scope, $http) { + + + $scope.cyberpanelLoading = true; + $scope.sftpHide = true; + $scope.localHide = true; + + $scope.PaypalBuyNowAddons = function (planName, monthlyPrice, yearlyPrice, lifetime, months) { + + const baseURL = 'https://platform.cyberpersons.com/Billing/AddOnOrderPaypal'; + // Get the current URL + var currentURL = window.location.href; + +// Find the position of the question mark + const queryStringIndex = currentURL.indexOf('?'); + +// Check if there is a query string + currentURL = queryStringIndex !== -1 ? currentURL.substring(0, queryStringIndex) : currentURL; + + + // Encode parameters to make them URL-safe + const params = new URLSearchParams({ + planName: planName, + monthlyPrice: monthlyPrice, + yearlyPrice: yearlyPrice, + lifetime: lifetime, + returnURL: currentURL, // Add the current URL as a query parameter + months: months + }); + + + // Build the complete URL with query string + const fullURL = `${baseURL}?${params.toString()}`; + + // Redirect to the constructed URL + + window.location.href = fullURL; + + } + + + $scope.fetchDetails = function () { + + if ($scope.destinationType === 'SFTP') { + $scope.sftpHide = false; + $scope.localHide = true; + $scope.populateCurrentRecords(); + } else { + $scope.sftpHide = true; + $scope.localHide = false; + $scope.populateCurrentRecords(); + } + }; + + $scope.populateCurrentRecords = function () { + + $scope.cyberpanelLoading = false; + + url = "/backup/getCurrentBackupDestinations"; + + var type = 'SFTP'; + if ($scope.destinationType === 'SFTP') { + type = 'SFTP'; + } else { + type = 'local'; + } + + var data = { + type: type + }; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); + + + function ListInitialDatas(response) { + $scope.cyberpanelLoading = true; + if (response.data.status === 1) { + $scope.records = JSON.parse(response.data.data); + } else { + new PNotify({ + title: 'Operation Failed!', + text: response.data.error_message, + type: 'error' + }); + } + + } + + function cantLoadInitialDatas(response) { + $scope.cyberpanelLoading = true; + new PNotify({ + title: 'Operation Failed!', + text: 'Could not connect to server, please refresh this page', + type: 'error' + }); + } + + }; + + $scope.addDestination = function (type) { + $scope.cyberpanelLoading = false; + + url = "/backup/submitDestinationCreation"; + + if (type === 'SFTP') { + var data = { + type: type, + name: $scope.name, + IPAddress: $scope.IPAddress, + userName: $scope.userName, + password: $scope.password, + backupSSHPort: $scope.backupSSHPort, + path: $scope.path + }; + } else { + var data = { + type: type, + path: $scope.localPath, + name: $scope.name + }; + } + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); + + + function ListInitialDatas(response) { + $scope.cyberpanelLoading = true; + $scope.populateCurrentRecords(); + if (response.data.status === 1) { + new PNotify({ + title: 'Success!', + text: 'Destination successfully added.', + type: 'success' + }); + } else { + new PNotify({ + title: 'Operation Failed!', + text: response.data.error_message, + type: 'error' + }); + } + + } + + function cantLoadInitialDatas(response) { + $scope.cyberpanelLoading = true; + new PNotify({ + title: 'Operation Failed!', + text: 'Could not connect to server, please refresh this page', + type: 'error' + }); + } + + }; + + $scope.removeDestination = function (type, nameOrPath) { + $scope.cyberpanelLoading = false; + + + url = "/backup/deleteDestination"; + + var data = { + type: type, + nameOrPath: nameOrPath, + }; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); + + + function ListInitialDatas(response) { + $scope.cyberpanelLoading = true; + $scope.populateCurrentRecords(); + if (response.data.status === 1) { + new PNotify({ + title: 'Success!', + text: 'Destination successfully removed.', + type: 'success' + }); + } else { + new PNotify({ + title: 'Operation Failed!', + text: response.data.error_message, + type: 'error' + }); + } + + } + + function cantLoadInitialDatas(response) { + $scope.cyberpanelLoading = true; + new PNotify({ + title: 'Operation Failed!', + text: 'Could not connect to server, please refresh this page', + type: 'error' + }); + } + + }; + + $scope.DeployAccount = function (id) { + $scope.cyberpanelLoading = false; + + url = "/backup/DeployAccount"; + + var data = { + id:id + + }; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); + + function ListInitialDatas(response) { + + $scope.cyberpanelLoading = true; + if (response.data.status === 1) { + new PNotify({ + title: 'Success', + text: 'Successfully deployed.', + type: 'success' + }); + $window.location.reload(); + + + } else { + new PNotify({ + title: 'Operation Failed!', + text: response.data.error_message, + type: 'error' + }); + } + + } + + function cantLoadInitialDatas(response) { + $scope.couldNotConnect = false; + restoreBackupButton.disabled = false; + } + + }; + + //// paypal + + $scope.PaypalBuyNowBackup = function (planName, monthlyPrice, yearlyPrice, months) { + + const baseURL = 'https://platform.cyberpersons.com/Billing/PaypalCreateOrderforBackupPlans'; + // Get the current URL + var currentURL = window.location.href; + +// Find the position of the question mark + const queryStringIndex = currentURL.indexOf('?'); + +// Check if there is a query string + currentURL = queryStringIndex !== -1 ? currentURL.substring(0, queryStringIndex) : currentURL; + + // Encode parameters to make them URL-safe + const params = new URLSearchParams({ + planName: planName, + monthlyPrice: monthlyPrice, + yearlyPrice: yearlyPrice, + returnURL: currentURL, // Add the current URL as a query parameter + months: months + }); + + + // Build the complete URL with query string + const fullURL = `${baseURL}?${params.toString()}`; + + // Redirect to the constructed URL + + window.location.href = fullURL; + + } + + + + + }) \ No newline at end of file diff --git a/websiteFunctions/templates/websiteFunctions/CyberpanelPricing.html b/websiteFunctions/templates/websiteFunctions/CyberpanelPricing.html index 84106b6d6..86067432a 100644 --- a/websiteFunctions/templates/websiteFunctions/CyberpanelPricing.html +++ b/websiteFunctions/templates/websiteFunctions/CyberpanelPricing.html @@ -15,7 +15,7 @@ } -
+

Managing Your WordPress sites was never so easy!

43% of all Websites on the Internet are built with @@ -32,12 +32,150 @@ allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen>

-
- - + + +
+
+
+ + +
+ + +
+ + +
+
+ + +
+ +

Comming soon

+ +{#
#} +{##} +{#
#} +{#
#} +{#
#} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{##} +{# #} +{# #} +{# #} +{#
{% trans "Plan Name" %}{% trans "Monthly Price" %}{% trans "Yearly Price" %}{% trans "One-time price" %}{% trans "Actions" %}
RSPAMD Manager$6.99$54$139#} +{##} +{# #} +{##} +{# #} +{# #} +{#
WordPress Manager$6.99$54$139#} +{##} +{# #} +{##} +{# #} +{# #} +{#
Root File Manager$6.99$54$139#} +{##} +{# #} +{##} +{# #} +{# #} +{#
All Addons$7.99$59$169#} +{##} +{# #} +{# #} +{# #} +{#
#} +{#
#} +{##} +{#
#} +{##} +{##} +{# #} + + +

Features You’ll Love

diff --git a/websiteFunctions/urls.py b/websiteFunctions/urls.py index 2173e983a..9fef1fcf9 100755 --- a/websiteFunctions/urls.py +++ b/websiteFunctions/urls.py @@ -1,223 +1,197 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^$', views.loadWebsitesHome, name='loadWebsitesHome'), - url(r'^createWebsite$', views.createWebsite, name='createWebsite'), - url(r'^listWebsites$', views.listWebsites, name='listWebsites'), - url(r'^listChildDomains$', views.listChildDomains, name='listChildDomains'), - url(r'^modifyWebsite$', views.modifyWebsite, name='modifyWebsite'), - url(r'^deleteWebsite$', views.deleteWebsite, name='deleteWebsite'), - url(r'^siteState$', views.siteState, name='siteState'), + path('', views.loadWebsitesHome, name='loadWebsitesHome'), + path('createWebsite/', views.createWebsite, name='createWebsite'), + path('listWebsites/', views.listWebsites, name='listWebsites'), + path('listChildDomains/', views.listChildDomains, name='listChildDomains'), + path('modifyWebsite/', views.modifyWebsite, name='modifyWebsite'), + path('deleteWebsite/', views.deleteWebsite, name='deleteWebsite'), + path('siteState/', views.siteState, name='siteState'), - ## + # New domain + path('CreateNewDomain/', views.CreateNewDomain, name='CreateNewDomain'), - url(r'^CreateNewDomain$', views.CreateNewDomain, name='CreateNewDomain'), + # WordPress + path('createWordpress/', views.WPCreate, name='createWordpress'), + path('ListWPSites/', views.ListWPSites, name='ListWPSites'), + path('WPHome/', views.WPHome, name='WPHome'), + path('RestoreBackups/', views.RestoreBackups, name='RestoreBackups'), + path('RestoreHome/', views.RestoreHome, name='RestoreHome'), + path('AutoLogin/', views.AutoLogin, name='AutoLogin'), + path('RemoteBackupConfig/', views.RemoteBackupConfig, name='RemoteBackupConfig'), + path('BackupfileConfig/', views.BackupfileConfig, name='BackupfileConfig'), + path('AddRemoteBackupsite/', views.AddRemoteBackupsite, name='AddRemoteBackupsite'), + path('pricing/', views.WordpressPricing, name='pricing'), - ### WordPress - url(r'^createWordpress$', views.WPCreate, name='createWordpress'), - url(r'^ListWPSites$', views.ListWPSites, name='ListWPSites'), - url(r'^WPHome$', views.WPHome, name='WPHome'), - url(r'^RestoreBackups$', views.RestoreBackups, name='RestoreBackups'), - url(r'^RestoreHome$', views.RestoreHome, name='RestoreHome'), - url(r'^AutoLogin$', views.AutoLogin, name='AutoLogin'), - url(r'^RemoteBackupConfig$', views.RemoteBackupConfig, name='RemoteBackupConfig'), - url(r'^BackupfileConfig$', views.BackupfileConfig, name='BackupfileConfig'), - url(r'^AddRemoteBackupsite$', views.AddRemoteBackupsite, name='AddRemoteBackupsite'), - url(r'^pricing$', views.WordpressPricing, name='pricing'), + # WordPress Ajax + path('submitWorpressCreation/', views.submitWorpressCreation, name='submitWorpressCreation'), + path('FetchWPdata/', views.FetchWPdata, name='FetchWPdata'), + path('GetCurrentPlugins/', views.GetCurrentPlugins, name='GetCurrentPlugins'), + path('GetCurrentThemes/', views.GetCurrentThemes, name='GetCurrentThemes'), + path('UpdateWPSettings/', views.UpdateWPSettings, name='UpdateWPSettings'), + path('UpdatePlugins/', views.UpdatePlugins, name='UpdatePlugins'), + path('DeletePlugins/', views.DeletePlugins, name='DeletePlugins'), + path('ChangeStatus/', views.ChangeStatus, name='ChangeStatus'), + path('UpdateThemes/', views.UpdateThemes, name='UpdateThemes'), + path('DeleteThemes/', views.DeleteThemes, name='DeleteThemes'), + path('StatusThemes/', views.StatusThemes, name='StatusThemes'), + path('CreateStagingNow/', views.CreateStagingNow, name='CreateStagingNow'), + path('fetchstaging/', views.fetchstaging, name='fetchstaging'), + path('fetchDatabase/', views.fetchDatabase, name='fetchDatabase'), + path('SaveUpdateConfig/', views.SaveUpdateConfig, name='SaveUpdateConfig'), + path('DeploytoProduction/', views.DeploytoProduction, name='DeploytoProduction'), + path('WPCreateBackup/', views.WPCreateBackup, name='WPCreateBackup'), + path('RestoreWPbackupNow/', views.RestoreWPbackupNow, name='RestoreWPbackupNow'), + path('dataintegrity/', views.dataintegrity, name='dataintegrity'), + path('installwpcore/', views.installwpcore, name='installwpcore'), + path('SaveBackupConfig/', views.SaveBackupConfig, name='SaveBackupConfig'), + path('SaveBackupSchedule/', views.SaveBackupSchedule, name='SaveBackupSchedule'), + path('AddWPsiteforRemoteBackup/', views.AddWPsiteforRemoteBackup, name='AddWPsiteforRemoteBackup'), + path('UpdateRemoteschedules/', views.UpdateRemoteschedules, name='UpdateRemoteschedules'), + path('ScanWordpressSite/', views.ScanWordpressSite, name='ScanWordpressSite'), - ###WordPress Ajax - url(r'^submitWorpressCreation', views.submitWorpressCreation, name='submitWorpressCreation'), - url(r'^FetchWPdata', views.FetchWPdata, name='FetchWPdata'), - url(r'^GetCurrentPlugins', views.GetCurrentPlugins, name='GetCurrentPlugins'), - url(r'^GetCurrentThemes', views.GetCurrentThemes, name='GetCurrentThemes'), - url(r'^UpdateWPSettings', views.UpdateWPSettings, name='UpdateWPSettings'), - url(r'^UpdatePlugins', views.UpdatePlugins, name='UpdatePlugins'), - url(r'^DeletePlugins', views.DeletePlugins, name='DeletePlugins'), - url(r'^ChangeStatus', views.ChangeStatus, name='ChangeStatus'), - url(r'^UpdateThemes', views.UpdateThemes, name='UpdateThemes'), - url(r'^DeleteThemes', views.DeleteThemes, name='DeleteThemes'), - url(r'^StatusThemes', views.StatusThemes, name='StatusThemes'), - url(r'^CreateStagingNow', views.CreateStagingNow, name='CreateStagingNow'), - url(r'^fetchstaging', views.fetchstaging, name='fetchstaging'), - url(r'^fetchDatabase', views.fetchDatabase, name='fetchDatabase'), - url(r'^SaveUpdateConfig', views.SaveUpdateConfig, name='SaveUpdateConfig'), - url(r'^DeploytoProduction', views.DeploytoProduction, name='DeploytoProduction'), - url(r'^WPCreateBackup', views.WPCreateBackup, name='WPCreateBackup'), - url(r'^RestoreWPbackupNow', views.RestoreWPbackupNow, name='RestoreWPbackupNow'), - url(r'^dataintegrity', views.dataintegrity, name='dataintegrity'), - url(r'^installwpcore', views.installwpcore, name='installwpcore'), - url(r'^SaveBackupConfig', views.SaveBackupConfig, name='SaveBackupConfig'), - url(r'^SaveBackupSchedule', views.SaveBackupSchedule, name='SaveBackupSchedule'), - url(r'^AddWPsiteforRemoteBackup', views.AddWPsiteforRemoteBackup, name='AddWPsiteforRemoteBackup'), - url(r'^UpdateRemoteschedules', views.UpdateRemoteschedules, name='UpdateRemoteschedules'), - url(r'^ScanWordpressSite', views.ScanWordpressSite, name='ScanWordpressSite'), + # AddPlugin + path('ConfigurePlugins/', views.ConfigurePlugins, name='ConfigurePlugins'), + path('Addnewplugin/', views.Addnewplugin, name='Addnewplugin'), + path('EidtPlugin/', views.EidtPlugin, name='EidtPlugin'), - #### AddPlugin - url(r'^ConfigurePlugins$', views.ConfigurePlugins, name='ConfigurePlugins'), - url(r'^Addnewplugin$', views.Addnewplugin, name='Addnewplugin'), - url(r'^EidtPlugin$', views.EidtPlugin, name='EidtPlugin'), + # AddPlugin Ajax + path('SearchOnkeyupPlugin/', views.SearchOnkeyupPlugin, name='SearchOnkeyupPlugin'), + path('AddNewpluginAjax/', views.AddNewpluginAjax, name='AddNewpluginAjax'), + path('deletesPlgin/', views.deletesPlgin, name='deletesPlgin'), + path('Addplugineidt/', views.Addplugineidt, name='Addplugineidt'), - ## AddPlugin Ajax - url(r'^SearchOnkeyupPlugin$', views.SearchOnkeyupPlugin, name='SearchOnkeyupPlugin'), - url(r'^AddNewpluginAjax$', views.AddNewpluginAjax, name='AddNewpluginAjax'), - url(r'^deletesPlgin', views.deletesPlgin, name='deletesPlgin'), - url(r'^Addplugineidt', views.Addplugineidt, name='Addplugineidt'), + # Website modification + path('submitWebsiteCreation/', views.submitWebsiteCreation, name='submitWebsiteCreation'), + path('submitWebsiteDeletion/', views.submitWebsiteDeletion, name='submitWebsiteDeletion'), + path('submitWebsiteListing/', views.getFurtherAccounts, name='submitWebsiteListing'), + path('fetchWebsitesList/', views.fetchWebsitesList, name='fetchWebsitesList'), + path('fetchChildDomainsMain/', views.fetchChildDomainsMain, name='fetchChildDomainsMain'), + path('convertDomainToSite/', views.convertDomainToSite, name='convertDomainToSite'), + path('searchWebsites/', views.searchWebsites, name='searchWebsites'), + path('submitWebsiteModification/', views.deleteWebsite, name='submitWebsiteModification'), + path('submitWebsiteStatus/', views.submitWebsiteStatus, name='submitWebsiteStatus'), + path('getWebsiteDetails/', views.submitWebsiteModify, name='getWebsiteDetails'), + path('saveWebsiteChanges/', views.saveWebsiteChanges, name='saveWebsiteChanges'), + path('getDataFromLogFile/', views.getDataFromLogFile, name='getDataFromLogFile'), + path('fetchErrorLogs/', views.fetchErrorLogs, name='fetchErrorLogs'), + path('getDataFromConfigFile/', views.getDataFromConfigFile, name='getDataFromConfigFile'), + path('saveConfigsToFile/', views.saveConfigsToFile, name='saveConfigsToFile'), + path('getRewriteRules/', views.getRewriteRules, name='getRewriteRules'), + path('saveRewriteRules/', views.saveRewriteRules, name='saveRewriteRules'), + path('saveSSL/', views.saveSSL, name='saveSSL'), - # Website modification url + # Sub/add/park domains + path('submitDomainCreation/', views.submitDomainCreation, name='submitDomainCreation'), + path('fetchDomains/', views.fetchDomains, name='fetchDomains'), + path('changePHP/', views.changePHP, name='changePHP'), + path('submitDomainDeletion/', views.submitDomainDeletion, name='submitDomainDeletion'), + path('searchChilds/', views.searchChilds, name='searchChilds'), - url(r'^submitWebsiteCreation$', views.submitWebsiteCreation, name='submitWebsiteCreation'), - url(r'^submitWebsiteDeletion$', views.submitWebsiteDeletion, name='submitWebsiteDeletion'), - url(r'^submitWebsiteListing$', views.getFurtherAccounts, name='submitWebsiteListing'), - url(r'^fetchWebsitesList$', views.fetchWebsitesList, name='fetchWebsitesList'), - url(r'^fetchChildDomainsMain$', views.fetchChildDomainsMain, name='fetchChildDomainsMain'), - url(r'^convertDomainToSite$', views.convertDomainToSite, name='convertDomainToSite'), - url(r'^searchWebsites$', views.searchWebsites, name='searchWebsites'), - url(r'^submitWebsiteModification$', views.deleteWebsite, name='submitWebsiteModification'), - url(r'^submitWebsiteStatus$', views.submitWebsiteStatus, name='submitWebsiteStatus'), + # Crons + path('listCron/', views.listCron, name='listCron'), + path('getWebsiteCron/', views.getWebsiteCron, name='getWebsiteCron'), + path('getCronbyLine/', views.getCronbyLine, name='getCronbyLine'), + path('remCronbyLine/', views.remCronbyLine, name='remCronbyLine'), + path('saveCronChanges/', views.saveCronChanges, name='saveCronChanges'), + path('addNewCron/', views.addNewCron, name='addNewCron'), - url(r'^getWebsiteDetails$', views.submitWebsiteModify, name='getWebsiteDetails'), - url(r'^saveWebsiteChanges', views.saveWebsiteChanges, name='saveWebsiteChanges'), + # Domain Alias + path('/domainAlias/', views.domainAlias, name='domainAlias'), + path('submitAliasCreation/', views.submitAliasCreation, name='submitAliasCreation'), + path('issueAliasSSL/', views.issueAliasSSL, name='issueAliasSSL'), + path('delateAlias/', views.delateAlias, name='delateAlias'), - url(r'^getDataFromLogFile$', views.getDataFromLogFile, name='getDataFromLogFile'), - url(r'^fetchErrorLogs$', views.fetchErrorLogs, name='fetchErrorLogs'), + # Openbasedir + path('changeOpenBasedir/', views.changeOpenBasedir, name='changeOpenBasedir'), - url(r'^getDataFromConfigFile$', views.getDataFromConfigFile, name='getDataFromConfigFile'), + # WP Install + path('/wordpressInstall/', views.wordpressInstall, name='wordpressInstall'), + path('installWordpressStatus/', views.installWordpressStatus, name='installWordpressStatus'), + path('installWordpress/', views.installWordpress, name='installWordpress'), - url(r'^saveConfigsToFile$', views.saveConfigsToFile, name='saveConfigsToFile'), + # Joomla Install + path('installJoomla/', views.installJoomla, name='installJoomla'), + path('/joomlaInstall/', views.joomlaInstall, name='joomlaInstall'), - url(r'^getRewriteRules$', views.getRewriteRules, name='getRewriteRules'), + # PrestaShop Install + path('prestaShopInstall/', views.prestaShopInstall, name='prestaShopInstall'), + path('/installPrestaShop/', views.installPrestaShop, name='installPrestaShop'), - url(r'^saveRewriteRules$', views.saveRewriteRules, name='saveRewriteRules'), + # Magento + path('/installMagento/', views.installMagento, name='installMagento'), + path('magentoInstall/', views.magentoInstall, name='magentoInstall'), - url(r'^saveSSL$', views.saveSSL, name='saveSSL'), + # Mautic + path('/installMautic/', views.installMautic, name='installMautic'), + path('mauticInstall/', views.mauticInstall, name='mauticInstall'), - ## sub/add/park domains + # Git + path('/setupGit/', views.setupGit, name='setupGit'), + path('setupGitRepo/', views.setupGitRepo, name='setupGitRepo'), - url(r'^submitDomainCreation$', views.submitDomainCreation, name='submitDomainCreation'), + # Set up SSH Access + path('/sshAccess/', views.sshAccess, name='sshAccess'), + path('saveSSHAccessChanges/', views.saveSSHAccessChanges, name='saveSSHAccessChanges'), - ## fetch domains + # Staging Environment + path('/setupStaging/', views.setupStaging, name='setupStaging'), + path('startCloning/', views.startCloning, name='startCloning'), + path('//syncToMaster/', views.syncToMaster, name='syncToMaster'), + path('startSync/', views.startSync, name='startSync'), + path('/gitNotify/', views.gitNotify, name='gitNotify'), + path('detachRepo/', views.detachRepo, name='detachRepo'), + path('changeBranch/', views.changeBranch, name='changeBranch'), - url(r'^fetchDomains$', views.fetchDomains, name='submitDomainCreation'), - url(r'^changePHP$', views.changePHP, name='changePHP'), - url(r'^submitDomainDeletion$', views.submitDomainDeletion, name='submitDomainDeletion'), - url(r'^searchChilds$', views.searchChilds, name='searchChilds'), - # crons - - url(r'^listCron$', views.listCron, name="listCron"), - url(r'^getWebsiteCron$', views.getWebsiteCron, name="getWebsiteCron"), - url(r'^getCronbyLine$', views.getCronbyLine, name="getCronbyLine"), - url(r'^remCronbyLine$', views.remCronbyLine, name="remCronbyLine"), - url(r'^saveCronChanges$', views.saveCronChanges, name="saveCronChanges"), - url(r'^addNewCron$', views.addNewCron, name="addNewCron"), - - ## Domain Alias - - url(r'^(?P(.*))/domainAlias$', views.domainAlias, name='domainAlias'), - url(r'^submitAliasCreation$', views.submitAliasCreation, name="submitAliasCreation"), - url(r'^issueAliasSSL$', views.issueAliasSSL, name="issueAliasSSL"), - url(r'^delateAlias$', views.delateAlias, name="delateAlias"), - - ## Openbasedir - url(r'^changeOpenBasedir$', views.changeOpenBasedir, name="changeOpenBasedir"), - - ## WP Install - - url(r'^(?P(.*))/wordpressInstall$', views.wordpressInstall, name='wordpressInstall'), - url(r'^installWordpressStatus$', views.installWordpressStatus, name="installWordpressStatus"), - url(r'^installWordpress$', views.installWordpress, name='installWordpress'), - - ## Joomla Install - - url(r'^installJoomla$', views.installJoomla, name='installJoomla'), - url(r'^(?P(.*))/joomlaInstall$', views.joomlaInstall, name='joomlaInstall'), - - ## PrestaShop Install - - url(r'^prestaShopInstall$', views.prestaShopInstall, name='prestaShopInstall'), - url(r'^(?P(.*))/installPrestaShop$', views.installPrestaShop, name='installPrestaShop'), - - ## magento - - url(r'^(?P(.*))/installMagento$', views.installMagento, name='installMagento'), - url(r'^magentoInstall$', views.magentoInstall, name='magentoInstall'), - - ## mautic - - url(r'^(?P(.*))/installMautic$', views.installMautic, name='installMautic'), - url(r'^mauticInstall$', views.mauticInstall, name='mauticInstall'), - - ## Git - url(r'^(?P(.*))/setupGit$', views.setupGit, name='setupGit'), - url(r'^setupGitRepo$', views.setupGitRepo, name='setupGitRepo'), - - ## Set up SSH Access - url(r'^(?P(.*))/sshAccess$', views.sshAccess, name='sshAccess'), - url(r'^saveSSHAccessChanges$', views.saveSSHAccessChanges, name='saveSSHAccessChanges'), - - ## Staging Enviroment - - url(r'^(?P(.*))/setupStaging$', views.setupStaging, name='setupStaging'), - url(r'^startCloning$', views.startCloning, name='startCloning'), - url(r'^(?P(.*))/(?P(.*))/syncToMaster$', views.syncToMaster, name='syncToMaster'), - url(r'^startSync$', views.startSync, name='startSync'), - - url(r'^(?P(.*))/gitNotify$', views.gitNotify, name='gitNotify'), - url(r'^detachRepo$', views.detachRepo, name='detachRepo'), - url(r'^changeBranch$', views.changeBranch, name='changeBranch'), - - ### Manage GIT - - url(r'^(?P(.*))/manageGIT$', views.manageGIT, name='manageGIT'), - url(r'^(?P(.*))/webhook$', views.webhook, name='webhook'), - url(r'^fetchFolderDetails$', views.fetchFolderDetails, name='fetchFolderDetails'), - url(r'^initRepo$', views.initRepo, name='initRepo'), - url(r'^setupRemote$', views.setupRemote, name='setupRemote'), - url(r'^changeGitBranch$', views.changeGitBranch, name='changeGitBranch'), - url(r'^createNewBranch$', views.createNewBranch, name='createNewBranch'), - url(r'^commitChanges$', views.commitChanges, name='commitChanges'), - url(r'^gitPull$', views.gitPull, name='gitPull'), - url(r'^gitPush$', views.gitPush, name='gitPush'), - url(r'^attachRepoGIT$', views.attachRepoGIT, name='attachRepoGIT'), - url(r'^removeTracking$', views.removeTracking, name='removeTracking'), - url(r'^fetchGitignore$', views.fetchGitignore, name='fetchGitignore'), - url(r'^saveGitIgnore$', views.saveGitIgnore, name='saveGitIgnore'), - url(r'^fetchCommits$', views.fetchCommits, name='fetchCommits'), - url(r'^fetchFiles$', views.fetchFiles, name='fetchFiles'), - url(r'^fetchChangesInFile$', views.fetchChangesInFile, name='fetchChangesInFile'), - url(r'^saveGitConfigurations$', views.saveGitConfigurations, name='saveGitConfigurations'), - url(r'^fetchGitLogs$', views.fetchGitLogs, name='fetchGitLogs'), + # Manage GIT + path('/manageGIT/', views.manageGIT, name='manageGIT'), + path('/webhook/', views.webhook, name='webhook'), + path('fetchFolderDetails/', views.fetchFolderDetails, name='fetchFolderDetails'), + path('initRepo/', views.initRepo, name='initRepo'), + path('setupRemote/', views.setupRemote, name='setupRemote'), + path('changeGitBranch/', views.changeGitBranch, name='changeGitBranch'), + path('createNewBranch/', views.createNewBranch, name='createNewBranch'), + path('commitChanges/', views.commitChanges, name='commitChanges'), + path('gitPull/', views.gitPull, name='gitPull'), + path('gitPush/', views.gitPush, name='gitPush'), + path('attachRepoGIT/', views.attachRepoGIT, name='attachRepoGIT'), + path('removeTracking/', views.removeTracking, name='removeTracking'), + path('fetchGitignore/', views.fetchGitignore, name='fetchGitignore'), + path('saveGitIgnore/', views.saveGitIgnore, name='saveGitIgnore'), + path('fetchCommits/', views.fetchCommits, name='fetchCommits'), + path('fetchFiles/', views.fetchFiles, name='fetchFiles'), + path('fetchChangesInFile/', views.fetchChangesInFile, name='fetchChangesInFile'), + path('saveGitConfigurations/', views.saveGitConfigurations, name='saveGitConfigurations'), + path('fetchGitLogs/', views.fetchGitLogs, name='fetchGitLogs'), # Docker Site & Packages - url(r'^CreateDockerPackage$', views.CreateDockerPackage, name='CreateDockerPackage'), - url(r'^AssignPackage$', views.AssignPackage, name='AssignPackage'), - url(r'^CreateDockersite$', views.CreateDockersite, name='CreateDockersite'), - url(r'^AddDockerpackage$', views.AddDockerpackage, name='AddDockerpackage'), - url(r'^Getpackage$', views.Getpackage, name='Getpackage'), - url(r'^Updatepackage$', views.Updatepackage, name='Updatepackage'), - url(r'^AddAssignment$', views.AddAssignment, name='AddAssignment'), - url(r'^submitDockerSiteCreation$', views.submitDockerSiteCreation, name='submitDockerSiteCreation'), - url(r'^ListDockerSites$', views.ListDockerSites, name='ListDockerSites'), - url(r'^fetchDockersite$', views.fetchDockersite, name='fetchDockersite'), + path('CreateDockerPackage/', views.CreateDockerPackage, name='CreateDockerPackage'), + path('AssignPackage/', views.AssignPackage, name='AssignPackage'), + path('CreateDockersite/', views.CreateDockersite, name='CreateDockersite'), + path('AddDockerpackage/', views.AddDockerpackage, name='AddDockerpackage'), + path('Getpackage/', views.Getpackage, name='Getpackage'), + path('Updatepackage/', views.Updatepackage, name='Updatepackage'), + path('AddAssignment/', views.AddAssignment, name='AddAssignment'), + path('submitDockerSiteCreation/', views.submitDockerSiteCreation, name='submitDockerSiteCreation'), + path('ListDockerSites/', views.ListDockerSites, name='ListDockerSites'), + path('fetchDockersite/', views.fetchDockersite, name='fetchDockersite'), + # SSH Configs + path('getSSHConfigs/', views.getSSHConfigs, name='getSSHConfigs'), + path('deleteSSHKey/', views.deleteSSHKey, name='deleteSSHKey'), + path('addSSHKey/', views.addSSHKey, name='addSSHKey'), - ### SSH Configs - - url(r'^getSSHConfigs$', views.getSSHConfigs, name='getSSHConfigs'), - url(r'^deleteSSHKey$', views.deleteSSHKey, name='deleteSSHKey'), - url(r'^addSSHKey$', views.addSSHKey, name='addSSHKey'), - - ### Apache Manager - - url(r'^ApacheManager/(?P(.*))$', views.ApacheManager, name='ApacheManager'), - url(r'^getSwitchStatus$', views.getSwitchStatus, name='getSwitchStatus'), - url(r'^switchServer$', views.switchServer, name='switchServer'), - url(r'^statusFunc$', views.statusFunc, name='statusFunc'), - url(r'^tuneSettings$', views.tuneSettings, name='tuneSettings'), - url(r'^saveApacheConfigsToFile$', views.saveApacheConfigsToFile, name='saveApacheConfigsToFile'), - - ## Catch all for domains - url(r'^(?P(.*))/(?P(.*))$', views.launchChild, name='launchChild'), - url(r'^(?P(.*))$', views.domain, name='domain'), + # Apache Manager + path('ApacheManager//', views.ApacheManager, name='ApacheManager'), + path('getSwitchStatus/', views.getSwitchStatus, name='getSwitchStatus'), + path('switchServer/', views.switchServer, name='switchServer'), + path('statusFunc/', views.statusFunc, name='statusFunc'), + path('tuneSettings/', views.tuneSettings, name='tuneSettings'), + path('saveApacheConfigsToFile/', views.saveApacheConfigsToFile, name='saveApacheConfigsToFile'), + # Catch all for domains + path('//', views.launchChild, name='launchChild'), + path('/', views.domain, name='domain'), ] diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 486a5dda3..3ff9deb46 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -94,6 +94,7 @@ class WebsiteManager: response = requests.post(url, data=json.dumps(data)) Status = response.json()['status'] + if (Status == 1) or ProcessUtilities.decideServer() == ProcessUtilities.ent: currentACL = ACLManager.loadedACL(userID) adminNames = ACLManager.loadAllUsers(userID)