From 1909eb078175d5920faa5dcf76479a986a38a057 Mon Sep 17 00:00:00 2001 From: nichogenius Date: Wed, 16 Aug 2017 01:39:44 -0600 Subject: [PATCH] Pattern Loading Moved To Constructor It makes more sense to put the one time pattern load code into the constructor rather than the scan method. --- scan.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scan.php b/scan.php index 74f3a56..d54dbc4 100644 --- a/scan.php +++ b/scan.php @@ -44,7 +44,11 @@ class MalwareScanner public function __construct() { - $options = getopt('he:i:kwxd:lv', array('help', 'extension:', 'ignore:', 'hide-ok', 'hide-whitelist', 'extra-check', 'directory:', 'follow-symlink', 'verbose')); + $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'); + + $options = getopt('he:i:kwxd:lv', array('help', 'extension:', 'ignore:', 'hide-ok', 'hide-whitelist', 'extra-check', 'directory:', 'follow-symlink', 'verbose')); if (isset($options['help']) || isset($options['h'])) { $this->showHelp(); exit; @@ -174,9 +178,6 @@ class MalwareScanner $found = false; $hash = ''; $toSearch = ''; - $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($this->patterns_raw, "googleBot", "htaccess");