fixes from trunk - r385:387

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.2.1@390 a1433add-5e2c-0410-b055-b7f2511e0802

VIRTUAL_VACATION/INSTALL.TXT

@@ -23,7 +23,7 @@ You need to have the following installed to be able to use Virtual Vacation.
 
 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.
 

edit-mailbox.php

@@ -153,6 +153,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
       $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'];
       }

templates/edit-vacation.php

@@ -20,12 +20,12 @@ window.location="<?php print $fCanceltarget; ?>"
    </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>