diff --git a/scan.php b/scan.php index 6d001d9..74f3a56 100644 --- a/scan.php +++ b/scan.php @@ -38,6 +38,10 @@ class MalwareScanner ); private $followSymlink = false; + private $patterns_raw = array(); + private $patterns_iraw = array(); + private $patterns_re = array(); + public function __construct() { $options = getopt('he:i:kwxd:lv', array('help', 'extension:', 'ignore:', 'hide-ok', 'hide-whitelist', 'extra-check', 'directory:', 'follow-symlink', 'verbose')); @@ -170,11 +174,14 @@ class MalwareScanner $found = false; $hash = ''; $toSearch = ''; - $patterns = $this->loadPatterns(dirname(__FILE__) . '/patterns_raw.txt'); + $this->patterns_raw = $this->loadPatterns(dirname(__FILE__) . '/patterns_raw.txt'); + $this->patterns_iraw = $this->loadPatterns(dirname(__FILE__) . '/patterns_iraw.txt'); + $this->patterns_re = $this->loadPatterns(dirname(__FILE__) . '/patterns_re.txt'); + if ($this->extraCheck) { - array_push($patterns, "googleBot", "htaccess"); + array_push($this->patterns_raw, "googleBot", "htaccess"); } - foreach ($patterns as $toSearch) { + foreach ($this->patterns_raw as $toSearch) { if (!$toSearch) { continue; } @@ -193,9 +200,8 @@ class MalwareScanner } } - if (!$found) { - $patterns = $this->loadPatterns(dirname(__FILE__) . '/patterns_iraw.txt'); - foreach ($patterns as $toSearch) { + if (!$found || $this->verbose) { + foreach ($this->patterns_iraw as $toSearch) { if (!$toSearch) { continue; } @@ -215,9 +221,8 @@ class MalwareScanner } } - if (!$found) { - $patterns = $this->loadPatterns(dirname(__FILE__) . '/patterns_re.txt'); - foreach ($patterns as $toSearch) { + if (!$found || $this->verbose) { + foreach ($this->patterns_re as $toSearch) { if (!$toSearch) { continue; }