From 6f6eaffe83fc541e207df8207ee944e725f50dec Mon Sep 17 00:00:00 2001 From: bmeeks8 Date: Wed, 4 Feb 2015 17:28:47 -0500 Subject: Move print_info_box() call to inside of

tag where it belongs. --- config/suricata/suricata_alerts.php | 13 +++++++------ config/suricata/suricata_barnyard.php | 7 +++---- config/suricata/suricata_blocked.php | 10 ++++++---- config/suricata/suricata_define_vars.php | 17 ++++++++++------- config/suricata/suricata_ip_list_mgmt.php | 10 +++++++--- config/suricata/suricata_ip_reputation.php | 13 +++++++------ config/suricata/suricata_passlist.php | 7 ++++--- config/suricata/suricata_passlist_edit.php | 12 ++++++++---- config/suricata/suricata_rules.php | 19 ++++++++++--------- config/suricata/suricata_rulesets.php | 10 ++++++---- config/suricata/suricata_suppress_edit.php | 12 +++++------- 11 files changed, 73 insertions(+), 57 deletions(-) (limited to 'config/suricata') diff --git a/config/suricata/suricata_alerts.php b/config/suricata/suricata_alerts.php index f151e173..fa4fed5c 100644 --- a/config/suricata/suricata_alerts.php +++ b/config/suricata/suricata_alerts.php @@ -424,20 +424,21 @@ if ($pconfig['arefresh'] == 'on') echo "\n"; ?> + + + + + + - - - - - diff --git a/config/suricata/suricata_barnyard.php b/config/suricata/suricata_barnyard.php index 2938136f..c4e438ba 100644 --- a/config/suricata/suricata_barnyard.php +++ b/config/suricata/suricata_barnyard.php @@ -229,8 +229,10 @@ include_once("head.inc"); ?> - + + - -

diff --git a/config/suricata/suricata_blocked.php b/config/suricata/suricata_blocked.php index 4f4bf095..ccb3548b 100644 --- a/config/suricata/suricata_blocked.php +++ b/config/suricata/suricata_blocked.php @@ -163,19 +163,21 @@ include_once("fbegin.inc"); /* refresh every 60 secs */ if ($pconfig['brefresh'] == 'on') echo "\n"; +?> + + + + - - - diff --git a/config/suricata/suricata_define_vars.php b/config/suricata/suricata_define_vars.php index b94292c3..1aff122c 100644 --- a/config/suricata/suricata_define_vars.php +++ b/config/suricata/suricata_define_vars.php @@ -157,13 +157,7 @@ include_once("head.inc"); ' . $pgtitle . '

';} -/* Display Alert message */ -if ($input_errors) - print_input_errors($input_errors); // TODO: add checks -if ($savemsg) - print_info_box($savemsg); +include("fbegin.inc"); ?> + + +

diff --git a/config/suricata/suricata_ip_list_mgmt.php b/config/suricata/suricata_ip_list_mgmt.php index 37decaad..c94db61e 100644 --- a/config/suricata/suricata_ip_list_mgmt.php +++ b/config/suricata/suricata_ip_list_mgmt.php @@ -170,6 +170,13 @@ include_once("head.inc"); + + + + + + - - -

diff --git a/config/suricata/suricata_ip_reputation.php b/config/suricata/suricata_ip_reputation.php index 4615923a..d9d45a5f 100644 --- a/config/suricata/suricata_ip_reputation.php +++ b/config/suricata/suricata_ip_reputation.php @@ -177,11 +177,6 @@ include_once("head.inc"); @@ -193,7 +188,13 @@ if ($savemsg)

" . gettext("You must apply the change in order for it to take effect."));?> - + diff --git a/config/suricata/suricata_passlist.php b/config/suricata/suricata_passlist.php index af1c4ff5..e7e55d20 100644 --- a/config/suricata/suricata_passlist.php +++ b/config/suricata/suricata_passlist.php @@ -104,7 +104,11 @@ include_once("head.inc"); + + + - - -

diff --git a/config/suricata/suricata_passlist_edit.php b/config/suricata/suricata_passlist_edit.php index 5bfeb8b9..1d92e644 100644 --- a/config/suricata/suricata_passlist_edit.php +++ b/config/suricata/suricata_passlist_edit.php @@ -199,10 +199,6 @@ include_once("head.inc"); @@ -210,6 +206,14 @@ if ($savemsg) + + +

diff --git a/config/suricata/suricata_rules.php b/config/suricata/suricata_rules.php index 480bf3dc..020a826d 100644 --- a/config/suricata/suricata_rules.php +++ b/config/suricata/suricata_rules.php @@ -436,15 +436,6 @@ $pgtitle = gettext("Suricata: Interface {$if_friendly} - Rules: {$currentruleset @@ -456,6 +447,16 @@ if ($savemsg) {
" . gettext("Click APPLY when finished to send the changes to the running configuration."));?> + diff --git a/config/suricata/suricata_rulesets.php b/config/suricata/suricata_rulesets.php index 7f591b6c..902352c0 100644 --- a/config/suricata/suricata_rulesets.php +++ b/config/suricata/suricata_rulesets.php @@ -260,20 +260,22 @@ include_once("head.inc"); + + + + - -

diff --git a/config/suricata/suricata_suppress_edit.php b/config/suricata/suricata_suppress_edit.php index 8814d3db..d9b6e8bc 100644 --- a/config/suricata/suricata_suppress_edit.php +++ b/config/suricata/suricata_suppress_edit.php @@ -143,16 +143,14 @@ include_once("head.inc"); -' . $pgtitle . '
';} + + + - +