aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-02-09 21:53:49 -0500
committerScott Ullrich <sullrich@pfsense.org>2009-02-09 21:53:49 -0500
commit8d815d1148a095dea21db60b5bceb67f5c671bce (patch)
tree36d3b9bee1d29eed0631c5ca84f8c6f2c8e860d1
parent261ad0e49a7d7b7123831d423a0a6146b0b00d94 (diff)
downloadpfsense-packages-8d815d1148a095dea21db60b5bceb67f5c671bce.tar.gz
pfsense-packages-8d815d1148a095dea21db60b5bceb67f5c671bce.tar.bz2
pfsense-packages-8d815d1148a095dea21db60b5bceb67f5c671bce.zip
Git rid of the scroll down business and output to lower area with tags stripped.
-rw-r--r--config/snort/snort.inc17
1 files changed, 2 insertions, 15 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 0cda2ed4..cf2e5fbc 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -560,27 +560,14 @@ function check_for_common_errors($filename) {
$contents = file_get_contents($filename);
if(stristr($contents, "You don't have permission")) {
if(!$console_mode) {
- update_all_status("An error occured while downloading {$filename}. Scroll down to inspect it's contents.");
+ update_all_status("An error occured while downloading {$filename}.");
hide_progress_bar_status();
} else {
log_error("An error occured. Scroll down to inspect it's contents.");
echo "An error occured. Scroll down to inspect it's contents.";
}
if(!$console_mode) {
- echo "
- <center>
- <div id='error' style='background:white;width:90%'>
- <!-- TODO: The below paragraphs are kind of stupid. Use CSS instead -->
- <p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>
- <p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>
- <p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>
- <p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>
- <p>The following error occured while downloading the snort rules file from snort.org:</p>
- {$contents}
- <p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>
- </div>
- </center>
- ";
+ update_output_window(strip_tags("$contents"));
} else {
$contents = strip_tags($contents);
log_error("Error downloading snort rules: {$contents}");