diff --git a/classes/checklist.inc b/classes/checklist.inc index 1a4cf14..28a550d 100644 --- a/classes/checklist.inc +++ b/classes/checklist.inc @@ -312,8 +312,11 @@ class checklist case (preg_match("/AIX/i", $this->name) ? true : false): $this->icon = 'AIX.png'; break; - case (preg_match("/Application Security|Application Server|Application Layer Gateway/i", $this->name) ? true : false): + case (preg_match("/Application Security|Application Layer Gateway/i", $this->name) ? true : false): $this->icon = 'Application Development.gif'; + break; + case (preg_match("/Application Server/i", $this->name) ? true : false): + $this->icon = 'Application Server.jpg'; break; case (preg_match("/Active Directory/i", $this->name) ? true : false): $this->icon = 'Active Directory.png'; diff --git a/img/checklist_icons/Application Server.jpg b/img/checklist_icons/Application Server.jpg new file mode 100644 index 0000000..1b8e086 Binary files /dev/null and b/img/checklist_icons/Application Server.jpg differ diff --git a/install.bat b/install.bat index 8fa5a56..b8c69ec 100644 --- a/install.bat +++ b/install.bat @@ -27,6 +27,7 @@ REM - Jan 30, 2017 - Fixed error with copy of config-xampp-win.xml to config.xml where it required full path REM - Apr 5, 2017 - Added mkdir for \xampp\php\logs directory (not included when installed) REM - Jun 27, 2017 - Removed copy cgi-bin contents + REM - Sep 19, 2018 - Deleting unnecessary C:\xampp\htdocs folder. mkdir c:\xampp\php\logs @@ -48,6 +49,9 @@ copy c:\xampp\www\conf\httpd-xampp.conf c:\xampp\apache\conf\extra rename c:\xampp\php\php.ini php.ini.old copy c:\xampp\www\conf\php.ini c:\xampp\php +echo Deleting unnecessary C:\xampp\htdocs folder. +del /F /S /Q c:\xampp\htdocs + @echo Installing Apache service c:\xampp\apache\bin\httpd -k install net start apache2.4