aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJim P <jim@pingle.org>2013-04-24 15:42:08 -0700
committerJim P <jim@pingle.org>2013-04-24 15:42:08 -0700
commit64671ccfc12ac87839540de3cb011d7cfcf03401 (patch)
tree306ec0da429aebc3d2bd5599dc3f303a8bab1d94 /config
parentb38188a3a7a3eeef3d9614c82dd91db7d3a3af5a (diff)
parent4bec483970c9e3af3dcdd3fa952e701945dba792 (diff)
downloadpfsense-packages-64671ccfc12ac87839540de3cb011d7cfcf03401.tar.gz
pfsense-packages-64671ccfc12ac87839540de3cb011d7cfcf03401.tar.bz2
pfsense-packages-64671ccfc12ac87839540de3cb011d7cfcf03401.zip
Merge pull request #432 from bmeeks8/master
Fix bad include reference in Snort Widget -- caused pkg start crash with Snort
Diffstat (limited to 'config')
-rw-r--r--config/widget-snort/widget-snort.inc6
-rw-r--r--config/widget-snort/widget-snort.xml16
2 files changed, 16 insertions, 6 deletions
diff --git a/config/widget-snort/widget-snort.inc b/config/widget-snort/widget-snort.inc
index b33059e4..105dd1e7 100644
--- a/config/widget-snort/widget-snort.inc
+++ b/config/widget-snort/widget-snort.inc
@@ -1,8 +1,5 @@
<?php
-
-require_once("guiconfig.inc");
require_once("config.inc");
-
function widget_snort_uninstall() {
global $config;
@@ -19,10 +16,9 @@ function widget_snort_uninstall() {
write_config();
}
- /* Remove our associated file */
+ /* Remove our associated files */
unlink("/usr/local/www/widgets/include/widget-snort.inc");
unlink("/usr/local/www/widgets/widgets/snort_alerts.widget.php");
unlink("/usr/local/www/widgets/javascript/snort_alerts.js");
}
-
?>
diff --git a/config/widget-snort/widget-snort.xml b/config/widget-snort/widget-snort.xml
index ef89c1bb..b415bd12 100644
--- a/config/widget-snort/widget-snort.xml
+++ b/config/widget-snort/widget-snort.xml
@@ -46,9 +46,15 @@
<requirements>Dashboard package and Snort</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>widget-snort</name>
- <version>0.3.3</version>
+ <version>0.3.4</version>
<title>Widget - Snort</title>
<include_file>/usr/local/www/widgets/include/widget-snort.inc</include_file>
+ <menu>
+ </menu>
+ <service>
+ </service>
+ <tabs>
+ </tabs>
<additional_files_needed>
<prefix>/usr/local/www/widgets/javascript/</prefix>
<chmod>0644</chmod>
@@ -64,6 +70,14 @@
<chmod>0644</chmod>
<item>http://www.pfsense.com/packages/config/widget-snort/widget-snort.inc</item>
</additional_files_needed>
+ <fields>
+ </fields>
+ <custom_add_php_command>
+ </custom_add_php_command>
+ <custom_php_resync_config_command>
+ </custom_php_resync_config_command>
+ <custom_php_install_command>
+ </custom_php_install_command>
<custom_php_deinstall_command>
widget_snort_uninstall();
</custom_php_deinstall_command>