From: tassium <tassium@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 6 Jan 2003 15:52:50 +0000 (+0000)
Subject: After sending the message, check $mailbox.  If it's "All Folders", we got to compose... 
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=4c8f834a283e1cab132d0f0dd4cf2862c9e7d743

After sending the message, check $mailbox.  If it's "All Folders", we got to compose via the search results page.  Set $mailbox back to INBOX, which seems a sane default to me.

Closes #662346.


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

diff --git a/src/compose.php b/src/compose.php
index d97a1048..6b604132 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -219,7 +219,6 @@ if (sqsession_is_registered('session_expired_post')) {
     if (!isset($mailbox)) {
         $mailbox = '';
     }
-
     if ($compose_new_win == '1') {
         compose_Header($color, $mailbox);
     } else {
@@ -298,6 +297,10 @@ if ($send) {
         $AttachFailure = saveAttachedFiles($session);
     }
     if (checkInput(false) && !isset($AttachFailure)) {
+		if ($mailbox == "All Folders") {
+			/* We entered compose via the search results page */
+			$mailbox="INBOX"; /* Send 'em to INBOX, that's safe enough */
+		}
         $urlMailbox = urlencode (trim($mailbox));
         if (! isset($passed_id)) {
             $passed_id = 0;