diff options
| author | jim-p <jimp@pfsense.org> | 2012-07-09 12:57:00 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-07-09 12:57:00 -0400 |
| commit | 958efd439784459a5848fb05afe1560c4db285d7 (patch) | |
| tree | 1e836cb827156bba4cc12ad37fc21294f138e7f8 /config/snort/snort_download_updates.php | |
| parent | 4e8dd82f957006899f1babb2e521b8fd3cdcd2ce (diff) | |
| download | pfsense-packages-958efd439784459a5848fb05afe1560c4db285d7.tar.gz pfsense-packages-958efd439784459a5848fb05afe1560c4db285d7.tar.bz2 pfsense-packages-958efd439784459a5848fb05afe1560c4db285d7.zip | |
globals for these do not work properly at bootup. Might be causing unintended overwrites/deletions. Revert "s//usr/local/etc/snort/snortdir/ to unify its reference and location. Trim some unused functions in the way"
This reverts commit 40cace16a452cd841a6b3626c44ff0d0b655956f.
Diffstat (limited to 'config/snort/snort_download_updates.php')
| -rw-r--r-- | config/snort/snort_download_updates.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/config/snort/snort_download_updates.php b/config/snort/snort_download_updates.php index f2e521c0..b96b2cae 100644 --- a/config/snort/snort_download_updates.php +++ b/config/snort/snort_download_updates.php @@ -36,7 +36,7 @@ require_once("guiconfig.inc"); require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); -global $g, $snortdir; +global $g; /* load only javascript that is needed */ $snort_load_jquery = 'yes'; @@ -46,16 +46,16 @@ $emergingthreats = $config['installedpackages']['snortglobal']['emergingthreats' /* quick md5s chk */ $snort_org_sig_chk_local = 'N/A'; -if (file_exists("{$snortdir}/{$snort_rules_file}.md5")) - $snort_org_sig_chk_local = file_get_contents("{$snortdir}/{$snort_rules_file}.md5"); +if (file_exists("/usr/local/etc/snort/{$snort_rules_file}.md5")) + $snort_org_sig_chk_local = file_get_contents("/usr/local/etc/snort/{$snort_rules_file}.md5"); $emergingt_net_sig_chk_local = 'N/A'; -if (file_exists("{$snortdir}/emerging.rules.tar.gz.md5")) - $emergingt_net_sig_chk_local = file_get_contents("{$snortdir}/emerging.rules.tar.gz.md5"); +if (file_exists('/usr/local/etc/snort/emerging.rules.tar.gz.md5')) + $emergingt_net_sig_chk_local = file_get_contents("/usr/local/etc/snort/emerging.rules.tar.gz.md5"); /* check for logfile */ $update_logfile_chk = 'no'; -if (file_exists("{$snortdir}/snort_update.log")) +if (file_exists('/usr/local/etc/snort/snort_update.log')) $update_logfile_chk = 'yes'; $pgtitle = "Services: Snort: Updates"; @@ -154,11 +154,11 @@ include_once("head.inc"); <?php if ($update_logfile_chk == 'yes') { - echo " - <button class='sexybutton sexysimple example9' href='/snort/snort_rules_edit.php?openruleset={$snortdir}/snort_update.log'><span class='pwhitetxt'>Update Log </span></button>\n"; + echo ' + <button class="sexybutton sexysimple example9" href="/snort/snort_rules_edit.php?openruleset=/usr/local/etc/snort/snort_update.log"><span class="pwhitetxt">Update Log </span></button>' . "\n"; }else{ - echo " - <button class='sexybutton disabled' disabled='disabled' href='/snort/snort_rules_edit.php?openruleset={$snortdir}/snort_update.log'><span class='pwhitetxt'>Update Log </span></button>\n"; + echo ' + <button class="sexybutton disabled" disabled="disabled" href="/snort/snort_rules_edit.php?openruleset=/usr/local/etc/snort/snort_update.log"><span class="pwhitetxt">Update Log </span></button>' . "\n"; } ?> |