integrated attachment_common into the core

[squirrelmail.git] / src / move_messages.php

diff --git a/src/move_messages.php b/src/move_messages.php
index 550213f8e42bd2200f107aa0209ee541dc15a482..06707724e2decc8fe4dcf631cd7a3940999b7db0 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -10,20 +10,9 @@
     **  $Id$
     **/
 
-   session_start();
-
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($display_messages_php))
-      include("../functions/display_messages.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-
-   include("../src/load_prefs.php");
+   require_once('../src/validate.php');
+   require_once('../functions/display_messages.php');
+   require_once('../functions/imap.php');
 
    function putSelectedMessagesIntoString($msg) {
       $j = 0;
@@ -90,7 +79,7 @@
    // If the delete button was pressed, the moveButton variable will not be set.
    elseif (!isset($moveButton)) {
       if (is_array($msg) == 1) {
-         // Marks the selected messages ad 'Deleted'
+         // Marks the selected messages as 'Deleted'
          $j = 0;
          $i = 0;
       
@@ -98,7 +87,13 @@
          //    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 (isset($msg[$i])) {
-               sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
+               if (isset($markRead)) {
+                  sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+               } else if (isset($markUnread)) {
+                   sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+               } else {
+                  sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
+               }
                $j++;
             }
             $i++;