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

bug fix: with website search and wpsites

Browse Source
This commit is contained in:
usmannasir
2025-05-02 12:40:09 +05:00
parent 6c01cd6a0d
commit c97791b3df
3 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
websiteFunctions/website.py
View File

@@ -4566,8 +4566,7 @@ StrictHostKeyChecking no
websites = ACLManager.searchWebsiteObjects(currentlACL, userID, searchTerm)
json_data = "["
checker = 0
json_data = []
try:
ipFile = "/etc/cyberpanel/machineIP"
@@ -4598,19 +4597,34 @@ StrictHostKeyChecking no
PHPVersionActual = 'PHP 8.1'
diskUsed = "%sMB" % str(DiskUsage)
dic = {'domain': items.domain, 'adminEmail': items.adminEmail, 'ipAddress': ipAddress,
'admin': items.admin.userName, 'package': items.package.packageName, 'state': state,
'diskUsed': diskUsed, 'phpVersion': PHPVersionActual}
if checker == 0:
json_data = json_data + json.dumps(dic)
checker = 1
else:
json_data = json_data + ',' + json.dumps(dic)
# Get WordPress sites for this website
wp_sites = []
try:
wp_sites = WPSites.objects.filter(owner=items)
wp_sites = [{
'id': wp.id,
'title': wp.title,
'url': wp.FinalURL,
'version': wp.version if hasattr(wp, 'version') else 'Unknown',
'phpVersion': wp.phpVersion if hasattr(wp, 'phpVersion') else 'Unknown'
} for wp in wp_sites]
except:
pass
json_data = json_data + ']'
json_data.append({
'domain': items.domain,
'adminEmail': items.adminEmail,
'ipAddress': ipAddress,
'admin': items.admin.userName,
'package': items.package.packageName,
'state': state,
'diskUsed': diskUsed,
'phpVersion': PHPVersionActual,
'wp_sites': wp_sites
})
return json_data
return json.dumps(json_data)
def findWebsitesJson(self, currentACL, userID, pageNumber):
finalPageNumber = ((pageNumber * 10)) - 10