From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Koch <ipfire@starkstromkonsument.de>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] zoneconf: Add status output of "brctl show" and "ip addr"
Date: Tue, 03 Sep 2019 23:46:24 +0200
Message-ID: <20190903214624.2280-3-ipfire@starkstromkonsument.de>
In-Reply-To: <20190903214624.2280-1-ipfire@starkstromkonsument.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2425150452754119416=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Alex Koch <ipfire(a)starkstromkonsument.de>
---
 html/cgi-bin/zoneconf.cgi | 23 +++++++++++++++++++++++
 langs/de/cgi-bin/de.pl    |  5 ++++-
 langs/en/cgi-bin/en.pl    |  5 ++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index bb24347df..71b5c1550 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -97,6 +97,10 @@ my $css =3D <<END
 		width: 4em;
 	}
=20
+	p.notice {
+		color: red;
+	}
+
 	#submit-container {
 		width: 100%;
 		padding-top: 20px;
@@ -456,5 +460,24 @@ END
 ### END OF TABLE ###
=20
 &Header::closebox();
+
+&Header::openbox('100%', 'left', $Lang::tr{"zoneconf brctl show"});
+print <<END
+        <p class=3D"notice">$Lang::tr{"zoneconf notice uptodate"}</p>
+END
+;
+my $br_config =3D `brctl show`;
+print "<pre>$br_config</pre>";
+&Header::closebox();
+
+&Header::openbox('100%', 'left', $Lang::tr{"zoneconf ip addr"});
+print <<END
+        <p class=3D"notice">$Lang::tr{"zoneconf notice uptodate"}</p>
+END
+;
+my $if_config =3D `ip addr`;
+print "<pre>$if_config</pre>";
+&Header::closebox();
+
 &Header::closebigbox();
 &Header::closepage();
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 2e67e495f..363f11213 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1,4 +1,4 @@
-%tr =3D (=20
+%tr =3D (
 %tr,
=20
 '24 hours' =3D> '24 Stunden',
@@ -2905,11 +2905,14 @@
 'zoneconf access native' =3D> 'Nativ',
 'zoneconf access none' =3D> 'Keine',
 'zoneconf access vlan' =3D> 'VLAN',
+'zoneconf brctl show' =3D> 'Status: Netzwerkbr=C3=BCcken',
+'zoneconf ip addr' =3D> 'Status: Netzwerkkarten',
 'zoneconf nic assignment' =3D> 'Netzwerkkartenzuordnung',
 'zoneconf nicmode bridge' =3D> 'Br=C3=BCcke',
 'zoneconf nicmode default' =3D> 'Normal',
 'zoneconf nicmode macvtap' =3D> 'MacVTap',
 'zoneconf notice reboot' =3D> 'Bitte einen Neustart durchf=C3=BChren, um die=
 =C3=84nderungen zu =C3=BCbernehmen.',
+'zoneconf notice uptodate' =3D> 'ACHTUNG: Falls =C3=84nderungen an der Netzw=
erkkartenzuordnung vorgenommen wurden, werden diese hier erst nach einem Neus=
tart angezeigt!',
 'zoneconf title' =3D> 'Zonen einrichten',
 'zoneconf val native assignment error' =3D> 'Eine Netzwerkkarte kann nicht v=
on mehreren Zonen nativ verwendet werden.',
 'zoneconf val ppp assignment error' =3D> 'Die Netzwerkkarte, die von RED im =
PPP-Modus verwendet wird, kann keiner anderen Zone zugeordnet werden.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 8b7e63cb8..d440d0528 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,4 +1,4 @@
-%tr =3D (=20
+%tr =3D (
 %tr,
=20
 '24 hours' =3D> '24 Hours',
@@ -2951,11 +2951,14 @@
 'zoneconf access native' =3D> 'Native',
 'zoneconf access none' =3D> 'None',
 'zoneconf access vlan' =3D> 'VLAN',
+'zoneconf brctl show' =3D> 'Status: Bridges',
+'zoneconf ip addr' =3D> 'Status: Interfaces',
 'zoneconf nic assignment' =3D> 'NIC Assignment',
 'zoneconf nicmode bridge' =3D> 'Bridge',
 'zoneconf nicmode default' =3D> 'Default',
 'zoneconf nicmode macvtap' =3D> 'MacVTtap',
 'zoneconf notice reboot' =3D> 'Please reboot to apply your changes.',
+'zoneconf notice uptodate' =3D> 'Attention: If you changed your NIC Assignme=
nt, a reboot is required for the changes to be shown!',
 'zoneconf title' =3D> 'Zone Configuration',
 'zoneconf val native assignment error' =3D> 'A NIC cannot be accessed native=
ly by more than one zone.',
 'zoneconf val ppp assignment error' =3D> 'The NIC used for RED in PPP mode c=
annot be accessed by any other zone.',
--=20
2.17.1


--===============2425150452754119416==--