aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-09-24 09:43:02 -0400
committerjim-p <jimp@pfsense.org>2010-09-24 09:43:02 -0400
commit4884d5aad7198e7f54ca7fbf2c75cc56189a0eac (patch)
tree31a4c58e702db073fb6e4239615d86c122ae6ed4 /config
parentdb0ddbab80d8fe9c99c8529124a9df143a3c31cc (diff)
downloadpfsense-packages-4884d5aad7198e7f54ca7fbf2c75cc56189a0eac.tar.gz
pfsense-packages-4884d5aad7198e7f54ca7fbf2c75cc56189a0eac.tar.bz2
pfsense-packages-4884d5aad7198e7f54ca7fbf2c75cc56189a0eac.zip
Make snort respect $g['theme']. Submitted-By: garga
Diffstat (limited to 'config')
-rw-r--r--config/snort/snort_barnyard.php6
-rw-r--r--config/snort/snort_define_servers.php6
-rw-r--r--config/snort/snort_download_updates.php4
-rw-r--r--config/snort/snort_interfaces.php4
-rw-r--r--config/snort/snort_interfaces_edit.php3
-rw-r--r--config/snort/snort_interfaces_global.php4
-rw-r--r--config/snort/snort_preprocessors.php6
-rw-r--r--config/snort/snort_rules.php4
-rw-r--r--config/snort/snort_rulesets.php3
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";
<noscript>
<div class="alert" ALIGN=CENTER><img
- src="../themes/nervecenter/images/icons/icon_alert.gif" /><strong>Please
+ src="../themes/<?php echo $g['theme']; ?>/images/icons/icon_alert.gif" /><strong>Please
enable JavaScript to view this content
</CENTER></div>
</noscript>
@@ -390,7 +392,7 @@ echo "
padding: 15px 10px 85% 50px;
}
</style>
- <div class=\"alert\" ALIGN=CENTER><img src=\"/themes/nervecenter/images/icons/icon_alert.gif\"/><strong>You can not edit options without an interface ID.</CENTER></div>\n";
+ <div class=\"alert\" ALIGN=CENTER><img src=\"/themes/{$g['theme']}/images/icons/icon_alert.gif\"/><strong>You can not edit options without an interface ID.</CENTER></div>\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";
<noscript>
<div class="alert" ALIGN=CENTER><img
- src="../themes/nervecenter/images/icons/icon_alert.gif" /><strong>Please
+ src="../themes/<?php echo $g['theme']; ?>/images/icons/icon_alert.gif" /><strong>Please
enable JavaScript to view this content
</CENTER></div>
</noscript>
@@ -363,7 +365,7 @@ enable JavaScript to view this content
padding: 15px 10px 85% 50px;
}
</style>
- <div class=\"alert\" ALIGN=CENTER><img src=\"/themes/nervecenter/images/icons/icon_alert.gif\"/><strong>You can not edit options without an interface ID.</CENTER></div>\n";
+ <div class=\"alert\" ALIGN=CENTER><img src=\"/themes/{$g['theme']}/images/icons/icon_alert.gif\"/><strong>You can not edit options without an interface ID.</CENTER></div>\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";
<noscript>
<div class="alert" ALIGN=CENTER><img
- src="../themes/nervecenter/images/icons/icon_alert.gif" /><strong>Please
+ src="../themes/<?php echo $g['theme']; ?>/images/icons/icon_alert.gif" /><strong>Please
enable JavaScript to view this content
</CENTER></div>
</noscript>
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";
<noscript>
<div class="alert" ALIGN=CENTER><img
- src="../themes/nervecenter/images/icons/icon_alert.gif" /><strong>Please
+ src="../themes/<?php echo $g['theme']; ?>/images/icons/icon_alert.gif" /><strong>Please
enable JavaScript to view this content
</CENTER></div>
</noscript>
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'])) {
<noscript>
<div class="alert" ALIGN=CENTER><img
- src="/themes/nervecenter/images/icons/icon_alert.gif" /><strong>Please
+ src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_alert.gif" /><strong>Please
enable JavaScript to view this content</strong></div>
</noscript>
<script language="JavaScript">
diff --git a/config/snort/snort_interfaces_global.php b/config/snort/snort_interfaces_global.php
index 88725b15..3310eee9 100644
--- a/config/snort/snort_interfaces_global.php
+++ b/config/snort/snort_interfaces_global.php
@@ -37,6 +37,8 @@ require_once("guiconfig.inc");
require_once("/usr/local/pkg/snort/snort_gui.inc");
require_once("/usr/local/pkg/snort/snort.inc");
+global $g;
+
$d_snort_global_dirty_path = '/var/run/snort_global.dirty';
/* make things short */
@@ -293,7 +295,7 @@ echo "$snort_interfaces_css\n";
<noscript>
<div class="alert" ALIGN=CENTER><img
- src="../themes/nervecenter/images/icons/icon_alert.gif" /><strong>Please
+ src="../themes/<?php echo $g['theme']; ?>/images/icons/icon_alert.gif" /><strong>Please
enable JavaScript to view this content
</CENTER></div>
</noscript>
diff --git a/config/snort/snort_preprocessors.php b/config/snort/snort_preprocessors.php
index c56f00e9..f1810658 100644
--- a/config/snort/snort_preprocessors.php
+++ b/config/snort/snort_preprocessors.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;
+
if (!is_array($config['installedpackages']['snortglobal']['rule'])) {
$config['installedpackages']['snortglobal']['rule'] = array();
}
@@ -276,7 +278,7 @@ echo "{$snort_general_css}\n";
<noscript>
<div class="alert" ALIGN=CENTER><img
- src="../themes/nervecenter/images/icons/icon_alert.gif" /><strong>Please
+ src="../themes/<?php echo $g['theme']; ?>/images/icons/icon_alert.gif" /><strong>Please
enable JavaScript to view this content
</CENTER></div>
</noscript>
@@ -353,7 +355,7 @@ enable JavaScript to view this content
padding: 15px 10px 85% 50px;
}
</style>
- <div class=\"alert\" ALIGN=CENTER><img src=\"../themes/nervecenter/images/icons/icon_alert.gif\"/><strong>You can not edit options without an interface ID.</CENTER></div>\n";
+ <div class=\"alert\" ALIGN=CENTER><img src=\"../themes/{$g['theme']}/images/icons/icon_alert.gif\"/><strong>You can not edit options without an interface ID.</CENTER></div>\n";
}
?>
diff --git a/config/snort/snort_rules.php b/config/snort/snort_rules.php
index 7a82a2d3..a17b5b84 100644
--- a/config/snort/snort_rules.php
+++ b/config/snort/snort_rules.php
@@ -33,6 +33,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();
}
@@ -434,7 +436,7 @@ echo "{$snort_general_css}\n";
<noscript>
<div class="alert" ALIGN=CENTER><img
- src="../themes/nervecenter/images/icons/icon_alert.gif" /><strong>Please
+ src="../themes/<?php echo $g['theme']; ?>/images/icons/icon_alert.gif" /><strong>Please
enable JavaScript to view this content
</CENTER></div>
</noscript>
diff --git a/config/snort/snort_rulesets.php b/config/snort/snort_rulesets.php
index 42dc27e6..990c38ee 100644
--- a/config/snort/snort_rulesets.php
+++ b/config/snort/snort_rulesets.php
@@ -32,6 +32,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();
@@ -199,7 +200,7 @@ echo "{$snort_general_css}\n";
<noscript>
<div class="alert" ALIGN=CENTER><img
- src="../themes/nervecenter/images/icons/icon_alert.gif" /><strong>Please
+ src="../themes/<?php echo $g['theme']; ?>/images/icons/icon_alert.gif" /><strong>Please
enable JavaScript to view this content
</CENTER></div>
</noscript>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:54:41 +0000