From 4884d5aad7198e7f54ca7fbf2c75cc56189a0eac Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 24 Sep 2010 09:43:02 -0400 Subject: Make snort respect $g['theme']. Submitted-By: garga --- config/snort/snort_barnyard.php | 6 ++++-- config/snort/snort_define_servers.php | 6 ++++-- config/snort/snort_download_updates.php | 4 +++- config/snort/snort_interfaces.php | 4 +++- config/snort/snort_interfaces_edit.php | 3 ++- config/snort/snort_interfaces_global.php | 4 +++- config/snort/snort_preprocessors.php | 6 ++++-- config/snort/snort_rules.php | 4 +++- config/snort/snort_rulesets.php | 3 ++- 9 files changed, 28 insertions(+), 12 deletions(-) diff --git a/config/snort/snort_barnyard.php b/config/snort/snort_barnyard.php index 33be4268..fce96fb6 100644 --- a/config/snort/snort_barnyard.php +++ b/config/snort/snort_barnyard.php @@ -42,6 +42,8 @@ require_once("guiconfig.inc"); require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); +global $g; + if (!is_array($config['installedpackages']['snortglobal']['rule'])) { $config['installedpackages']['snortglobal']['rule'] = array(); } @@ -292,7 +294,7 @@ echo "{$snort_general_css}\n"; @@ -390,7 +392,7 @@ echo " padding: 15px 10px 85% 50px; } -
You can not edit options without an interface ID.
\n"; +
You can not edit options without an interface ID.
\n"; } ?> diff --git a/config/snort/snort_define_servers.php b/config/snort/snort_define_servers.php index 2b3ade1a..10af8d46 100644 --- a/config/snort/snort_define_servers.php +++ b/config/snort/snort_define_servers.php @@ -43,6 +43,8 @@ require_once("guiconfig.inc"); require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); +global $g; + if (!is_array($config['installedpackages']['snortglobal']['rule'])) { $config['installedpackages']['snortglobal']['rule'] = array(); } @@ -286,7 +288,7 @@ echo "{$snort_general_css}\n"; @@ -363,7 +365,7 @@ enable JavaScript to view this content padding: 15px 10px 85% 50px; } -
You can not edit options without an interface ID.
\n"; +
You can not edit options without an interface ID.
\n"; } ?> diff --git a/config/snort/snort_download_updates.php b/config/snort/snort_download_updates.php index 7441a442..f87f7739 100644 --- a/config/snort/snort_download_updates.php +++ b/config/snort/snort_download_updates.php @@ -36,6 +36,8 @@ require_once("guiconfig.inc"); require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); +global $g; + /* load only javascript that is needed */ $snort_load_jquery = 'yes'; $snort_load_jquery_colorbox = 'yes'; @@ -136,7 +138,7 @@ echo "$snort_interfaces_css\n"; diff --git a/config/snort/snort_interfaces.php b/config/snort/snort_interfaces.php index e917b9da..61254842 100644 --- a/config/snort/snort_interfaces.php +++ b/config/snort/snort_interfaces.php @@ -35,6 +35,8 @@ require_once("guiconfig.inc"); require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); +global $g; + $id = $_GET['id']; if (isset($_POST['id'])) $id = $_POST['id']; @@ -270,7 +272,7 @@ echo "$snort_interfaces_css\n"; diff --git a/config/snort/snort_interfaces_edit.php b/config/snort/snort_interfaces_edit.php index 3d58ac17..5ad05276 100644 --- a/config/snort/snort_interfaces_edit.php +++ b/config/snort/snort_interfaces_edit.php @@ -34,6 +34,7 @@ require_once("guiconfig.inc"); require_once("/usr/local/pkg/snort/snort_gui.inc"); require_once("/usr/local/pkg/snort/snort.inc"); +global $g; if (!is_array($config['installedpackages']['snortglobal']['rule'])) { $config['installedpackages']['snortglobal']['rule'] = array(); @@ -403,7 +404,7 @@ if (isset($_GET['dup'])) {