SF.net SVN: postfixadmin:[1342] branches/postfixadmin-2.3

[<chr...@us...>]

Revision: 1342
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1342&view=rev
Author:   christian_boltz
Date:     2012-02-02 19:49:30 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
templates/list-virtual, templates/admin_list-domain:
- display domain and mailbox description with correct encoding
  This fixes a regression in 2.3.5
  https://sourceforge.net/projects/postfixadmin/forums/forum/676076/topic/4977778

Modified Paths:
--------------
    branches/postfixadmin-2.3/CHANGELOG.TXT
    branches/postfixadmin-2.3/templates/admin_list-domain.php
    branches/postfixadmin-2.3/templates/list-virtual.php

Modified: branches/postfixadmin-2.3/CHANGELOG.TXT
===================================================================
--- branches/postfixadmin-2.3/CHANGELOG.TXT	2012-01-27 19:04:32 UTC (rev 1341)
+++ branches/postfixadmin-2.3/CHANGELOG.TXT	2012-02-02 19:49:30 UTC (rev 1342)
@@ -10,6 +10,11 @@
 # Last update:
 # $Id$
 
+changes since the 2.3.5 release (postfixadmin-2.3 branch)
+----------------------------------------------------------------
+
+  - display domain and mailbox description with correct encoding
+
 Version 2.3.5 - 2012/01/16 - SVN r1335 (postfixadmin-2.3 branch)
 ----------------------------------------------------------------
 

Modified: branches/postfixadmin-2.3/templates/admin_list-domain.php
===================================================================
--- branches/postfixadmin-2.3/templates/admin_list-domain.php	2012-01-27 19:04:32 UTC (rev 1341)
+++ branches/postfixadmin-2.3/templates/admin_list-domain.php	2012-02-02 19:49:30 UTC (rev 1342)
@@ -50,7 +50,7 @@
       {
          print "   <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
          print "<td><a href=\"list-virtual.php?domain=" . $domain_properties[$i]['domain'] . "\">" . $domain_properties[$i]['domain'] . "</a></td>";
-         print "<td>" . htmlentities($domain_properties[$i]['description']) . "</td>";
+         print "<td>" . htmlentities($domain_properties[$i]['description'], ENT_QUOTES, 'UTF-8') . "</td>";
          print "<td>" . $domain_properties[$i]['alias_count'] . " / " . $domain_properties[$i]['aliases'] . "</td>";
          print "<td>" . $domain_properties[$i]['mailbox_count'] . " / " . $domain_properties[$i]['mailboxes'] . "</td>";
          if ($CONF['quota'] == 'YES')

Modified: branches/postfixadmin-2.3/templates/list-virtual.php
===================================================================
--- branches/postfixadmin-2.3/templates/list-virtual.php	2012-01-27 19:04:32 UTC (rev 1341)
+++ branches/postfixadmin-2.3/templates/list-virtual.php	2012-02-02 19:49:30 UTC (rev 1342)
@@ -314,7 +314,7 @@
          }
 
 
-         print "      <td>" . htmlentities($tMailbox[$i]['name']) . "</td>\n";
+         print "      <td>" . htmlentities($tMailbox[$i]['name'], ENT_QUOTES, 'UTF-8') . "</td>\n";
          if ($CONF['quota'] == 'YES')
          {
             print "      <td>";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.