release prepration of v2.4.0

CLScript/CLMain.py

@@ -4,8 +4,8 @@ class CLMain():
     def __init__(self):
         self.path = '/usr/local/CyberCP/version.txt'
         #versionInfo = json.loads(open(self.path, 'r').read())
-        self.version = '2.3'
-        self.build = '9'
+        self.version = '2.4'
+        self.build = '0'
 
         ipFile = "/etc/cyberpanel/machineIP"
         f = open(ipFile)

backup/views.py

@@ -546,7 +546,6 @@ def DeployAccount(request):
 def ReconfigureSubscription(request):
     try:
         userID = request.session['userID']
-        admin = Administrator.objects.get(pk=userID)
         bm = BackupManager()
         data = json.loads(request.body)
         return bm.ReconfigureSubscription(request, userID, data)

baseTemplate/templates/baseTemplate/index.html

@@ -77,7 +77,7 @@
 
     <!-- HELPERS -->
 
-    {% with version="2.3.8.1.1" %}
+    {% with version="2.4.0" %}
 
         <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/assets/finalBase/finalBase.css' %}">
 

baseTemplate/views.py

@@ -20,8 +20,8 @@ from plogical.httpProc import httpProc
 
 # Create your views here.
 
-VERSION = '2.3'
-BUILD = 9
+VERSION = '2.4'
+BUILD = 0
 
 
 @ensure_csrf_cookie

install/install.py

@@ -14,8 +14,8 @@ from os.path import *
 from stat import *
 import stat
 
-VERSION = '2.3'
-BUILD = 9
+VERSION = '2.4'
+BUILD = 0
 
 char_set = {'small': 'abcdefghijklmnopqrstuvwxyz', 'nums': '0123456789', 'big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'}
 

loginSystem/views.py

@@ -16,8 +16,8 @@ from django.http import HttpResponse
 from django.utils import translation
 # Create your views here.
 
-VERSION = '2.3'
-BUILD = 9
+VERSION = '2.4'
+BUILD = 0
 
 
 def verifyLogin(request):

plogical/adminPass.py

@@ -12,8 +12,8 @@ from plogical.acl import ACLManager
 from packages.models import Package
 from baseTemplate.models import version
 
-VERSION = '2.3'
-BUILD = 9
+VERSION = '2.4'
+BUILD = 0
 
 if not os.geteuid() == 0:
     sys.exit("\nOnly root can run this script\n")

plogical/backupUtilities.py

@@ -53,8 +53,8 @@ try:
 except:
     pass
 
-VERSION = '2.3'
-BUILD = 9
+VERSION = '2.4'
+BUILD = 0
 
 
 ## I am not the monster that you think I am..
@@ -739,7 +739,7 @@ class backupUtilities:
 
                 dbName = database.find('dbName').text
 
-                if (VERSION == '2.1' or VERSION == '2.3') and int(BUILD) >= 1:
+                if ((VERSION == '2.1' or VERSION == '2.3') and int(BUILD) >= 1) or (VERSION == '2.4' and int(BUILD) >= 0):
 
                     logging.CyberCPLogFileWriter.writeToFile('Backup version 2.1.1+ detected..')
                     databaseUsers = database.findall('databaseUsers')
@@ -1073,7 +1073,7 @@ class backupUtilities:
 
                 dbName = database.find('dbName').text
 
-                if (VERSION == '2.1' or VERSION == '2.3') and int(BUILD) >= 1:
+                if ((VERSION == '2.1' or VERSION == '2.3') and int(BUILD) >= 1) or (VERSION == '2.4' and int(BUILD) >= 0):
 
                     logging.CyberCPLogFileWriter.writeToFile('Backup version 2.1.1+ detected..')
 

plogical/upgrade.py

@@ -17,8 +17,8 @@ from CyberCP import settings
 import random
 import string
 
-VERSION = '2.3'
-BUILD = 9
+VERSION = '2.4'
+BUILD = 0
 
 CENTOS7 = 0
 CENTOS8 = 1

serverStatus/views.py

@@ -25,8 +25,8 @@ EXPIRE = 3
 
 ### Version
 
-VERSION = '2.3'
-BUILD = 9
+VERSION = '2.4'
+BUILD = 0
 
 
 def serverStatusHome(request):