From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 4/4] optionsfw.cgi: Move Logging section to after all
 Firewall Options Drop commands
Date: Wed, 10 Jan 2024 15:38:45 +0100
Message-ID: <20240110143845.12957-4-adolf.belka@ipfire.org>
In-Reply-To: <20240110143845.12957-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7429026893005480177=="
List-Id: <development.lists.ipfire.org>

--===============7429026893005480177==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- Moved the Logging section to after all Firewall Options Drop commands as di=
scussed
   at January 2024 Video Call.

Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 html/cgi-bin/optionsfw.cgi | 45 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index a2a0058f7..6f80f1901 100644
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -218,6 +218,29 @@ END
=20
 	<br>
=20
+<table width=3D'95%' cellspacing=3D'0'>
+	<tr bgcolor=3D'$color{'color20'}'>
+		<td colspan=3D'2' align=3D'left'><b>$Lang::tr{'fw red'}</b></td>
+	</tr>
+	<tr>
+		<td align=3D'left' width=3D'60%'>$Lang::tr{'drop hostile'}</td>
+		<td align=3D'left'>
+			$Lang::tr{'on'} <input type=3D'radio' name=3D'DROPHOSTILE' value=3D'on' $=
checked{'DROPHOSTILE'}{'on'} />/
+			<input type=3D'radio' name=3D'DROPHOSTILE' value=3D'off' $checked{'DROPHO=
STILE'}{'off'} /> $Lang::tr{'off'}
+		</td>
+	</tr>
+</table>
+<br>
+
+<table width=3D'95%' cellspacing=3D'0'>
+<tr bgcolor=3D'$color{'color20'}'><td colspan=3D'2' align=3D'left'><b>$Lang:=
:tr{'fw blue'}</b></td></tr>
+<tr><td align=3D'left' width=3D'60%'>$Lang::tr{'drop proxy'}</td><td align=
=3D'left'>$Lang::tr{'on'} <input type=3D'radio' name=3D'DROPPROXY' value=3D'o=
n' $checked{'DROPPROXY'}{'on'} />/
+																						<input type=3D'radio' name=3D'DROPPROXY' value=3D'off'=
 $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr>
+<tr><td align=3D'left' width=3D'60%'>$Lang::tr{'drop samba'}</td><td align=
=3D'left'>$Lang::tr{'on'} <input type=3D'radio' name=3D'DROPSAMBA' value=3D'o=
n' $checked{'DROPSAMBA'}{'on'} />/
+																						<input type=3D'radio' name=3D'DROPSAMBA' value=3D'off'=
 $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr>
+</table>
+<br>
+
 <table width=3D'95%' cellspacing=3D'0'>
 	<tr bgcolor=3D'$color{'color20'}'>
 		<td colspan=3D'2' align=3D'left'><b>$Lang::tr{'fw logging'}</b></td>
@@ -295,28 +318,6 @@ END
 </table>
 <br/>
=20
-<table width=3D'95%' cellspacing=3D'0'>
-	<tr bgcolor=3D'$color{'color20'}'>
-		<td colspan=3D'2' align=3D'left'><b>$Lang::tr{'fw red'}</b></td>
-	</tr>
-	<tr>
-		<td align=3D'left' width=3D'60%'>$Lang::tr{'drop hostile'}</td>
-		<td align=3D'left'>
-			$Lang::tr{'on'} <input type=3D'radio' name=3D'DROPHOSTILE' value=3D'on' $=
checked{'DROPHOSTILE'}{'on'} />/
-			<input type=3D'radio' name=3D'DROPHOSTILE' value=3D'off' $checked{'DROPHO=
STILE'}{'off'} /> $Lang::tr{'off'}
-		</td>
-	</tr>
-</table>
-<br>
-
-<table width=3D'95%' cellspacing=3D'0'>
-<tr bgcolor=3D'$color{'color20'}'><td colspan=3D'2' align=3D'left'><b>$Lang:=
:tr{'fw blue'}</b></td></tr>
-<tr><td align=3D'left' width=3D'60%'>$Lang::tr{'drop proxy'}</td><td align=
=3D'left'>$Lang::tr{'on'} <input type=3D'radio' name=3D'DROPPROXY' value=3D'o=
n' $checked{'DROPPROXY'}{'on'} />/
-																						<input type=3D'radio' name=3D'DROPPROXY' value=3D'off'=
 $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr>
-<tr><td align=3D'left' width=3D'60%'>$Lang::tr{'drop samba'}</td><td align=
=3D'left'>$Lang::tr{'on'} <input type=3D'radio' name=3D'DROPSAMBA' value=3D'o=
n' $checked{'DROPSAMBA'}{'on'} />/
-																						<input type=3D'radio' name=3D'DROPSAMBA' value=3D'off'=
 $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr>
-</table>
-<br>
 <table width=3D'95%' cellspacing=3D'0'>
 <tr bgcolor=3D'$color{'color20'}'><td colspan=3D'2' align=3D'left'><b>$Lang:=
:tr{'fw settings'}</b></td></tr>
 <tr><td align=3D'left' width=3D'60%'>$Lang::tr{'fw settings color'}</td><td =
align=3D'left'>$Lang::tr{'on'} <input type=3D'radio' name=3D'SHOWCOLORS' valu=
e=3D'on' $checked{'SHOWCOLORS'}{'on'} />/
--=20
2.43.0


--===============7429026893005480177==--