Merge branch 'bug-932'

manager/application/views/helpers/UserInfo.php

@@ -82,7 +82,7 @@ class Zend_View_Helper_UserInfo extends Zend_View_Helper_Placeholder_Container_S
 
         $output .= $indent . "<div id=\"userinfo\">\n";
         $output .= $indent . "\tUser: " . $this->items['authed_username'] . "<br>\n";
-        $output .= $indent . "\tName: " . $this->items['authed_fname'] . ' ' . $this->items['authed_lname'] . "<br>\n";
+        $output .= $indent . "\tName: " . htmlentities(strip_tags($this->items['authed_fname'] . ' ' . $this->items['authed_lname']), ENT_QUOTES, 'ISO-8859-1') . "<br>\n";
         $output .= $indent . "\tRole: " . $this->items['authed_role'] . "<br>\n";
         if ($this->items['authed_by_crt'] === true)
             $output .= $indent . "\tLoginmethod: CRT<br>\n";

manager/application/views/scripts/mail/full.phtml

@@ -23,14 +23,14 @@ else {
     </tr>
 <?php
     foreach ($this->headers as $header) {
-        print "        <tr>\n";
-        print "            <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
-        print "            <td>" . $header->toaddress . "</td>";
-        print "            <td>" . $header->subject . "</td>";
-        print "            <td>" . $header->date . "</td>";
-        print "            <td>" . $header->Size . "</td>";
-        print "            <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
-        print "        </tr>\n";
+        print "    <tr>\n";
+        print "        <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
+        print "        <td>" . $header->toaddress . "</td>";
+        print "        <td>" . htmlspecialchars(iconv_mime_decode($header->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8'), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
+        print "        <td>" . $header->date . "</td>";
+        print "        <td>" . $header->Size . "</td>";
+        print "        <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
+        print "    </tr>\n";
     }
 }
 ?>

manager/application/views/scripts/mail/index.phtml

@@ -23,14 +23,14 @@ else {
     </tr>
 <?php
     foreach ($this->headers as $header) {
-        print "        <tr>\n";
-        print "            <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
-        print "            <td>" . $header->toaddress . "</td>";
-        print "            <td>" . $header->subject . "</td>";
-        print "            <td>" . $header->date . "</td>";
-        print "            <td>" . $header->Size . "</td>";
-        print "            <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
-        print "        </tr>\n";
+        print "    <tr>\n";
+        print "        <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
+        print "        <td>" . $header->toaddress . "</td>";
+        print "        <td>" . htmlspecialchars(iconv_mime_decode($header->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8'), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
+        print "        <td>" . $header->date . "</td>";
+        print "        <td>" . $header->Size . "</td>";
+        print "        <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
+        print "    </tr>\n";
     }
 }
 ?>