SF.net SVN: postfixadmin: [200] trunk

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

Revision: 200
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=200&view=rev
Author:   christian_boltz
Date:     2007-11-05 13:23:37 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
edit-vacation.php
- fix double-encoded special characters if language file contains
  entity-encoded strings by html_entity_decode'ing the string
  (will be encoded in template file later)

edit-vacation.tpl:
- encode tSubject with htmlentities() in template

Modified Paths:
--------------
    trunk/edit-vacation.php
    trunk/templates/edit-vacation.tpl

Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php	2007-11-04 22:52:16 UTC (rev 199)
+++ trunk/edit-vacation.php	2007-11-05 21:23:37 UTC (rev 200)
@@ -76,8 +76,8 @@
 
    $tUseremail = $fUsername;
    $tDomain = $fDomain;
-   if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
-   if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
+   if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); }
+   if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); }
 
 }
 
@@ -103,8 +103,8 @@
    }
 
    $tUseremail = $fUsername;
-   if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
-   if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
+   if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); }
+   if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); }
 
    //if change, remove old one, then perhaps set new one
    if (!empty ($fBack) || !empty ($fChange))

Modified: trunk/templates/edit-vacation.tpl
===================================================================
--- trunk/templates/edit-vacation.tpl	2007-11-04 22:52:16 UTC (rev 199)
+++ trunk/templates/edit-vacation.tpl	2007-11-05 21:23:37 UTC (rev 200)
@@ -19,7 +19,7 @@
    </tr>
    <tr>
       <td><?php print $PALANG['pUsersVacation_subject'] . ":"; ?></td>
-      <td><textarea class="flat" cols="60" name="fSubject" ><?php print $tSubject; ?></textarea></td>
+      <td><textarea class="flat" cols="60" name="fSubject" ><?php print htmlentities($tSubject, ENT_QUOTES, 'UTF-8'); ?></textarea></td>
       <td>&nbsp;</td>
    </tr>
    <tr>


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