Merge pull request #89 from cyberperspectives/v1.3.4

V1.3.4
cyberperspectives · Jan 17, 2019 · 27bbeec · 27bbeec
2 parents d365c9a + cf5e823
commit 27bbeec
Show file tree

Hide file tree

Showing 7 changed files with 503 additions and 460 deletions.
diff --git a/Database_Baseline.zip b/Database_Baseline.zip
diff --git a/classes/checklist.inc b/classes/checklist.inc
@@ -5,7 +5,7 @@
  * Purpose: Represents a checklist that links a PDI and software package
  * Created: Sep 12, 2013
  *
- * Portions Copyright 2017: Cyber Perspectives, All rights reserved
+ * Portions Copyright 2017-2019: CyberPerspectives, LLC, All rights reserved
  * Released under the Apache v2.0 License
  *
  * Portions Copyright (c) 2012-2015, Salient Federal Solutions
@@ -406,7 +406,7 @@ class checklist
                 case (preg_match("/Dot Net|DotNet/i", $this->name) ? true : false):
                     $this->icon = 'Microsoft .NET.png';
                     break;
-                case (preg_match("/Internet Explorer/i", $this->name) ? true : false):
+                case (preg_match("/Internet Explorer|Microsoft IE/i", $this->name) ? true : false):
                     $this->icon = 'Internet Explorer.png';
                     break;
                 case (preg_match("/Windows Phone/i", $this->name) ? true : false):
@@ -452,7 +452,7 @@ class checklist
                 case (preg_match("/Red ?Hat/i", $this->name) ? true : false):
                     $this->icon = 'RedHat Linux.jpg';
                     break;
-                case (preg_match("/SUSE Linux/i", $this->name) ? true : false):
+                case (preg_match("/SUSE Linux|SLES/i", $this->name) ? true : false):
                     $this->icon = 'SUSE Linux.png';
                     break;
                 case (preg_match("/Solaris/i", $this->name) ? true : false):
@@ -461,6 +461,9 @@ class checklist
                 case (preg_match("/Storage Area/i", $this->name) ? true : false):
                     $this->icon = 'Storage Area Network.gif';
                     break;
+                case (preg_match("/Ubuntu/i", $this->name) ? true : false):
+                    $this->icon = 'Ubuntu.png';
+                    break;
                 case (preg_match("/z\/OS/i", $this->name) ? true : false):
                     $this->icon = 'ZOS.jpg';
                     break;

diff --git a/classes/software.inc b/classes/software.inc
@@ -595,15 +595,15 @@ class software {
 
                   if ($regex2['name_match']) {
                     foreach (explode(",", $regex2['name_match']) as $idx) {
-                      if (isset($match[$idx])) {
+                      if (isset($match[$idx]) && $match[$idx]) {
                         $sw['name'] .= " " . $match[$idx];
                       }
                     }
                   }
 
                   if ($regex2['ver_match']) {
                     foreach (explode(",", $regex2['ver_match']) as $idx) {
-                      if (isset($match[$idx])) {
+                      if (isset($match[$idx]) && $match[$idx]) {
                         $sw['ver'] .= $match[$idx] . " ";
                       }
                     }

diff --git a/config.inc b/config.inc
@@ -16,6 +16,7 @@
  *  - May 24, 2018 - Updated constants for 1.3.2 release
  *  - Jun 2, 2018 - Added new STIG_EXCLUSIONS constant to permanently exclude STIGs
  *  - Aug 28, 2018 - Updated constants for 1.3.3 release
+ *  - Jan 15, 2019 - Updated constants for 1.3.4 release
  */
 // @new
 /**
@@ -31,7 +32,7 @@ define('DOC_ROOT', '{DOC_ROOT}');
 define('PWD_FILE', '{PWD_FILE}');
 define('TMP', '{TMP_PATH}');
 define('VER', '1.3.4');
-define('REL_DATE', '2018-11-30');
+define('REL_DATE', '2019-01-15');
 define('LOG_LEVEL', '{E_ERROR}');
 define('LOG_PATH', '{LOG_PATH}');
 define('SALT', '{SALT}');
@@ -281,6 +282,13 @@ define('PDI_CATALOG', 'PDI_CATALOG');
  */
 define('ECHECKLIST_CSV', 'ECHECKLIST_CSV');
 
+/**
+ * Constant for a CSV host list
+ *
+ * @var string
+ */
+define('HOST_LIST', 'HOST_LIST');
+
 /**
  * Constant for unsupported retina CSV file format
  *