local changes

usmannasir · Aug 4, 2024 · b56838b · b56838b
1 parent f500809
commit b56838b
Show file tree

Hide file tree

Showing 44 changed files with 1,378 additions and 1,032 deletions.
diff --git 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<domain>(.*))$', views.websiteContainerLimit, name='websiteContainerLimitCL'),
-    # url(r'^getUsageData$', views.getUsageData, name='getUsageData'),
-]
+    # 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<domain>(.*))$', views.websiteContainerLimit, name='websiteContainerLimitCL'),
+    # re_path(r'^getUsageData$', views.getUsageData, name='getUsageData'),
+]
diff --git a/CyberCP/settings.py b/CyberCP/settings.py
@@ -11,7 +11,7 @@
 """
 
 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
@@ -5,44 +5,44 @@
 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
@@ -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'),
 
-]
+    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
@@ -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'),
-]
+    path('', views.terminal, name='terminal'),
+    path('restart/', views.restart, name='restart'),
+]
diff --git 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'),
 ]