[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5489d3994a93f95e4e85bf5cdc711b6b0eef01ca

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5489d3994a93f95e4e85bf5cdc711b6b0eef01ca

[Michael Tremer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  5489d3994a93f95e4e85bf5cdc711b6b0eef01ca (commit)
      from  dbf3bb1e55b5a48813a4a787eb236e6a7e54e00c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5489d3994a93f95e4e85bf5cdc711b6b0eef01ca
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Dec 9 11:46:22 2025 +0000

    dns.cgi: Consitently show the legend
    
    Fixes: #13917 - Legend in dns.cgi disappears
    Suggested-by: Bernhard Bitsch <bbitsch@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/200/filelists/files |  1 +
 html/cgi-bin/dns.cgi                      | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/200/filelists/files b/config/rootfiles/core/200/filelists/files
index 5ab36a55e..e43c7c7dd 100644
--- a/config/rootfiles/core/200/filelists/files
+++ b/config/rootfiles/core/200/filelists/files
@@ -1,3 +1,4 @@
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/unbound
+srv/web/ipfire/cgi-bin/dns.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index f01d5d3ab..e99b2f078 100644
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -708,10 +708,18 @@ END
 
 		print"</table>\n";
 
-		print"<table width='100%'>\n";
+		my $show_legend = 0;
 
 		# Check if the usage of the ISP nameservers is enabled and there are more than 2 servers.
-		if (($settings{'USE_ISP_NAMESERVERS'} eq "on") && ($server_amount > 2)) {
+		if ($settings{'USE_ISP_NAMESERVERS'} eq "on") {
+			$show_legend = $server_amount > 2;
+		} else {
+			$show_legend = $server_amount > 0;
+		}
+
+		print"<table width='100%'>\n";
+
+		if ($show_legend) {
 print <<END;
 			<tr>
 				<td class='boldbase'>&nbsp; <b>$Lang::tr{'legend'}:</b></td>


hooks/post-receive
--
IPFire 2.x development tree