mirror
/
cyberpanel
mirror of https://github.com/usmannasir/cyberpanel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed website url issue

This commit is contained in:
Hassan Hashmi 2024-01-24 11:34:00 +05:00
parent ffdbd93b1e
commit 10492abad8
11 changed files with 62 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CyberCP/settings.py
View File

@ -24,7 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
SECRET_KEY = 'xr%j*p!*$0d%(-(e%@-*hyoz4$f%y77coq0u)6pwmjg4)q&19f'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
DEBUG = True
ALLOWED_HOSTS = ['*']

1
CyberCP/urls.py
View File

@ -35,6 +35,7 @@ urlpatterns = [
url(r'^manageSSL/',include('manageSSL.urls')),
url(r'^api/',include('api.urls')),
url(r'^filemanager/',include('filemanager.urls')),
url(r'^filemanagerv2/',include('filemanager.urlv2')),
url(r'^emailPremium/',include('emailPremium.urls')),
url(r'^manageservices/',include('manageServices.urls')),
url(r'^plugins/',include('pluginHolder.urls')),

1
filemanager/templates/filemanager/indexv2.html Normal file
View File

@ -0,0 +1 @@
<h1>habbi test</h1>

2
filemanager/urls.py
View File

@ -9,8 +9,6 @@ urlpatterns = [
url(r'^RootDownloadFile$',views.RootDownloadFile, name='RootDownloadFile'),
url(r'^editFile$', views.editFile, name='editFile'),
url('^Filemanager', views.FileManagerRoot, name='Filemanager'),
url('^V2/FilemanagerV2', views.FileManagerRootV2, name='FilemanagerV2'),
url(r'^(?P<domain>(.*))$', views.loadFileManagerHome, name='loadFileManagerHome'),
]

9
filemanager/urlv2.py Normal file
View File

@ -0,0 +1,9 @@
from django.conf.urls import url
from . import views
urlpatterns = [
url(r'^(?P<domain>(.*))$', views.loadFileManagerHomeV2, name='loadFileManagerHomeV2'),
]

65
filemanager/views.py
View File

@ -29,6 +29,23 @@ def loadFileManagerHome(request, domain):
except KeyError:
return redirect(loadLoginPage)
def loadFileManagerHomeV2(request, domain):
try:
userID = request.session['userID']
if Websites.objects.filter(domain=domain).exists():
admin = Administrator.objects.get(pk=userID)
currentACL = ACLManager.loadedACL(userID)
if ACLManager.checkOwnership(domain, admin, currentACL) == 1:
return render(request, 'filemanager/indexv2.html', {'domainName': domain})
else:
return ACLManager.loadError()
else:
return HttpResponse("Domain does not exists.")
except KeyError:
return redirect(loadLoginPage)
def changePermissions(request):
try:
@ -250,55 +267,7 @@ def FileManagerRoot(request):
return proc.render()
def FileManagerRootV2(request):
### Load Custom CSS
try:
from baseTemplate.models import CyberPanelCosmetic
cosmetic = CyberPanelCosmetic.objects.get(pk=1)
except:
from baseTemplate.models import CyberPanelCosmetic
cosmetic = CyberPanelCosmetic()
cosmetic.save()
userID = request.session['userID']
currentACL = ACLManager.loadedACL(userID)
ipFile = "/etc/cyberpanel/machineIP"
f = open(ipFile)
ipData = f.read()
ipAddressLocal = ipData.split('\n', 1)[0]
try:
from plogical.processUtilities import ProcessUtilities
if ProcessUtilities.decideServer() == ProcessUtilities.OLS:
url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission"
data = {
"name": "Filemanager",
"IP": ipAddressLocal
}
import requests
response = requests.post(url, data=json.dumps(data))
Status = response.json()['status']
if (Status == 1):
template = 'baseTemplate/FileManagerV2.html'
else:
return redirect("https://cyberpanel.net/cyberpanel-addons")
else:
template = 'baseTemplate/FileManagerV2.html'
except BaseException as msg:
template = 'baseTemplate/FileManagerV2.html'
if currentACL['admin'] == 1:
pass
else:
return ACLManager.loadErrorJson('FilemanagerAdmin', 0)
from plogical.httpProc import httpProc
proc = httpProc(request, template)
return proc.render()
def downloadFile(request):

2
upgrade.sh
View File

@ -15,4 +15,4 @@ find /usr/local/CyberCP -type f -exec chmod 0644 {} \;
chmod -R 755 /usr/local/CyberCP/bin
chown -R root:root /usr/local/CyberCP
chown -R lscpd:lscpd /usr/local/CyberCP/public/phpmyadmin/tmp
systemctl restart lscpd
systemctl restart lscpd

6
websiteFunctions/static/websiteFunctions/websiteFunctionsV2.js
View File

@ -463,9 +463,9 @@ newapp.controller('websitePagesV2', function ($scope, $http, $timeout, $window)
$scope.hideLogs = true;
};
$scope.fileManagerURLV2 = "/filemanager/" + $("#domainNamePageV2").text();
$scope.wordPressInstallURLV2 = $("#domainNamePageV2").text() + "/wordpressInstallV2";
$scope.joomlaInstallURLV2 = $("#domainNamePageV2").text() + "/joomlaInstallV2";
$scope.fileManagerURLV2 = "/filemanagerv2/" + $("#domainNamePageV2").text() ;
$scope.wordPressInstallURLV2 = $("#domainNamePageV2").text() + "/wordpressInstall";
$scope.joomlaInstallURLV2 = $("#domainNamePageV2").text() + "/joomlaInstall";
$scope.setupGitV2 = $("#domainNamePageV2").text() + "/setupGitV2";
$scope.installPrestaURLV2 = $("#domainNamePageV2").text() + "/installPrestaShopV2";
$scope.installMagentoURLV2 = $("#domainNamePageV2").text() + "/installMagentoV2";

2
websiteFunctions/templates/websiteFunctions/listWebsiteV2.html
View File

@ -73,7 +73,7 @@
<div>
<tr>
<th class="w-32 pt-2">
<a href="/websites/V2/{$ web.domain $}" class="flex items-center ml-3">
<a href="/v2Websites/{$ web.domain $}" class="flex items-center ml-3">
<svg width="20" height="20" viewBox="0 0 30 30" fill="none"
xmlns="http://www.w3.org/2000/svg">
<path

10
websiteFunctions/urls.py
View File

@ -15,11 +15,11 @@ urlpatterns = [
url(r'^siteStateV2$', views.siteStateV2, name='siteStateV2'),
url(r'^createWebsiteV2$', views.createWebsiteV2, name='createWebsiteV2'),
url(r'^listWebsitesV2$', views.listWebsitesV2, name='listWebsitesV2'),
url(r'^V2/(?P<domain>(.*))$', views.domainV2, name='domainv2'),
url(r'^V3/(?P<domain>(.*))/wordpressInstallV2$', views.wordpressInstallV2, name='wordpressInstallV2'),
url(r'^V3/(?P<domain>(.*))/installMauticV2$', views.installMauticV2, name='installMauticV2'),
url(r'^V3/(?P<domain>(.*))/installPrestaShopV2$', views.installPrestaShopV2, name='installPrestaShopV2'),
url(r'^V3/(?P<domain>(.*))/manageGITV2$', views.manageGITV2, name='manageGITV2'),
# url(r'^V2/(?P<domain>(.*))$', views.domainV2, name='domainv2'),
# url(r'^V3/(?P<domain>(.*))/wordpressInstallV2$', views.wordpressInstallV2, name='wordpressInstallV2'),
# url(r'^V3/(?P<domain>(.*))/installMauticV2$', views.installMauticV2, name='installMauticV2'),
# url(r'^V3/(?P<domain>(.*))/installPrestaShopV2$', views.installPrestaShopV2, name='installPrestaShopV2'),
# url(r'^V3/(?P<domain>(.*))/manageGITV2$', views.manageGITV2, name='manageGITV2'),
url(r'^CreateNewDomain$', views.CreateNewDomain, name='CreateNewDomain'),
url(r'^CreateNewDomainV2$', views.CreateNewDomainV2, name='CreateNewDomainV2'),

57
websitesv2/urls.py
View File

@ -1,41 +1,30 @@
from django.conf.urls import url
from . import views
from websiteFunctions import views
urlpatterns = [
url(r'^$', views.loadWebsitesHome, name='loadWebsitesHome'),
url(r'^createWebsite$', views.createWebsite, name='createWebsite'),
url(r'^listWebsites$', views.listWebsites, name='listWebsites'),
url(r'^listChildDomains$', views.listChildDomains, name='listChildDomains'),
url(r'^listChildDomainsV2$', views.listChildDomainsV2, name='listChildDomainsV2'),
url(r'^modifyWebsite$', views.modifyWebsite, name='modifyWebsite'),
url(r'^modifyWebsiteV2$', views.modifyWebsiteV2, name='modifyWebsiteV2'),
url(r'^deleteWebsite$', views.deleteWebsite, name='deleteWebsite'),
url(r'^deleteWebsiteV2$', views.deleteWebsiteV2, name='deleteWebsiteV2'),
url(r'^siteState$', views.siteState, name='siteState'),
url(r'^siteStateV2$', views.siteStateV2, name='siteStateV2'),
url(r'^createWebsiteV2$', views.createWebsiteV2, name='createWebsiteV2'),
url(r'^listWebsitesV2$', views.listWebsitesV2, name='listWebsitesV2'),
url(r'^V2/(?P<domain>(.*))$', views.domainV2, name='domainv2'),
url(r'^V2/(?P<domain>(.*))/wordpressInstallV2$', views.wordpressInstallV2, name='wordpressInstallV2'),
url(r'^CreateNewDomain$', views.CreateNewDomain, name='CreateNewDomain'),
url(r'^CreateNewDomainV2$', views.CreateNewDomainV2, name='CreateNewDomainV2'),
### WordPress
url(r'^createWordpress$', views.WPCreate, name='createWordpress'),
url(r'^createWordpressV2$', views.WPCreateV2, name='createWordpressV2'),
url(r'^ListWPSites$', views.ListWPSites, name='ListWPSites'),
url(r'^ListWPSitesV2$', views.ListWPSitesV2, name='ListWPSitesV2'),
url(r'^WPHome$', views.WPHome, name='WPHome'),
url(r'^WPHomeV2$', views.WPHomeV2, name='WPHomeV2'),
url(r'^RestoreBackups$', views.RestoreBackups, name='RestoreBackups'),
url(r'^RestoreBackupsV2$', views.RestoreBackupsV2, name='RestoreBackupsV2'),
url(r'^RestoreHome$', views.RestoreHome, name='RestoreHome'),
url(r'^AutoLogin$', views.AutoLogin, name='AutoLogin'),
url(r'^RemoteBackupConfig$', views.RemoteBackupConfig, name='RemoteBackupConfig'),
url(r'^BackupfileConfig$', views.BackupfileConfig, name='BackupfileConfig'),
url(r'^AddRemoteBackupsite$', views.AddRemoteBackupsite, name='AddRemoteBackupsite'),
url(r'^pricing$', views.WordpressPricing, name='pricing'),
# url(r'^ListWPSites$', views.ListWPSites, name='ListWPSites'),
# url(r'^ListWPSitesV2$', views.ListWPSitesV2, name='ListWPSitesV2'),
# url(r'^WPHome$', views.WPHome, name='WPHome'),
# url(r'^WPHomeV2$', views.WPHomeV2, name='WPHomeV2'),
# url(r'^RestoreBackups$', views.RestoreBackups, name='RestoreBackups'),
# url(r'^RestoreBackupsV2$', views.RestoreBackupsV2, name='RestoreBackupsV2'),
# url(r'^RestoreHome$', views.RestoreHome, name='RestoreHome'),
# url(r'^AutoLogin$', views.AutoLogin, name='AutoLogin'),
# url(r'^RemoteBackupConfig$', views.RemoteBackupConfig, name='RemoteBackupConfig'),
# url(r'^BackupfileConfig$', views.BackupfileConfig, name='BackupfileConfig'),
# url(r'^AddRemoteBackupsite$', views.AddRemoteBackupsite, name='AddRemoteBackupsite'),
# url(r'^pricing$', views.WordpressPricing, name='pricing'),
###WordPress Ajax
url(r'^submitWorpressCreation', views.submitWorpressCreation, name='submitWorpressCreation'),
@ -137,10 +126,11 @@ urlpatterns = [
## WP Install
url(r'^(?P<domain>(.*))/wordpressInstall$', views.wordpressInstall, name='wordpressInstall'),
url(r'^(?P<domain>(.*))/wordpressInstall$', views.wordpressInstallV2, name='wordpressInstall'),
url(r'^(?P<domain>(.*))/wordpressInstallV2$', views.wordpressInstallV2, name='wordpressInstallV2'),
url(r'^installWordpressStatus$', views.installWordpressStatus, name="installWordpressStatus"),
url(r'^installWordpress$', views.installWordpress, name='installWordpress'),
url(r'^V2/installWordpressV2$', views.installWordpressV2, name='installWordpressV2'),
url(r'^installWordpressV2$', views.installWordpressV2, name='installWordpressV2'),
## Joomla Install
@ -151,7 +141,7 @@ urlpatterns = [
url(r'^prestaShopInstall$', views.prestaShopInstall, name='prestaShopInstall'),
url(r'^(?P<domain>(.*))/installPrestaShop$', views.installPrestaShop, name='installPrestaShop'),
url(r'^V2/(?P<domain>(.*))/installPrestaShopV2$', views.installPrestaShopV2, name='installPrestaShopV2'),
url(r'^(?P<domain>(.*))/installPrestaShopV2$', views.installPrestaShopV2, name='installPrestaShopV2'),
## magento
@ -160,8 +150,8 @@ urlpatterns = [
## mautic
url(r'^(?P<domain>(.*))/installMautic$', views.installMautic, name='installMautic'),
url(r'^V2/(?P<domain>(.*))/installMauticV2$', views.installMauticV2, name='installMauticV2'),
url(r'^(?P<domain>(.*))/installMautic$', views.installMauticV2, name='installMautic'),
url(r'^(?P<domain>(.*))/installMauticV2$', views.installMauticV2, name='installMauticV2'),
url(r'^mauticInstall$', views.mauticInstall, name='mauticInstall'),
## Git
@ -185,8 +175,7 @@ urlpatterns = [
### Manage GIT
url(r'^(?P<domain>(.*))/manageGIT$', views.manageGIT, name='manageGIT'),
url(r'^V2/(?P<domain>(.*))/manageGITV2$', views.manageGITV2, name='manageGITV2'),
url(r'^(?P<domain>(.*))/manageGIT$', views.manageGITV2, name='manageGIT'),
url(r'^(?P<domain>(.*))/webhook$', views.webhook, name='webhook'),
url(r'^fetchFolderDetails$', views.fetchFolderDetails, name='fetchFolderDetails'),
url(r'^initRepo$', views.initRepo, name='initRepo'),
@ -223,6 +212,6 @@ urlpatterns = [
## Catch all for domains
url(r'^(?P<domain>(.*))/(?P<childDomain>(.*))$', views.launchChild, name='launchChild'),
url(r'^(?P<domain>(.*))$', views.domain, name='domain'),
url(r'^(?P<domain>(.*))$', views.domainV2, name='domainv2'),
]