Fixed some string issues.

[squirrelmail.git] / src / move_messages.php

diff --git a/src/move_messages.php b/src/move_messages.php
index 684e63c5bb00bd1976a27c5dcb2e083795ce388a..9829f0c4e8ededc4648c8b51ce672e132f88a94c 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -11,10 +11,15 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/display_messages.php');
-require_once('../functions/imap.php');
-require_once('../functions/html.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/display_messages.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/html.php');
+
 global $compose_new_win;
 
 function putSelectedMessagesIntoString($msg) {
@@ -96,7 +101,7 @@ function attachSelectedMessages($msg, $imapConnection) {
                $localfilename = GenerateRandomString(32, 'FILE', 7);
                $full_localfilename = "$hashed_attachment_dir/$localfilename";
                
-               $fp = fopen( $full_localfilename, 'w');
+               $fp = fopen( $full_localfilename, 'wb');
                fwrite ($fp, $body);
                fclose($fp);
                $newAttachment = array();
@@ -147,7 +152,7 @@ if(isset($expungeButton)) {
         //    loop because we never increment j.  so check to see if msg[0] is set or not to fix this.
         while ($j < count($msg)) {
             if ($msg[$i]) {
-                sqimap_messages_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted");
+                sqimap_messages_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted", true);
                 $j++;
             }
             $i++;
@@ -168,9 +173,9 @@ if(isset($expungeButton)) {
         while ($j < count($msg)) {
             if (isset($msg[$i])) {
                 if (isset($markRead)) {
-                    sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+                    sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Seen", true);
                 } else if (isset($markUnread)) {
-                    sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+                    sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen", true);
                 } else if (isset($attache)) {
                    break;
                 } else  {
@@ -210,7 +215,7 @@ if(isset($expungeButton)) {
             if (isset($msg[$i])) {
                 /** check if they would like to move it to the trash folder or not */
                 sqimap_messages_copy($imapConnection, $msg[$i], $msg[$i], $targetMailbox);
-                sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted");
+                sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted", true);
                 $j++;
             }
             $i++;