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

release prepration of v2.4.0

Browse Source
This commit is contained in:
usmannasir
2025-04-14 14:44:01 +05:00
parent a8f5850cf7
commit bb3c311d5e
10 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CLScript/CLMain.py
View File

@@ -4,8 +4,8 @@ class CLMain():
def __init__(self): def __init__(self):
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.4'
self.build = '9' self.build = '0'
ipFile = "/etc/cyberpanel/machineIP" ipFile = "/etc/cyberpanel/machineIP"
f = open(ipFile) f = open(ipFile)

1
backup/views.py
View File

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

2
baseTemplate/templates/baseTemplate/index.html
View File

@@ -77,7 +77,7 @@
<!-- HELPERS --> <!-- 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' %}"> <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/assets/finalBase/finalBase.css' %}">

4
baseTemplate/views.py
View File

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

4
install/install.py
View File

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

4
loginSystem/views.py
View File

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

4
plogical/adminPass.py
View File

@@ -12,8 +12,8 @@ from plogical.acl import ACLManager
from packages.models import Package from packages.models import Package
from baseTemplate.models import version from baseTemplate.models import version
VERSION = '2.3' VERSION = '2.4'
BUILD = 9 BUILD = 0
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")

8
plogical/backupUtilities.py
View File

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

4
plogical/upgrade.py
View File

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

4
serverStatus/views.py
View File

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