aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2014-12-28 16:28:58 -0500
committerbmeeks8 <bmeeks8@bellsouth.net>2014-12-28 16:28:58 -0500
commit017da7aa775c01bd5530849ac0885d82976238eb (patch)
tree86b670942da522d3805aabcb436c3d5c23b1c63f
parentc7b2fcd5a689cec5cd151556f37eabadb0cb286d (diff)
downloadpfsense-packages-017da7aa775c01bd5530849ac0885d82976238eb.tar.gz
pfsense-packages-017da7aa775c01bd5530849ac0885d82976238eb.tar.bz2
pfsense-packages-017da7aa775c01bd5530849ac0885d82976238eb.zip
Define URL variable as local instead of global.
-rw-r--r--config/suricata/suricata_etiqrisk_update.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/config/suricata/suricata_etiqrisk_update.php b/config/suricata/suricata_etiqrisk_update.php
index 17d264e3..70fbdb79 100644
--- a/config/suricata/suricata_etiqrisk_update.php
+++ b/config/suricata/suricata_etiqrisk_update.php
@@ -41,6 +41,7 @@
require_once("config.inc");
require_once("functions.inc");
require_once("/usr/local/pkg/suricata/suricata.inc");
+require("/usr/local/pkg/suricata/suricata_defs.inc");
/*************************************************************************
* Hack for backwards compatibility with older 2.1.x pfSense versions *
@@ -101,8 +102,9 @@ function suricata_check_iprep_md5($filename) {
/* error occurred. */
/**********************************************************/
- global $et_iqrisk_url, $iqRisk_tmppath, $iprep_path;
+ global $iqRisk_tmppath, $iprep_path;
$new_md5 = $old_md5 = "";
+ $et_iqrisk_url = str_replace("_xxx_", $config['installedpackages']['suricata']['config'][0]['iqrisk_code'], ET_IQRISK_DNLD_URL);
if (download_file("{$et_iqrisk_url}{$filename}.md5sum", "{$iqRisk_tmppath}{$filename}.md5") == true) {
if (file_exists("{$iqRisk_tmppath}{$filename}.md5"))
@@ -115,7 +117,7 @@ function suricata_check_iprep_md5($filename) {
log_error(gettext("[Suricata] IPREP file '{$filename}' is up to date."));
}
else
- log_error(gettext("[Suricata] An error occurred downloading {$filename}.md5sum for IPREP. Update of {$filename} file will be skipped."));
+ log_error(gettext("[Suricata] An error occurred downloading {$et_iqrisk_url}{$filename}.md5sum for IPREP. Update of {$filename} file will be skipped."));
return FALSE;
}
@@ -128,6 +130,9 @@ $iprep_path = SURICATA_IPREP_PATH;
$iqRisk_tmppath = "{$g['tmp_path']}/IQRisk/";
$success = FALSE;
+if (!is_array($config['installedpackages']['suricata']['config'][0]))
+ $config['installedpackages']['suricata']['config'][0] = array();
+
// If auto-updates of ET IQRisk are disabled, then exit
if ($config['installedpackages']['suricata']['config'][0]['et_iqrisk_enable'] == "off")
return(0);