From 09319907350e3e984a771d239acfcef08cf2d8a1 Mon Sep 17 00:00:00 2001
From: Jeff Odegard <42775175+JeffOdegard@users.noreply.github.com>
Date: Wed, 19 Sep 2018 10:52:17 -0600
Subject: [PATCH 1/3] Delete Unnecessary XAMPP htdocs folder on install

---
 install.bat | 4 ++++
 1 file changed, 4 insertions(+)

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

From 85bf003d01403ac74919744344b61f81143a5975 Mon Sep 17 00:00:00 2001
From: Jeff Odegard <42775175+JeffOdegard@users.noreply.github.com>
Date: Wed, 19 Sep 2018 10:56:45 -0600
Subject: [PATCH 2/3] Distinguished App Server STIG from App Development

---
 classes/checklist.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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';

From 18cac3afa589f195873c00e856f5eac4485bb4d9 Mon Sep 17 00:00:00 2001
From: Jeff Odegard <42775175+JeffOdegard@users.noreply.github.com>
Date: Wed, 19 Sep 2018 10:57:32 -0600
Subject: [PATCH 3/3] Add icon for application server

---
 img/checklist_icons/Application Server.jpg | Bin 0 -> 5456 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 img/checklist_icons/Application Server.jpg

diff --git a/img/checklist_icons/Application Server.jpg b/img/checklist_icons/Application Server.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1b8e086cbafa4e5220f29e86641ca1473c6644ec
GIT binary patch
literal 5456
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

literal 0
HcmV?d00001