SF.net SVN: postfixadmin:[816] trunk

[<Gin...@us...>]

Revision: 816
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=816&view=rev
Author:   GingerDog
Date:     2010-03-24 13:01:36 +0000 (Wed, 24 Mar 2010)

Log Message:
-----------
see #2915887 - minor related changes

Modified Paths:
--------------
    trunk/edit-alias.php
    trunk/edit-domain.php
    trunk/edit-mailbox.php
    trunk/edit-vacation.php
    trunk/list-virtual.php
    trunk/smarty.inc.php

Modified: trunk/edit-alias.php
===================================================================
--- trunk/edit-alias.php	2010-03-24 12:43:51 UTC (rev 815)
+++ trunk/edit-alias.php	2010-03-24 13:01:36 UTC (rev 816)
@@ -165,15 +165,14 @@
       }
    }
 }
+// never used?
+//$fDomain = htmlentities($fDomain, ENT_QUOTES);
 
-$fAddress = htmlentities($fAddress, ENT_QUOTES);
-$fDomain = htmlentities($fDomain, ENT_QUOTES);
-
 $array = preg_split ('/,/', $tGoto);
 // TOCHECK
 $array = $alias_list;
 
-$smarty->assign ('fAddress', $fAddress, false);
+$smarty->assign ('fAddress', $fAddress);
 $smarty->assign ('array', $array, false);
 $smarty->assign ('tMessage', $tMessage, false);
 $smarty->assign ('smarty_template', 'edit-alias');

Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php	2010-03-24 12:43:51 UTC (rev 815)
+++ trunk/edit-domain.php	2010-03-24 13:01:36 UTC (rev 816)
@@ -114,17 +114,15 @@
 }
 
 $smarty->assign ('domain', $domain);
-$smarty->assign ('tDescription', htmlspecialchars($tDescription, ENT_QUOTES), false);
+$smarty->assign ('tDescription', $tDescription);
 $smarty->assign ('tAliases', $tAliases);
 $smarty->assign ('tMailboxes', $tMailboxes);
 $smarty->assign ('tMaxquota', $tMaxquota);
-$smarty->assign ('select_options', select_options ($CONF ['transport_options'], array ($tTransport)), false);
+$smarty->assign ('select_options', select_options($CONF['transport_options'], array($tTransport)), false);
 if ($tBackupmx)	$smarty->assign ('tBackupmx', ' checked="checked"');
 if ($tActive)	$smarty->assign ('tActive', ' checked="checked"');
 $smarty->assign ('tMessage', $tMessage,false);
 $smarty->assign ('smarty_template', 'admin_edit-domain');
 $smarty->display ('index.tpl');
 
-
 /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>

Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php	2010-03-24 12:43:51 UTC (rev 815)
+++ trunk/edit-mailbox.php	2010-03-24 13:01:36 UTC (rev 816)
@@ -177,9 +177,7 @@
 
 $smarty->assign ('fUsername', $fUsername);
 $smarty->assign ('fPassword', $user_details ['password'], false);
-//$smarty->assign ('pEdit_mailbox_username_text', $pEdit_mailbox_username_text);
 $smarty->assign ('pEdit_mailbox_password_text', $pEdit_mailbox_password_text, false);
-//$smarty->assign ('tName', htmlspecialchars ($tName,ENT_QUOTES));
 $smarty->assign ('tName', $tName, false);
 $smarty->assign ('pEdit_mailbox_name_text', $pEdit_mailbox_name_text,false);
 $smarty->assign ('tMaxquota', $tMaxquota);

Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php	2010-03-24 12:43:51 UTC (rev 815)
+++ trunk/edit-vacation.php	2010-03-24 13:01:36 UTC (rev 816)
@@ -209,8 +209,8 @@
 	$tActiveUntil = date ("Y-m-d");
 	
 $smarty->assign ('tUseremail', $tUseremail);
-$smarty->assign ('tSubject', htmlentities(stripslashes($tSubject), ENT_QUOTES, 'UTF-8'),false);
-$smarty->assign ('tBody', htmlentities(stripslashes($tBody), ENT_QUOTES , 'UTF-8'),false);
+$smarty->assign ('tSubject', $tSubject);
+$smarty->assign ('tBody', $tBody ,false);
 $smarty->assign ('tMessage', $tMessage, false);
 $smarty->assign ('tActiveFrom',  date ("d.m.Y", strtotime ($tActiveFrom)));
 $smarty->assign ('tActiveUntil',  date ("d.m.Y", strtotime ($tActiveUntil)));

Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php	2010-03-24 12:43:51 UTC (rev 815)
+++ trunk/list-virtual.php	2010-03-24 13:01:36 UTC (rev 816)
@@ -435,7 +435,7 @@
 $smarty->assign ('nav_bar_alias', array ('top' => $nav_bar_alias->display_top (), 'bottom' => $nav_bar_alias->display_bottom ()), false);
 $smarty->assign ('nav_bar_mailbox', array ('top' => $nav_bar_mailbox->display_top (), 'bottom' => $nav_bar_mailbox->display_bottom ()), false);
 
-$smarty->assign ('fDomain', $fDomain);
+$smarty->assign ('fDomain', $fDomain, false);
 
 $smarty->assign ('list_domains', $list_domains);
 $smarty->assign ('limit', $limit);

Modified: trunk/smarty.inc.php
===================================================================
--- trunk/smarty.inc.php	2010-03-24 12:43:51 UTC (rev 815)
+++ trunk/smarty.inc.php	2010-03-24 13:01:36 UTC (rev 816)
@@ -22,7 +22,7 @@
      * */
     public function sanitise($data) {
         if(!is_array($data)) {
-            return htmlentities($data, ENT_QUOTES, 'UTF-8');
+            return htmlentities($data, ENT_QUOTES, 'UTF-8', false);
         }
         if(is_array($data)) {
             $clean = array();


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