support for picking up the attachments in case of an expired session

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3214 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index a1f835f89193c54eaff5f5b41a4e37112c105627..35cbc53da803ea2c7eda8b86cab9c82f76ae64fe 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -129,6 +129,9 @@ if (session_is_registered('session_expired_post')) {
    }
    session_unregister('session_expired_post');
    session_unregister('session_expired');
    }
    session_unregister('session_expired_post');
    session_unregister('session_expired');

+   if (!isset($mailbox)) {
+      $mailbox = '';
+   }

    if ($compose_new_win == '1') {
       compose_Header($color, $mailbox);
    } else {
    if ($compose_new_win == '1') {
       compose_Header($color, $mailbox);
    } else {


@@ -159,8 +162,8 @@ if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) {
 
 if (isset($draft)) {
     include_once ('../src/draft_actions.php');
 
 if (isset($draft)) {
     include_once ('../src/draft_actions.php');

-    if (! isset($reply_id)) {
-         $reply_id = 0;
+    if (! isset($passed_id)) {
+         $passed_id = 0;

     }
     if (! isset($MDN)) {
         $MDN = 'False';
     }
     if (! isset($MDN)) {
         $MDN = 'False';


@@ -168,7 +171,7 @@ if (isset($draft)) {
     if (! isset($mailprio)) {
         $mailprio = '';
     }
     if (! isset($mailprio)) {
         $mailprio = '';
     }

-    if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id, $mailprio, $session)) {
+    if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $passed_id, $mailprio, $session)) {

         showInputForm($session);
         exit();
     } else {
         showInputForm($session);
         exit();
     } else {


@@ -201,8 +204,8 @@ if (isset($send)) {
     }
     if (checkInput(false) && !isset($AttachFailure)) {
         $urlMailbox = urlencode (trim($mailbox));
     }
     if (checkInput(false) && !isset($AttachFailure)) {
         $urlMailbox = urlencode (trim($mailbox));

-        if (! isset($reply_id)) {
-            $reply_id = 0;
+        if (! isset($passed_id)) {
+            $passed_id = 0;

         }
         /*
          * Set $default_charset to correspond with the user's selection
         }
         /*
          * Set $default_charset to correspond with the user's selection


@@ -242,10 +245,10 @@ if (isset($send)) {
         $MDN = False;  // we are not sending a mdn response
         if (! isset($mailprio)) {
             $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,
         $MDN = False;  // we are not sending a mdn response
         if (! isset($mailprio)) {
             $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,

-                                  $subject, $body, $reply_id, $MDN, '', $session);
+                                  $subject, $body, $passed_id, $MDN, '', $session);

         } else {
             $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,
         } else {
             $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,

-                                  $subject, $body, $reply_id, $MDN, $mailprio, $session);
+                                  $subject, $body, $passed_id, $MDN, $mailprio, $session);

         }
         if (! $Result) {
             showInputForm($session);
         }
         if (! $Result) {
             showInputForm($session);


@@ -371,41 +374,10 @@ elseif (isset($sigappend)) {
            unlink ($attached_file);
            unset ($attachments[$index]);
         }
            unlink ($attached_file);
            unset ($attachments[$index]);
         }

+        setPref($data_dir, $username, 'attachments', serialize($attachments));

     }
 
     showInputForm($session);
     }
 
     showInputForm($session);

-    
-} elseif (isset($attachedmessages)) {
-
-    /*
-     * This handles the case if we attache message 
-     */
-    if ($compose_new_win == '1') {
-        compose_Header($color, $mailbox);
-    } else {
-        displayPageHeader($color, $mailbox);
-    }
-
-    $newmail = true;
-
-    if (!isset($passed_ent_id)) $passed_ent_id = '';
-    if (!isset($passed_id)) $passed_id = '';    
-    if (!isset($mailbox)) $mailbox = '';
-    if (!isset($action)) $action = '';
-
-    $values = newMail($mailbox,$passed_id,$passed_ent_id, $action, $session);
-    /* in case the origin is not read_body.php */
-    if (isset($send_to)) {
-       $values['send_to'] = $send_to;
-    }
-    if (isset($send_to_cc)) {
-       $values['send_to_cc'] = $send_cc;
-    }
-    if (isset($send_to_bcc)) {
-       $values['send_to_bcc'] = $send_bcc;
-    }
-    
-    showInputForm($session, $values);

 } else {
     /*
      * This handles the default case as well as the error case
 } else {
     /*
      * This handles the default case as well as the error case


@@ -623,7 +595,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
 
 
 function getAttachments($message, $session, $passed_id, $entities, $imapConnection) {
 
 
 function getAttachments($message, $session, $passed_id, $entities, $imapConnection) {

-    global $attachments, $attachment_dir, $username;
+    global $attachments, $attachment_dir, $username, $data_dir;

     
     $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
     if (!count($message->entities) || 
     
     $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
     if (!count($message->entities) || 


@@ -663,6 +635,7 @@ function getAttachments($message, $session, $passed_id, $entities, $imapConnecti
             fclose ($fp);
 
             $attachments[] = $newAttachment;
             fclose ($fp);
 
             $attachments[] = $newAttachment;

+            setPref($data_dir, $username, 'javascript_on', $js_pref);

         }
     } else {
         for ($i = 0; $i < count($message->entities); $i++) {
         }
     } else {
         for ($i = 0; $i < count($message->entities); $i++) {


@@ -959,7 +932,8 @@ function checkInput ($show) {
 
 /* True if FAILURE */
 function saveAttachedFiles($session) {
 
 /* True if FAILURE */
 function saveAttachedFiles($session) {

-    global $HTTP_POST_FILES, $attachment_dir, $attachments, $username;
+    global $HTTP_POST_FILES, $attachment_dir, $attachments, $username,
+           $data_dir;

 
     $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
     $localfilename = GenerateRandomString(32, '', 7);
 
     $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
     $localfilename = GenerateRandomString(32, '', 7);


@@ -975,7 +949,6 @@ function saveAttachedFiles($session) {
             return true;
                }
        } else {
             return true;
                }
        } else {

-

                if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) {
                    return true;
                        }
                if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) {
                    return true;
                        }


@@ -990,14 +963,14 @@ function saveAttachedFiles($session) {
     if ($newAttachment['type'] == "") {
          $newAttachment['type'] = 'application/octet-stream';
     }
     if ($newAttachment['type'] == "") {
          $newAttachment['type'] = 'application/octet-stream';
     }

-

     $attachments[] = $newAttachment;
     $attachments[] = $newAttachment;

+    setPref($data_dir, $username, 'attachments', serialize($attachments));

 }
 
 
 function ClearAttachments($session)
 {
 }
 
 
 function ClearAttachments($session)
 {

-    global $username, $attachments, $attachment_dir;
+    global $username, $attachments, $attachment_dir, $data_dir;

     $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
 
     $rem_attachments = array();
     $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
 
     $rem_attachments = array();


@@ -1015,6 +988,7 @@ function ClearAttachments($session)
         }
     }
     $attachments = $rem_attachments;
         }
     }
     $attachments = $rem_attachments;

+    setPref($data_dir, $username, 'attachments', serialize($attachments));    

 }
 
 
 }