From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Cc: dietzmann@brecht-schule.hamburg,
Michael Tremer <michael.tremer@ipfire.org>
Subject: [PATCH 3/5] fwhosts.cgi: Don't show anything if a host/group is unused
Date: Mon, 23 Jun 2025 17:16:56 +0000 [thread overview]
Message-ID: <20250623171658.530138-3-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20250623171658.530138-1-michael.tremer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
html/cgi-bin/fwhosts.cgi | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 4e9c7f04d..69970a840 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1956,8 +1956,6 @@ END
my $htmlparttouse="";
if ($netusedin) {
$htmlparttouse = "<input type='image' align='top' src='/images/info.gif' alt='$netusedin' title='$netusedin'>";
- } else {
- $htmlparttouse = "<input type='image' align='top' src='/images/info.gif' alt='Unused' title='Unused'>";
}
print"<td width='20%' $col><form method='post'>$customnetwork{$key}[0]</td><td width='15%' align='center' $col>".&getcolor($colnet)."</td><td width='40%' $col>$customnetwork{$key}[3]</td><td align='center' $col>$netcount x</td><td>$htmlparttouse</td>";
print<<END;
@@ -2117,8 +2115,6 @@ END
my $htmlparttouse="";
if ($hostusedin) {
$htmlparttouse = "<input type='image' align='top' src='/images/info.gif' alt='$hostusedin' title='$hostusedin'>";
- } else {
- $htmlparttouse = "<input type='image' align='top' src='/images/info.gif' alt='Unused' title='Unused'>";
}
print"<td width='20%' $col>$customhost{$key}[0]</td><td width='20%' align='center' $col >".&getcolor($ip)."</td><td width='50%' align='left' $col>$customhost{$key}[3]</td><td align='center' $col>$hostcount x</td><td>$htmlparttouse</td>";
print<<END;
@@ -2200,8 +2196,6 @@ sub viewtablegrp
my $groupusedin=&getusedin($grpname);
if ($groupusedin) {
print "<input type='image' align='top' src='/images/info.gif' alt='$groupusedin' title='$groupusedin'>";
- } else {
- print "<input type='image' align='top' src='/images/info.gif' alt='$Lang::tr{'Unused'}' title='$Lang::tr{'Unused'}'>";
}
if($netgrpcount == '0')
{
@@ -2344,8 +2338,6 @@ sub viewtablelocationgrp
print "<b>$Lang::tr{'used'}:</b> $locationgrpcount x ";
if ($locationusedin) {
print "<input type='image' align='top' src='/images/info.gif' alt='$locationusedin' title='$locationusedin'>";
- } else {
- print "<input type='image' align='top' src='/images/info.gif' alt='$Lang::tr{'Unused'}' title='$Lang::tr{'Unused'}'>";
}
# Only display delete icon, if the group is not used by a firewall rule.
if($locationgrpcount == '0') {
@@ -2492,8 +2484,6 @@ END
my $htmlparttouse="";
if ($serviceusedin) {
$htmlparttouse="<input type='image' align='top' src='/images/info.gif' alt='$serviceusedin' title='$serviceusedin'>";
- } else {
- $htmlparttouse="<input type='image' align='top' src='/images/info.gif' alt='$Lang::tr{'Unused'}' title='$Lang::tr{'Unused'}'>";
}
if($customservice{$key}[3] eq 'All ICMP-Types'){print $Lang::tr{'fwdfw all icmp'};}
elsif($customservice{$key}[3] ne 'BLANK'){print $customservice{$key}[3];}
@@ -2574,8 +2564,6 @@ sub viewtableservicegrp
my $srvgrpusedin=&getsrvusedin($customservicegrp{$key}[0]);
if ($srvgrpusedin) {
print "<input type='image' align='top' src='/images/info.gif' alt='$srvgrpusedin' title='$srvgrpusedin'>";
- } else {
- print "<input type='image' align='top' src='/images/info.gif' alt='$Lang::tr{'Unused'}' title='$Lang::tr{'Unused'}'>";
}
if($grpcount == '0')
{
--
2.39.5
next prev parent reply other threads:[~2025-06-23 17:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-23 17:16 [PATCH 1/5] fwhosts.cgi: Show in which firewall rule objects are being used Michael Tremer
2025-06-23 17:16 ` [PATCH 2/5] fwhosts.cgi: Remove whitespace issues Michael Tremer
2025-06-23 17:16 ` Michael Tremer [this message]
2025-06-23 17:16 ` [PATCH 4/5] fwhosts.cgi: Move the tooltip into the usage counter Michael Tremer
2025-06-23 17:16 ` [PATCH 5/5] langs: Remove the unused "Unused" translation string Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250623171658.530138-3-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
--cc=dietzmann@brecht-schule.hamburg \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox