diff --git a/aiScanner/templates/aiScanner/scanner.html b/aiScanner/templates/aiScanner/scanner.html index 3a9289277..7a98eb6d6 100644 --- a/aiScanner/templates/aiScanner/scanner.html +++ b/aiScanner/templates/aiScanner/scanner.html @@ -45,7 +45,6 @@ AI Security Scanner - CyberPanel
Current Pricing:
diff --git a/plogical/upgrade.py b/plogical/upgrade.py index ab5a14f2d..eaec699d6 100644 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -3737,24 +3737,24 @@ pm.max_spare_servers = 3 - # if os.path.exists('/usr/local/CyberCP/configservercsf'): - # command = 'rm -f /usr/local/CyberCP/configservercsf/signals.py' - # Upgrade.executioner(command, 'remove /usr/local/CyberCP/configservercsf/signals.py', 1) - # - # - # 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: - # Upgrade.executioner(cmd, 'fix csf if there', 1) + if os.path.exists('/usr/local/CyberCP/configservercsf'): + command = 'rm -f /usr/local/CyberCP/configservercsf/signals.py' + Upgrade.executioner(command, 'remove /usr/local/CyberCP/configservercsf/signals.py', 1) + + 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/from . import 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', + 'find /usr/local/CyberCP -name "*.pyc" -delete', + 'find /usr/local/CyberCP -name "__pycache__" -type d -exec rm -rf {} + 2>/dev/null || true', + 'killall lswsgi' + ] + + for cmd in sed_commands: + Upgrade.executioner(cmd, 'fix csf if there', 1)