aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2015-02-04 17:28:47 -0500
committerbmeeks8 <bmeeks8@bellsouth.net>2015-02-04 17:28:47 -0500
commit6f6eaffe83fc541e207df8207ee944e725f50dec (patch)
tree6352b1dc3ecf493c84df6829bfb6677a3bab1a6b /config
parent372d553209678813dbedc4fe26b8b6249c13c8f3 (diff)
downloadpfsense-packages-6f6eaffe83fc541e207df8207ee944e725f50dec.tar.gz
pfsense-packages-6f6eaffe83fc541e207df8207ee944e725f50dec.tar.bz2
pfsense-packages-6f6eaffe83fc541e207df8207ee944e725f50dec.zip
Move print_info_box() call to inside of <form> tag where it belongs.
Diffstat (limited to 'config')
-rw-r--r--config/suricata/suricata_alerts.php13
-rw-r--r--config/suricata/suricata_barnyard.php7
-rw-r--r--config/suricata/suricata_blocked.php10
-rw-r--r--config/suricata/suricata_define_vars.php17
-rw-r--r--config/suricata/suricata_ip_list_mgmt.php10
-rw-r--r--config/suricata/suricata_ip_reputation.php13
-rw-r--r--config/suricata/suricata_passlist.php7
-rw-r--r--config/suricata/suricata_passlist_edit.php12
-rw-r--r--config/suricata/suricata_rules.php19
-rw-r--r--config/suricata/suricata_rulesets.php10
-rw-r--r--config/suricata/suricata_suppress_edit.php12
11 files changed, 73 insertions, 57 deletions
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 "<meta http-equiv=\"refresh\" content=\"60;url=/suricata/suricata_alerts.php?instance={$instanceid}\" />\n";
?>
+<form action="/suricata/suricata_alerts.php" method="post" id="formalert">
+<input type="hidden" name="sidid" id="sidid" value=""/>
+<input type="hidden" name="gen_id" id="gen_id" value=""/>
+<input type="hidden" name="ip" id="ip" value=""/>
+<input type="hidden" name="descr" id="descr" value=""/>
+
<?php
/* Display Alert message */
if ($input_errors) {
- print_input_errors($input_errors); // TODO: add checks
+ print_input_errors($input_errors);
}
if ($savemsg) {
print_info_box($savemsg);
}
?>
-<form action="/suricata/suricata_alerts.php" method="post" id="formalert">
-<input type="hidden" name="sidid" id="sidid" value=""/>
-<input type="hidden" name="gen_id" id="gen_id" value=""/>
-<input type="hidden" name="ip" id="ip" value=""/>
-<input type="hidden" name="descr" id="descr" value=""/>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tbody>
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");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc");
+<?php include("fbegin.inc"); ?>
+<form action="suricata_barnyard.php" method="post" name="iform" id="iform">
+<?php
/* Display Alert message */
if ($input_errors) {
print_input_errors($input_errors);
@@ -239,10 +241,7 @@ include_once("head.inc");
if ($savemsg) {
print_info_box($savemsg);
}
-
?>
-
-<form action="suricata_barnyard.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr><td>
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 "<meta http-equiv=\"refresh\" content=\"60;url=/suricata/suricata_blocked.php\" />\n";
+?>
+
+<form action="/suricata/suricata_blocked.php" method="post">
+<input type="hidden" name="ip" id="ip" value=""/>
+<?php
/* Display Alert message */
if ($input_errors) {
- print_input_errors($input_errors); // TODO: add checks
+ print_input_errors($input_errors);
}
if ($savemsg) {
print_info_box($savemsg);
}
?>
-<form action="/suricata/suricata_blocked.php" method="post">
-<input type="hidden" name="ip" id="ip" value=""/>
-
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
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");
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php
-include("fbegin.inc");
-if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}
-/* Display Alert message */
-if ($input_errors)
- print_input_errors($input_errors); // TODO: add checks
-if ($savemsg)
- print_info_box($savemsg);
+include("fbegin.inc");
?>
<script type="text/javascript" src="/javascript/autosuggest.js">
@@ -171,6 +165,15 @@ if ($savemsg)
<script type="text/javascript" src="/javascript/suggestions.js">
</script>
<form action="suricata_define_vars.php" method="post" name="iform" id="iform">
+
+<?php
+/* Display Alert message */
+if ($input_errors)
+ print_input_errors($input_errors);
+if ($savemsg)
+ print_info_box($savemsg);
+?>
+
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr><td>
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");
<?php
include_once("fbegin.inc");
+?>
+
+<form action="/suricata/suricata_ip_list_mgmt.php" enctype="multipart/form-data" method="post" name="iform" id="iform">
+<input type="hidden" name="MAX_FILE_SIZE" value="100000000" />
+<input type="hidden" name="iplist_fname" id="iplist_fname" value=""/>
+
+<?php
if ($input_errors) {
print_input_errors($input_errors);
}
@@ -178,9 +185,6 @@ if ($savemsg)
print_info_box($savemsg);
?>
-<form action="/suricata/suricata_ip_list_mgmt.php" enctype="multipart/form-data" method="post" name="iform" id="iform">
-<input type="hidden" name="MAX_FILE_SIZE" value="100000000" />
-<input type="hidden" name="iplist_fname" id="iplist_fname" value=""/>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr><td>
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");
<?php
include("fbegin.inc");
-/* Display Alert message */
-if ($input_errors)
- print_input_errors($input_errors);
-if ($savemsg)
- print_info_box($savemsg);
?>
<form action="suricata_ip_reputation.php" method="post" name="iform" id="iform" >
@@ -193,7 +188,13 @@ if ($savemsg)
<?php if (is_subsystem_dirty('suricata_iprep') && !$input_errors): ?><p>
<?php print_info_box_np(gettext("A change has been made to IP List file assignments.") . "<br/>" . gettext("You must apply the change in order for it to take effect."));?>
<?php endif; ?>
-
+<?php
+/* Display Alert message */
+if ($input_errors)
+ print_input_errors($input_errors);
+if ($savemsg)
+ print_info_box($savemsg);
+?>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
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");
<?php
include_once("fbegin.inc");
+?>
+<form action="/suricata/suricata_passlist.php" method="post">
+<input type="hidden" name="list_id" id="list_id" value=""/>
+<?php
/* Display Alert message */
if ($input_errors) {
print_input_errors($input_errors);
@@ -113,9 +117,6 @@ if ($savemsg) {
print_info_box($savemsg);
}
?>
-
-<form action="/suricata/suricata_passlist.php" method="post">
-<input type="hidden" name="list_id" id="list_id" value=""/>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr><td>
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");
<?php
include("fbegin.inc");
-if ($input_errors)
- print_input_errors($input_errors);
-if ($savemsg)
- print_info_box($savemsg);
?>
<script type="text/javascript" src="/javascript/autosuggest.js">
</script>
@@ -210,6 +206,14 @@ if ($savemsg)
</script>
<form action="suricata_passlist_edit.php" method="post" name="iform" id="iform">
<input name="id" type="hidden" value="<?=$id;?>" />
+
+<?php
+if ($input_errors)
+ print_input_errors($input_errors);
+if ($savemsg)
+ print_info_box($savemsg);
+?>
+
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr><td>
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
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php
include("fbegin.inc");
-/* Display error or save messages if present */
-if ($input_errors) {
- print_input_errors($input_errors); // TODO: add checks
-}
-
-if ($savemsg) {
- print_info_box($savemsg);
-}
-
?>
<form action='/suricata/suricata_rules.php' method='post' name='iform' id='iform'>
@@ -456,6 +447,16 @@ if ($savemsg) {
<?php if (is_subsystem_dirty('suricata_rules')): ?><p>
<?php print_info_box_np(gettext("A change has been made to a rule state.") . "<br/>" . gettext("Click APPLY when finished to send the changes to the running configuration."));?>
<?php endif; ?>
+<?php
+/* Display error or save messages if present */
+if ($input_errors) {
+ print_input_errors($input_errors);
+}
+
+if ($savemsg) {
+ print_info_box($savemsg);
+}
+?>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tbody>
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");
<?php
include("fbegin.inc");
+?>
+
+<form action="suricata_rulesets.php" method="post" name="iform" id="iform">
+<input type="hidden" name="id" id="id" value="<?=$id;?>" />
+<?php
/* Display message */
if ($input_errors) {
- print_input_errors($input_errors); // TODO: add checks
+ print_input_errors($input_errors);
}
if ($savemsg) {
print_info_box($savemsg);
}
-
?>
-<form action="suricata_rulesets.php" method="post" name="iform" id="iform">
-<input type="hidden" name="id" id="id" value="<?=$id;?>" />
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr><td>
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");
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php
-include("fbegin.inc");
-if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}
+<?php include("fbegin.inc"); ?>
+<form action="/suricata/suricata_suppress_edit.php" name="iform" id="iform" method="post">
+<?php
if ($input_errors) print_input_errors($input_errors);
-if ($savemsg)
- print_info_box($savemsg);
-
+if ($savemsg) print_info_box($savemsg);
?>
-<form action="/suricata/suricata_suppress_edit.php" name="iform" id="iform" method="post">
+
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
<?php
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 19:07:11 +0000