captive: Escape any special characters in title on PDF vouchers

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/117/filelists/files b/config/rootfiles/core/117/filelists/files
index eafb9f1a7613b43a557bdc32ef8200af754e1372..88473a46ac4f3fc0a9ff9394010d44a0316ef39e 100644 (file)
--- a/config/rootfiles/core/117/filelists/files
+++ b/config/rootfiles/core/117/filelists/files
@@ -5,6 +5,7 @@ etc/rc.d/init.d/apache
 etc/ssl/certs/ca-bundle.crt
 etc/ssl/certs/ca-bundle.trust.crt
 opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/captive.cgi
 srv/web/ipfire/cgi-bin/country.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/config.dat
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 113c29f412a7428507926f4129ede3ff565ea9a0..f3bb28cb2274f0d8e30c0c5be9c3d95472527715 100755 (executable)
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -757,7 +757,7 @@ sub generate_pdf() {
                        $f_subheadline->translate($cx, ($y + $h - $cy) / 2.4 + $cy);
 
                        if ($settings{'TITLE'}) {
-                               $f_headline->text_center($settings{'TITLE'});
+                               $f_headline->text_center(decode("utf8", $settings{'TITLE'}));
                                $f_subheadline->text_center(decode("utf8", $Lang::tr{'Captive WiFi coupon'}));
                        } else {
                                $f_headline->text_center(decode("utf8", $Lang::tr{'Captive WiFi coupon'}));