4040# First replace:
4141if [ -e " /usr/local/cpanel/3rdparty/bin/perl" ]; then
4242 sed -i ' s%^#\!/usr/bin/perl%#\!/usr/local/cpanel/3rdparty/bin/perl%' auto.pl
43- sed -i ' s%^#\!/usr/bin/perl%#\!/usr/local/cpanel/3rdparty/bin/perl%' cpanel/csf.cgi
43+ sed -i ' s%^#\!/usr/bin/perl%#\!/usr/local/cpanel/3rdparty/bin/perl%' panels/ cpanel/csf.cgi
4444 sed -i ' s%^#\!/usr/bin/perl%#\!/usr/local/cpanel/3rdparty/bin/perl%' csf.pl
4545 sed -i ' s%^#\!/usr/bin/perl%#\!/usr/local/cpanel/3rdparty/bin/perl%' csftest.pl
4646 sed -i ' s%^#\!/usr/bin/perl%#\!/usr/local/cpanel/3rdparty/bin/perl%' lfd.pl
@@ -439,25 +439,25 @@ chmod 700 /usr/local/cpanel/whostmgr/docroot/cgi/configserver
439439mkdir /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf
440440chmod 700 /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf
441441
442- cp -avf cpanel/csf.cgi /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf.cgi
442+ cp -avf panels/ cpanel/csf.cgi /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf.cgi
443443chmod -v 700 /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf.cgi
444444
445445cp -avf csf/ /usr/local/cpanel/whostmgr/docroot/cgi/configserver/
446- cp -avf cpanel/Driver /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf/
446+ cp -avf panels/ cpanel/Driver /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf/
447447cp -avf ui/images/icon.gif /usr/local/cpanel/whostmgr/docroot/themes/x/icons/csf.gif
448- cp -avf cpanel/csf.tmpl /usr/local/cpanel/whostmgr/docroot/templates/
448+ cp -avf panels/ cpanel/csf.tmpl /usr/local/cpanel/whostmgr/docroot/templates/
449449
450450VERSION=` cat /usr/local/cpanel/version | cut -d ' .' -f2`
451451if [ " $VERSION " -lt " 65" ]; then
452- sed -i " s/^target=.*$/target=mainFrame/" cpanel/csf.conf
452+ sed -i " s/^target=.*$/target=mainFrame/" panels/ cpanel/csf.conf
453453 echo " cPanel v$VERSION , target set to mainFrame"
454454else
455- sed -i " s/^target=.*$/target=_self/" cpanel/csf.conf
455+ sed -i " s/^target=.*$/target=_self/" panels/ cpanel/csf.conf
456456 echo " cPanel v$VERSION , target set to _self"
457457fi
458458
459- cp -avf cpanel/csf.conf /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf/csf.conf
460- cp -avf cpanel/upgrade.sh /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf/upgrade.sh
459+ cp -avf panels/ cpanel/csf.conf /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf/csf.conf
460+ cp -avf panels/ cpanel/upgrade.sh /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf/upgrade.sh
461461chmod 700 /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf/upgrade.sh
462462
463463if [ -e " /usr/local/cpanel/bin/register_appconfig" ]; then
@@ -468,14 +468,14 @@ if [ -e "/usr/local/cpanel/bin/register_appconfig" ]; then
468468 /bin/rm -f /usr/local/cpanel/whostmgr/docroot/cgi/addon_csf.cgi
469469 /bin/rm -Rf /usr/local/cpanel/whostmgr/docroot/cgi/csf
470470else
471- cp -avf cpanel/csf.cgi /usr/local/cpanel/whostmgr/docroot/cgi/addon_csf.cgi
471+ cp -avf panels/ cpanel/csf.cgi /usr/local/cpanel/whostmgr/docroot/cgi/addon_csf.cgi
472472 chmod -v 700 /usr/local/cpanel/whostmgr/docroot/cgi/addon_csf.cgi
473473 cp -avf csf/ /usr/local/cpanel/whostmgr/docroot/cgi/
474474 if [ ! -d " /var/cpanel/apps" ]; then
475475 mkdir /var/cpanel/apps
476476 chmod 755 /var/cpanel/apps
477477 fi
478- /bin/cp -avf cpanel/csf.conf.old /var/cpanel/apps/csf.conf
478+ /bin/cp -avf panels/ cpanel/csf.conf.old /var/cpanel/apps/csf.conf
479479 chmod 600 /var/cpanel/apps/csf.conf
480480fi
481481
559559# Second replace
560560if [ -e " /usr/local/cpanel/3rdparty/bin/perl" ]; then
561561 sed -i ' s%^#\!/usr/local/cpanel/3rdparty/bin/perl%#\!/usr/bin/perl%' auto.pl
562- sed -i ' s%^#\!/usr/local/cpanel/3rdparty/bin/perl%#\!/usr/bin/perl%' cpanel/csf.cgi
562+ sed -i ' s%^#\!/usr/local/cpanel/3rdparty/bin/perl%#\!/usr/bin/perl%' panels/ cpanel/csf.cgi
563563 sed -i ' s%^#\!/usr/local/cpanel/3rdparty/bin/perl%#\!/usr/bin/perl%' csf.pl
564564 sed -i ' s%^#\!/usr/local/cpanel/3rdparty/bin/perl%#\!/usr/bin/perl%' csftest.pl
565565 sed -i ' s%^#\!/usr/local/cpanel/3rdparty/bin/perl%#\!/usr/bin/perl%' lfd.pl
0 commit comments