Fixed some string issues.

[squirrelmail.git] / src / draft_actions.php

diff --git a/src/draft_actions.php b/src/draft_actions.php
index a7295a91e45fcf50b32748e617fe55d89f17d5f1..3709b7327c0efbe2f140ea99533dbd21c0751360 100644 (file)
--- a/src/draft_actions.php
+++ b/src/draft_actions.php
@@ -9,7 +9,11 @@
  * $Id$
  */
 
-require_once ('../src/validate.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
 
 /* Print all the needed RFC822 headers */
 function write822HeaderForDraft ($fp, $t, $c, $b, $subject, $more_headers, $session) {
@@ -125,7 +129,7 @@ function writeBodyForDraft ($fp, $passedBody, $session) {
         $body .= $passedBody . "\r\n\r\n";
         fputs ($fp, $body);
 
-        $attachmentlength = attachFiles($fp);
+        $attachmentlength = attachFiles($fp, $session);
 
         if (!isset($postbody)) $postbody = "";
         $postbody .= "\r\n--".mimeBoundary()."--\r\n\r\n";
@@ -162,11 +166,11 @@ function saveMessageAsDraft($t, $c, $b, $subject, $body, $reply_id, $prio = 3, $
          $tmpDraftFile = "draft-" . GenerateRandomString(32, '', 7);
          $full_tmpDraftFile = "$hashed_attachment_dir/$tmpDraftFile";
     }
-    $fp = fopen($full_tmpDraftFile, 'w');
+    $fp = fopen($full_tmpDraftFile, 'wb');
 
     $headerlength = write822HeaderForDraft
-        ($fp, $t, $c, $b, $subject, $more_headers, FALSE, $session);
-    $bodylength = writeBodyForDraft ($fp, $body, FALSE, $session);
+        ($fp, $t, $c, $b, $subject, $more_headers, $session);
+    $bodylength = writeBodyForDraft ($fp, $body, $session);
     fclose($fp);
 
     $length = ($headerlength + $bodylength);
@@ -174,8 +178,8 @@ function saveMessageAsDraft($t, $c, $b, $subject, $body, $reply_id, $prio = 3, $
     if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
         sqimap_append ($imap_stream, $draft_folder, $length);
         write822HeaderForDraft
-            ($imap_stream, $t, $c, $b, $subject, $more_headers, TRUE, $session);
-        writeBodyForDraft ($imap_stream, $body, TRUE, $session);
+            ($imap_stream, $t, $c, $b, $subject, $more_headers, $session);
+        writeBodyForDraft ($imap_stream, $body, $session);
         sqimap_append_done ($imap_stream);
     }
     sqimap_logout($imap_stream);
@@ -187,4 +191,5 @@ function saveMessageAsDraft($t, $c, $b, $subject, $body, $reply_id, $prio = 3, $
     }
     return $length;
 }
+
 ?>