From 77175396ba01f357dffd86366c4dd9fc2f4fda1b Mon Sep 17 00:00:00 2001
From: spyngamerman <1596188+spyngamerman@users.noreply.github.com>
Date: Wed, 23 Oct 2019 08:31:25 -0400
Subject: [PATCH] Update csf.py

Update packages required and disable the UI workaround since CSF now natively supports cyberpanel as a plugin.
https://download2.configserver.com/csf/changelog.txt
13.08 - Added official CyberPanel integration and CyberPanel panel specific
        configuration (only tested on CentOS v7)
---
 plogical/csf.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/plogical/csf.py b/plogical/csf.py
index c15feb4bf..b13a0d3e8 100755
--- a/plogical/csf.py
+++ b/plogical/csf.py
@@ -73,10 +73,10 @@ class CSF(multi.Thread):
 
             # install required packages for CSF perl and /usr/bin/host
             if ProcessUtilities.decideDistro() == ProcessUtilities.centos:
-                command = 'yum install bind-utils perl-libwww-perl net-tools perl-LWP-Protocol-https -y'
+                command = 'yum install bind-utils net-tools perl-libwww-perl.noarch perl-LWP-Protocol-https.noarch perl-GDGraph -y'
                 ProcessUtilities.normalExecutioner(command)
             elif ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
-                command = 'apt-get install dnsutils libwww-perl net-tools -y'
+                command = 'apt-get install dnsutils libwww-perl liblwp-protocol-https-perl libgd-graph-perl net-tools -y'
                 ProcessUtilities.normalExecutioner(command)
 		command = 'ln -s /bin/systemctl /usr/bin/systemctl'
             	ProcessUtilities.normalExecutioner(command)
@@ -284,16 +284,16 @@ class CSF(multi.Thread):
                     writeToConf.writelines('HTACCESS_LOG = "/usr/local/lsws/logs/error.log"\n')
 
 		#  CSF UI enable
-                elif items.find('UI = "0"') > -1 and items.find('=') > -1 and (items[0] != '#'):
-                    writeToConf.writelines('UI = "1"\n')
-                elif items.find('UI_ALLOW') > -1 and items.find('=') > -1 and (items[0] != '#'):
-                    writeToConf.writelines('UI_ALLOW = "0"\n')
-                elif items.find('UI_PORT =') > -1 and items.find('=') > -1 and (items[0] != '#'):
-                    writeToConf.writelines('UI_PORT = "1025"\n')
-                elif items.find('UI_USER') > -1 and items.find('=') > -1 and (items[0] != '#'):
-                    writeToConf.writelines('UI_USER = "cyberpanel"\n')
-                elif items.find('UI_PASS') > -1 and items.find('=') > -1 and (items[0] != '#'):
-                    writeToConf.writelines('UI_PASS = "csfadmin1234567"\n')
+                #elif items.find('UI = "0"') > -1 and items.find('=') > -1 and (items[0] != '#'):
+                #    writeToConf.writelines('UI = "1"\n')
+                #elif items.find('UI_ALLOW') > -1 and items.find('=') > -1 and (items[0] != '#'):
+                #    writeToConf.writelines('UI_ALLOW = "0"\n')
+                #elif items.find('UI_PORT =') > -1 and items.find('=') > -1 and (items[0] != '#'):
+                #    writeToConf.writelines('UI_PORT = "1025"\n')
+                #elif items.find('UI_USER') > -1 and items.find('=') > -1 and (items[0] != '#'):
+                #    writeToConf.writelines('UI_USER = "cyberpanel"\n')
+                #elif items.find('UI_PASS') > -1 and items.find('=') > -1 and (items[0] != '#'):
+                #    writeToConf.writelines('UI_PASS = "csfadmin1234567"\n')
                 else:
                     writeToConf.writelines(items)