pmgspamreport: do not escape character in tooltip - does not work with most browsers

Use template toolkit filter for hrefs.

diff --git a/PMG/CLI/pmgspamreport.pm b/PMG/CLI/pmgspamreport.pm
index 0f2f3212f18130975a84b2be24bb9f8e1114ac1f..d6529f28503a757114a95b8e3225ec83a921e739 100755 (executable)
--- a/PMG/CLI/pmgspamreport.pm
+++ b/PMG/CLI/pmgspamreport.pm
@@ -9,7 +9,6 @@ use Time::Local;
 use Clone 'clone';
 use Mail::Header;
 use POSIX qw(strftime);
-use URI::Escape;
 
 use PVE::SafeSyslog;
 use PVE::Tools;
@@ -96,7 +95,7 @@ sub get_item_data {
     $title .= sprintf("File: %s", encode_entities($ref->{file}));
 
     # fixme: urlencode?
-    $data->{title} = uri_escape($title);
+    $data->{title} = $title;
 
     return $data;
 }
@@ -294,6 +293,7 @@ __PACKAGE__->register_method ({
                    # fixme: my $ticket = Proxmox::Utils::create_ticket ($lastref);
                    my $ticket = "TEST";
                    $data->{ticket} = $ticket;
+                   $data->{managehref} = "https://$fqdn:$port?ticket=$ticket";
                    $data->{mailcount} = $mailcount;
 
                    my $sendto = $redirect ? $redirect : $creceiver;

diff --git a/templates/spamreport-verbose.tmpl b/templates/spamreport-verbose.tmpl
index 90fe54f39de399087a091c4865ef3d1a78482c67..7631a6d782f4c332b0826b2c3718c62b0d270130 100644 (file)
--- a/templates/spamreport-verbose.tmpl
+++ b/templates/spamreport-verbose.tmpl
@@ -11,8 +11,8 @@
 
 <div align=center>
 
-<form action='[% actionhref %]' method='POST'>
-<input type=hidden name=ticket value='[% ticket %]'>
+<form action='[% actionhref | uri %]' method='POST'>
+<input type=hidden name=ticket value='[% ticket | uri %]'>
 
 <table width='100%'>
   <tr>
@@ -26,13 +26,13 @@
   <!--start entries-->
   [% FOREACH item IN items %]
   <tr title='[% item.title %]'>
-    <td><input type=checkbox name=cselect value='[% item.ticket %]'></td>
+    <td><input type=checkbox name=cselect value='[% item.ticket | uri %]'></td>
     <td>[% item.from %]</td>
     <td align=right>[% item.date %] [% item.time %]</td>
   </tr>
   <tr title='[% item.title %]'>
     <td></td>
-    <td colspan=2><a style='cursor:pointer;' href='[% item.href %]'>
+    <td colspan=2><a style='cursor:pointer;' href='[% item.href | url %]'>
        <b>[% item.subject %]</b></a></td>
   </tr>
   <tr><td colspan=3><hr></td></tr>
@@ -52,7 +52,7 @@
   
 </table>
 
-<p>Please use the <a href='[% manage %]?ticket=[% ticket %]'>web interface</a> to manage your spam quarantine.</p>
+<p>Please use the <a href='[% managehref | url %]'>web interface</a> to manage your spam quarantine.</p>
 <p>Powered by <a target=_blank href='http://www.proxmox.com'>Proxmox</a>.</p>
 </div>