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

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

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 5231 bytes --]

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  a18358290945cc28b5231f703ff13187a33a63ca (commit)
       via  9297dba50f80ef35244230ed3e12cfa3dd45131a (commit)
       via  ee9b73657ef83af7ad8a6fbf520986387ac34c41 (commit)
       via  cd7a901109751cfa28b7cae01e04192aa17232b4 (commit)
      from  09924d7eec602353d2e585639572f49002e58bee (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 a18358290945cc28b5231f703ff13187a33a63ca
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Mar 14 09:28:24 2024 +0000

    core185: Ship manualpages
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 9297dba50f80ef35244230ed3e12cfa3dd45131a
Author: Jon Murphy <jon.murphy(a)ipfire.org>
Date:   Tue Mar 12 12:14:07 2024 -0500

    manualpages: update wiki url
    
    Suggested-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
    Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit ee9b73657ef83af7ad8a6fbf520986387ac34c41
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Mar 14 09:26:19 2024 +0000

    dns.cgi: Remove excess whitespace
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit cd7a901109751cfa28b7cae01e04192aa17232b4
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Mar 13 23:12:12 2024 +0100

    dns.cgi: Add use Encode + encode back to UTF-8
    
    - use Encode was missed out in the previous patch for dns.cgi This would mean that the
       decode from UTF-8 would fail. I had tested the previous change but forgot to copy across
       the use Encode line when I created the patch.
    - This patch adds an encode back to UTF-8 after running the cleanhtml command. This way
       the text is decoded from UTF-8 so that the cleanhtml command works correctly on
       umlauted characters and then is encoded back to UTF-8 so that all text in the cgi page
       is UTF-8.
    
    Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/cfgroot/manualpages                | 2 +-
 config/rootfiles/core/185/filelists/files | 1 +
 html/cgi-bin/dns.cgi                      | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages
index fe5ebc0b8..f70381f12 100644
--- a/config/cfgroot/manualpages
+++ b/config/cfgroot/manualpages
@@ -2,7 +2,7 @@
 # The CGI files are referenced relative to the "/cgi-bin/" path
 
 # Fixed base URL (without trailing slash)
-BASE_URL=https://wiki.ipfire.org
+BASE_URL=https://www.ipfire.org/docs
 
 #	System menu
 index.cgi=configuration/system/startpage
diff --git a/config/rootfiles/core/185/filelists/files b/config/rootfiles/core/185/filelists/files
index 3a197e931..7dd82b01d 100644
--- a/config/rootfiles/core/185/filelists/files
+++ b/config/rootfiles/core/185/filelists/files
@@ -49,4 +49,5 @@ srv/web/ipfire/cgi-bin/dns.cgi
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 var/ipfire/backup/bin/backup.pl
+var/ipfire/main/manualpages
 var/ipfire/ovpn/openssl/ovpn.cnf
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index eb6f908d5..1181523d4 100644
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2020  IPFire Development Team                                 #
+# Copyright (C) 2005-2024  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -21,6 +21,7 @@
 
 use strict;
 use IO::Socket;
+use Encode;
 
 # enable only the following on debugging purpose
 #use warnings;
@@ -151,6 +152,9 @@ if (($cgiparams{'SERVERS'} eq $Lang::tr{'save'}) || ($cgiparams{'SERVERS'} eq $L
 		# are correctly encoded to their html entities
 		$cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
 
+		# encode the text back to UTF-8 after running the cleanhtml command
+		$cgiparams{'REMARK'} = encode("UTF-8", $cgiparams{'REMARK'});
+
 		my %dns_servers = ();
 		my $id;
 		my $status;


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