SF.net SVN: postfixadmin: [390] branches/postfixadmin-2.2.1

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

Revision: 390
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=390&view=rev
Author:   GingerDog
Date:     2008-06-17 14:40:33 -0700 (Tue, 17 Jun 2008)

Log Message:
-----------
fixes from trunk - r385:387

Modified Paths:
--------------
    branches/postfixadmin-2.2.1/VIRTUAL_VACATION/INSTALL.TXT
    branches/postfixadmin-2.2.1/edit-mailbox.php
    branches/postfixadmin-2.2.1/templates/edit-vacation.php

Modified: branches/postfixadmin-2.2.1/VIRTUAL_VACATION/INSTALL.TXT
===================================================================
--- branches/postfixadmin-2.2.1/VIRTUAL_VACATION/INSTALL.TXT	2008-06-17 21:31:16 UTC (rev 389)
+++ branches/postfixadmin-2.2.1/VIRTUAL_VACATION/INSTALL.TXT	2008-06-17 21:40:33 UTC (rev 390)
@@ -23,7 +23,7 @@
 
 About Virtual Vacation
 ----------------------
-Virual Vacation is today done with a local shell account that can receive
+Virtual Vacation is today done with a local shell account that can receive
 email. The email is then handled by a Perl script which sends the Vacation
 message back to the sender.
 

Modified: branches/postfixadmin-2.2.1/edit-mailbox.php
===================================================================
--- branches/postfixadmin-2.2.1/edit-mailbox.php	2008-06-17 21:31:16 UTC (rev 389)
+++ branches/postfixadmin-2.2.1/edit-mailbox.php	2008-06-17 21:40:33 UTC (rev 390)
@@ -153,6 +153,7 @@
       $formvars['active']=$sqlActive;
 
       $result = db_update ('mailbox', "username='$fUsername' AND domain='$fDomain'", $formvars, array('modified'));
+      $maildir = $user_details['maildir'];
       if ($result != 1 || !mailbox_postedit($fUsername,$fDomain,$maildir, $quota)) {
          $tMessage = $PALANG['pEdit_mailbox_result_error'];
       }

Modified: branches/postfixadmin-2.2.1/templates/edit-vacation.php
===================================================================
--- branches/postfixadmin-2.2.1/templates/edit-vacation.php	2008-06-17 21:31:16 UTC (rev 389)
+++ branches/postfixadmin-2.2.1/templates/edit-vacation.php	2008-06-17 21:40:33 UTC (rev 390)
@@ -20,12 +20,12 @@
    </tr>
    <tr>
       <td><?php print $PALANG['pUsersVacation_subject'] . ":"; ?></td>
-      <td><textarea class="flat" cols="60" name="fSubject" ><?php print htmlentities($tSubject, ENT_QUOTES, 'UTF-8'); ?></textarea></td>
+      <td><textarea class="flat" cols="60" name="fSubject" ><?php print htmlentities(stripslashes($tSubject), ENT_QUOTES, 'UTF-8'); ?></textarea></td>
       <td>&nbsp;</td>
    </tr>
    <tr>
       <td><?php print $PALANG['pUsersVacation_body'] . ":"; ?></td>
-      <td><textarea class="flat" rows="10" cols="60" name="fBody" ><?php print htmlentities($tBody, ENT_QUOTES , 'UTF-8'); ?></textarea></td>
+      <td><textarea class="flat" rows="10" cols="60" name="fBody" ><?php print htmlentities(stripslashes($tBody), 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.