Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-06 21:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: https://github.com/usmannasir/cyberpanel/issues/1189

Browse Source
This commit is contained in:
usmannasir
2024-01-24 08:33:52 +05:00
parent e8785ce5ba
commit a8387cda39
9 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CLScript/CLMain.py
View File

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

2
baseTemplate/views.py
View File

@@ -19,7 +19,7 @@ from plogical.httpProc import httpProc
# Create your views here. # Create your views here.
VERSION = '2.3' VERSION = '2.3'
BUILD = 4 BUILD = 5
@ensure_csrf_cookie @ensure_csrf_cookie

2
install/install.py
View File

@@ -15,7 +15,7 @@ from stat import *
import stat import stat
VERSION = '2.3' VERSION = '2.3'
BUILD = 4 BUILD = 5
char_set = {'small': 'abcdefghijklmnopqrstuvwxyz', 'nums': '0123456789', 'big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'} char_set = {'small': 'abcdefghijklmnopqrstuvwxyz', 'nums': '0123456789', 'big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'}

2
loginSystem/views.py
View File

@@ -19,7 +19,7 @@ from django.utils import translation
# Create your views here. # Create your views here.
VERSION = '2.3' VERSION = '2.3'
BUILD = 4 BUILD = 5
def verifyLogin(request): def verifyLogin(request):

2
plogical/adminPass.py
View File

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

2
plogical/backupUtilities.py
View File

@@ -49,7 +49,7 @@ except:
pass pass
VERSION = '2.3' VERSION = '2.3'
BUILD = 4 BUILD = 5
## I am not the monster that you think I am.. ## I am not the monster that you think I am..

8
plogical/upgrade.py
View File

@@ -1,3 +1,4 @@
import json
import os import os
import os.path import os.path
import sys import sys
@@ -17,7 +18,7 @@ import random
import string import string
VERSION = '2.3' VERSION = '2.3'
BUILD = 4 BUILD = 5
CENTOS7 = 0 CENTOS7 = 0
CENTOS8 = 1 CENTOS8 = 1
@@ -667,10 +668,10 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout';
version_build = str(BUILD) version_build = str(BUILD)
try: try:
Content = {"version":version_number,"build":version_build}
path = "/usr/local/CyberCP/version.txt" path = "/usr/local/CyberCP/version.txt"
writeToFile = open(path, 'w') writeToFile = open(path, 'w')
writeToFile.writelines(version_number + '\n') writeToFile.write(json.dumps(Content))
writeToFile.writelines(version_build)
writeToFile.close() writeToFile.close()
except: except:
pass pass
@@ -3307,6 +3308,7 @@ pm.max_spare_servers = 3
## ##
Upgrade.downloadAndUpgrade(versionNumbring, branch) Upgrade.downloadAndUpgrade(versionNumbring, branch)
versionNumbring = Upgrade.downloadLink()
Upgrade.download_install_phpmyadmin() Upgrade.download_install_phpmyadmin()
Upgrade.downoad_and_install_raindloop() Upgrade.downoad_and_install_raindloop()

2
serverStatus/views.py
View File

@@ -26,7 +26,7 @@ EXPIRE = 3
### Version ### Version
VERSION = '2.3' VERSION = '2.3'
BUILD = 4 BUILD = 5
def serverStatusHome(request): def serverStatusHome(request):
proc = httpProc(request, 'serverStatus/index.html', proc = httpProc(request, 'serverStatus/index.html',

2
version.txt
View File

@@ -1 +1 @@
{"version":"2.3","build":1} {"version":"2.3","build":5}