cacert/cacert-testmgr
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: cacert:bug-1396
Branches Tags
cacert:master
cacert:bug-932
cacert:bug-1396
cacert:bug-1391
cacert:bug-1390
cacert:AddPoints
..
compare: cacert:master
Branches Tags
cacert:master
cacert:bug-932
cacert:bug-1396
cacert:bug-1391
cacert:bug-1390
cacert:AddPoints

8 commits
bug-1396 ... master

Author SHA1 Message Date
Benny Baumann
13901dd1a1 Merge branch 'bug-932' 2015-09-08 22:32:10 +02:00
INOPIAE
870a936694 bug 932: adjusmtent of function iconv_mime_decode 2015-09-08 22:31:53 +02:00
Benny Baumann
7f20913d8b Merge branch 'bug-932' 2015-09-08 20:37:53 +02:00
INOPIAE
9987c02e3e bug 932: changed encoding function for subject 2015-08-20 20:56:49 +02:00
Benny Baumann
4e5c9dd72b Merge branch 'bug-932' 2015-08-09 22:52:44 +02:00
INOPIAE
269829b175 bug 932: added escaping with htmlspecialchars function for user name 2015-08-09 22:49:23 +02:00
INOPIAE
51d8dffac8 bug 932: added escaping with htmlspecialchars function and encoding UTF-8 for subject 2015-08-09 22:41:09 +02:00
Benny Baumann
8a5059809e Merge branch 'bug-1396' 2015-08-09 22:26:17 +02:00
3 changed files with 17 additions and 17 deletions
Show stats Expand all files Collapse all files

2
manager/application/views/helpers/UserInfo.php
View file

@ -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";

2
manager/application/views/scripts/mail/full.phtml
View file

@ -26,7 +26,7 @@ else {
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>" . 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>";

2
manager/application/views/scripts/mail/index.phtml
View file

@ -26,7 +26,7 @@ else {
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>" . 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>";