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: add csf gui

Browse Source
This commit is contained in:
usmannasir
2024-10-07 18:11:17 +05:00
parent d6b777e62e
commit d5975f779c
2 changed files with 5 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firewall/firewallManager.py
View File

@@ -43,7 +43,7 @@ class FirewallManager:
csfPath = '/etc/csf' csfPath = '/etc/csf'
if os.path.exists(csfPath): if os.path.exists(csfPath):
return redirect('/firewall/csf') return redirect('/configservercsf/')
else: else:
proc = httpProc(request, 'firewall/firewall.html', proc = httpProc(request, 'firewall/firewall.html',
None, 'admin') None, 'admin')

45
plogical/csf.py
View File

@@ -680,14 +680,14 @@ if ! cat /usr/local/CyberCP/CyberCP/settings.py | grep -q configservercsf; then
sed -i "/pluginHolder/ i \ \ \ \ 'configservercsf'," /usr/local/CyberCP/CyberCP/settings.py sed -i "/pluginHolder/ i \ \ \ \ 'configservercsf'," /usr/local/CyberCP/CyberCP/settings.py
fi fi
if ! cat /usr/local/CyberCP/CyberCP/urls.py | grep -q configservercsf; then if ! cat /usr/local/CyberCP/CyberCP/urls.py | grep -q configservercsf; then
sed -i "/pluginHolder/ i \ \ \ \ path(r'configservercsf/',include('configservercsf.urls'))," /usr/local/CyberCP/CyberCP/urls.py sed -i "/pluginHolder/ i \ \ \ \ path('configservercsf/',include('configservercsf.urls'))," /usr/local/CyberCP/CyberCP/urls.py
fi fi
#if ! cat /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html | grep -q configservercsf; then #if ! cat /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html | grep -q configservercsf; then
# sed -i "/url 'csf'/ i <li><a href='/configservercsf/' title='ConfigServer Security and Firewall'><span>ConfigServer Security \&amp; Firewall</span></a></li>" /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html # sed -i "/url 'csf'/ i <li><a href='/configservercsf/' title='ConfigServer Security and Firewall'><span>ConfigServer Security \&amp; Firewall</span></a></li>" /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html
#fi #fi
if ! cat /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html | grep -q configserver; then #if ! cat /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html | grep -q configserver; then
sed -i "/trans 'Plugins'/ i \{\% include \"/usr/local/CyberCP/configservercsf/templates/configservercsf/menu.html\" \%\}" /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html # sed -i "/trans 'Plugins'/ i \{\% include \"/usr/local/CyberCP/configservercsf/templates/configservercsf/menu.html\" \%\}" /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html
fi #fi
service lscpd restart service lscpd restart
@@ -1009,43 +1009,6 @@ echo
except: except:
pass pass
# sed_commands = [
# 'sed -i "s/url(r\'^configservercsf/path(\'configservercsf/g" /usr/local/CyberCP/CyberCP/urls.py',
# 'sed -i "s/from django.conf.urls import url/from django.urls import path/g" /usr/local/CyberCP/configservercsf/urls.py',
# 'sed -i "s/import signals/import configservercsf.signals/g" /usr/local/CyberCP/configservercsf/apps.py',
# 'sed -i "s/url(r\'^$\'/path(\'\'/g" /usr/local/CyberCP/configservercsf/urls.py',
# 'sed -i "s|url(r\'^iframe/$\'|path(\'iframe/\'|g" /usr/local/CyberCP/configservercsf/urls.py',
# # 'sed -i -E "s/from.*, response/from plogical.httpProc import httpProc/g" /usr/local/CyberCP/configservercsf/views.py'
# # '''sed -i -E "s#^(\s*)return render.*index\.html.*#\1proc = httpProc(request, 'configservercsf/index.html', None, 'admin')\n\1return proc.render()#g" /usr/local/CyberCP/configservercsf/views.py'''
# 'killall lswsgi'
# ]
#
# for cmd in sed_commands:
# ProcessUtilities.executioner(cmd)
# command = 'rm -Rfv /usr/local/CyberCP/configservercsf'
# ProcessUtilities.normalExecutioner(command)
#
# command = 'rm -fv /home/cyberpanel/plugins/configservercsf'
# ProcessUtilities.normalExecutioner(command)
#
# command = 'rm -Rfv /usr/local/CyberCP/public/static/configservercsf'
# ProcessUtilities.normalExecutioner(command)
#
# command = 'sed -i "/configservercsf/d" /usr/local/CyberCP/CyberCP/settings.py'
# ProcessUtilities.normalExecutioner(command)
#
# command = 'sed -i "/configservercsf/d" /usr/local/CyberCP/CyberCP/urls.py'
# ProcessUtilities.normalExecutioner(command)
#
# if not os.path.exists('/etc/cxs/cxs.pl'):
#
# command = 'sed -i "/configserver/d" /usr/local/CyberCP/baseTemplate/templates/baseTemplate/index.html'
# ProcessUtilities.normalExecutioner(command)
#
# command = 'killall lswsgi'
# ProcessUtilities.normalExecutioner(command)
return 1 return 1
except BaseException as msg: except BaseException as msg:
try: try: