bug fix: make sure free scan works

CLScript/CLMain.py

@@ -5,7 +5,7 @@ class CLMain():
         self.path = '/usr/local/CyberCP/version.txt'
         #versionInfo = json.loads(open(self.path, 'r').read())
         self.version = '2.4'
-        self.build = '1'
+        self.build = '2'
 
         ipFile = "/etc/cyberpanel/machineIP"
         f = open(ipFile)

CyberCP/settings.py

@@ -95,6 +95,7 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'baseTemplate.context_processors.version_context',
             ],
         },
     },

aiScanner/aiScannerManager.py

@@ -712,6 +712,7 @@ class AIScannerManager:
         """Submit scan request to AI Scanner API"""
         try:
             payload = {
+                'domain': domain,
                 'site_url': domain,
                 'scan_type': scan_type,
                 'cyberpanel_callback': callback_url,

baseTemplate/context_processors.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+from .views import VERSION, BUILD
+
+def version_context(request):
+    """Add version information to all templates"""
+    return {
+        'CYBERPANEL_VERSION': VERSION,
+        'CYBERPANEL_BUILD': BUILD,
+        'CYBERPANEL_FULL_VERSION': f"{VERSION}.{BUILD}"
+    }

baseTemplate/templates/baseTemplate/index.html

@@ -1656,20 +1656,20 @@
     </div>
     
     <!-- Additional Scripts -->
-    <script src="{% static 'packages/packages.js' %}"></script>
+    <script src="{% static 'packages/packages.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'websiteFunctions/websiteFunctions.js' %}"></script>
+    <script src="{% static 'websiteFunctions/websiteFunctions.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'userManagment/userManagment.js' %}"></script>
+    <script src="{% static 'userManagment/userManagment.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'databases/databases.js' %}"></script>
+    <script src="{% static 'databases/databases.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'dns/dns.js' %}"></script>
+    <script src="{% static 'dns/dns.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'mailServer/mailServer.js' %}"></script>
+    <script src="{% static 'mailServer/mailServer.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'ftp/ftp.js' %}"></script>
+    <script src="{% static 'ftp/ftp.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'backup/backup.js' %}"></script>
+    <script src="{% static 'backup/backup.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'managePHP/managePHP.js' %}"></script>
+    <script src="{% static 'managePHP/managePHP.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'serverLogs/serverLogs.js' %}"></script>
+    <script src="{% static 'serverLogs/serverLogs.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'serverStatus/serverStatus.js' %}"></script>
+    <script src="{% static 'serverStatus/serverStatus.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'firewall/firewall.js' %}"></script>
+    <script src="{% static 'firewall/firewall.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'emailPremium/emailPremium.js' %}"></script>
+    <script src="{% static 'emailPremium/emailPremium.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
-    <script src="{% static 'manageServices/manageServices.js' %}"></script>
+    <script src="{% static 'manageServices/manageServices.js' %}?v={{ CYBERPANEL_FULL_VERSION }}"></script>
     
     <!-- Scripts -->
     <script>

baseTemplate/views.py

@@ -28,7 +28,7 @@ import pwd
 # Create your views here.
 
 VERSION = '2.4'
-BUILD = 1
+BUILD = 2
 
 
 @ensure_csrf_cookie

install/install.py

@@ -16,7 +16,7 @@ import stat
 import secrets
 
 VERSION = '2.4'
-BUILD = 1
+BUILD = 2
 
 char_set = {'small': 'abcdefghijklmnopqrstuvwxyz', 'nums': '0123456789', 'big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'}
 

loginSystem/views.py

@@ -17,7 +17,7 @@ from django.utils import translation
 # Create your views here.
 
 VERSION = '2.4'
-BUILD = 1
+BUILD = 2
 
 
 def verifyLogin(request):

plogical/adminPass.py

@@ -13,7 +13,7 @@ from packages.models import Package
 from baseTemplate.models import version
 
 VERSION = '2.4'
-BUILD = 1
+BUILD = 2
 
 if not os.geteuid() == 0:
     sys.exit("\nOnly root can run this script\n")

plogical/backupUtilities.py

@@ -54,7 +54,7 @@ except:
     pass
 
 VERSION = '2.4'
-BUILD = 1
+BUILD = 2
 
 
 ## I am not the monster that you think I am..

plogical/upgrade.py

@@ -18,7 +18,7 @@ import random
 import string
 
 VERSION = '2.4'
-BUILD = 1
+BUILD = 2
 
 CENTOS7 = 0
 CENTOS8 = 1

serverStatus/views.py

@@ -26,7 +26,7 @@ EXPIRE = 3
 ### Version
 
 VERSION = '2.4'
-BUILD = 1
+BUILD = 2
 
 
 def serverStatusHome(request):