diff --git a/CLScript/CLMain.py b/CLScript/CLMain.py index 7fe666ab5..8755edcaa 100644 --- a/CLScript/CLMain.py +++ b/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) diff --git a/backup/views.py b/backup/views.py index 284e72540..c3f843fc9 100755 --- a/backup/views.py +++ b/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) diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html index 912b3e6af..e81a54b78 100755 --- a/baseTemplate/templates/baseTemplate/index.html +++ b/baseTemplate/templates/baseTemplate/index.html @@ -77,7 +77,7 @@ - {% with version="2.3.8.1.1" %} + {% with version="2.4.0" %} diff --git a/baseTemplate/views.py b/baseTemplate/views.py index 14b80d9d5..57ffada4c 100755 --- a/baseTemplate/views.py +++ b/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 diff --git a/install/install.py b/install/install.py index c01206e09..dec901953 100755 --- a/install/install.py +++ b/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'} diff --git a/loginSystem/views.py b/loginSystem/views.py index 256f9aab5..9a35c76f5 100644 --- a/loginSystem/views.py +++ b/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): diff --git a/plogical/adminPass.py b/plogical/adminPass.py index cb1dc308d..c6c226664 100755 --- a/plogical/adminPass.py +++ b/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") diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py index 3e1552883..6561ba956 100755 --- a/plogical/backupUtilities.py +++ b/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..') diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 7dd2dfb70..e7ea704e2 100755 --- a/plogical/upgrade.py +++ b/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 diff --git a/serverStatus/views.py b/serverStatus/views.py index 12c797283..6a655159e 100755 --- a/serverStatus/views.py +++ b/serverStatus/views.py @@ -25,8 +25,8 @@ EXPIRE = 3 ### Version -VERSION = '2.3' -BUILD = 9 +VERSION = '2.4' +BUILD = 0 def serverStatusHome(request):