diff --git a/CLScript/CLMain.py b/CLScript/CLMain.py index 8e5afdf6e..2f77e54d8 100644 --- a/CLScript/CLMain.py +++ b/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.3' - self.build = '5' + self.build = '6' ipFile = "/etc/cyberpanel/machineIP" f = open(ipFile) diff --git a/baseTemplate/views.py b/baseTemplate/views.py index 073eb34b0..e08d707ab 100755 --- a/baseTemplate/views.py +++ b/baseTemplate/views.py @@ -21,7 +21,7 @@ from plogical.httpProc import httpProc # Create your views here. VERSION = '2.3' -BUILD = 5 +BUILD = 6 @ensure_csrf_cookie diff --git a/firewall/firewallManager.py b/firewall/firewallManager.py index ef1854cb3..9bb38e7d8 100755 --- a/firewall/firewallManager.py +++ b/firewall/firewallManager.py @@ -1313,6 +1313,10 @@ class FirewallManager: userID = self.request.session['userID'] currentACL = ACLManager.loadedACL(userID) + final_dic = {'installStatus': 0, 'error_message': 'CSF install is currently disabled.'} + final_json = json.dumps(final_dic) + return HttpResponse(final_json) + if currentACL['admin'] == 1: pass else: diff --git a/install/install.py b/install/install.py index 418ba164c..127777a9f 100755 --- a/install/install.py +++ b/install/install.py @@ -15,7 +15,7 @@ from stat import * import stat VERSION = '2.3' -BUILD = 5 +BUILD = 6 char_set = {'small': 'abcdefghijklmnopqrstuvwxyz', 'nums': '0123456789', 'big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'} diff --git a/loginSystem/views.py b/loginSystem/views.py index ea43cd1fe..29d1e6933 100644 --- a/loginSystem/views.py +++ b/loginSystem/views.py @@ -19,7 +19,7 @@ from django.utils import translation # Create your views here. VERSION = '2.3' -BUILD = 5 +BUILD = 6 def verifyLogin(request): diff --git a/plogical/adminPass.py b/plogical/adminPass.py index 1ea24af2f..49421fc3e 100755 --- a/plogical/adminPass.py +++ b/plogical/adminPass.py @@ -13,7 +13,7 @@ from packages.models import Package from baseTemplate.models import version VERSION = '2.3' -BUILD = 5 +BUILD = 6 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 625a15ff4..22a68e61b 100755 --- a/plogical/backupUtilities.py +++ b/plogical/backupUtilities.py @@ -52,7 +52,7 @@ except: pass VERSION = '2.3' -BUILD = 5 +BUILD = 6 ## I am not the monster that you think I am.. diff --git a/plogical/upgrade.py b/plogical/upgrade.py index a91b15b4c..568ec7871 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -18,7 +18,7 @@ import random import string VERSION = '2.3' -BUILD = 5 +BUILD = 6 CENTOS7 = 0 CENTOS8 = 1 diff --git a/serverStatus/views.py b/serverStatus/views.py index c63e74aa8..6449b864f 100755 --- a/serverStatus/views.py +++ b/serverStatus/views.py @@ -26,7 +26,7 @@ EXPIRE = 3 ### Version VERSION = '2.3' -BUILD = 5 +BUILD = 6 def serverStatusHome(request):