Gracefully recover from over quota error while sending a mail (#1145144):

when an quota error occurs we can't redirect properly ("Warning: headers
already sent"), so provide a link to the redirected page instead.

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

diff --git a/ChangeLog b/ChangeLog
index d056282a783ce2a4c628d643bcab85bb2c3fbafa..31e11c554e5bcb5d8b8b402ea944dacc4fd2c219 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -352,6 +352,7 @@ Version 1.5.1 -- CVS
   - Modified mercury32 preset in order to remove INBOX prefix in mercury32 4.01.
   - Added peardb backend to change_password plugin.
   - Tweak IMAP connection error display (#1203154).
   - Modified mercury32 preset in order to remove INBOX prefix in mercury32 4.01.
   - Added peardb backend to change_password plugin.
   - Tweak IMAP connection error display (#1203154).

+  - Gracefully recover from over quota error while sending a mail (#1145144).

 
 Version 1.5.0 - 2 February 2004
 -------------------------------
 
 Version 1.5.0 - 2 February 2004
 -------------------------------

diff --git a/src/compose.php b/src/compose.php
index 53581cb83a268fd09e2b3e3edb60d65d1e29e447..20f107918fe64444e23885ec5eb1b6a967cbbee1 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -382,11 +382,24 @@ if ($draft) {
             sqimap_logout($imap_stream);
         }
         if ($compose_new_win == '1') {
             sqimap_logout($imap_stream);
         }
         if ($compose_new_win == '1') {

-            Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
+            if ( !isset($pageheader_sent) || !$pageheader_sent ) {
+                Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
+            } else {
+                echo '   <br><br><center><a href="' . $location
+                    . '/compose.php?saved_sent=yes&amp;session=' . $composesession . '">'
+                    . _("Return") . '</a></center>';
+            }            

             exit();
         } else {
             exit();
         } else {

-            Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) .
+            if ( !isset($pageheader_sent) || !$pageheader_sent ) {
+                Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) .

                    "&startMessage=1&note=".urlencode($draft_message));
                    "&startMessage=1&note=".urlencode($draft_message));

+            } else {
+                echo '   <br><br><center><a href="' . $location
+                    . '/right_main.php?mailbox=' . urlencode($draft_folder)
+                    . '&amp;startMessage=1&amp;note=' . urlencode($draft_message) .'">'
+                    . _("Return") . '</a></center>';
+            }            

             exit();
         }
     }
             exit();
         }
     }


@@ -461,10 +474,25 @@ if ($send) {
             sqimap_logout($imap_stream);
         }
         if ($compose_new_win == '1') {
             sqimap_logout($imap_stream);
         }
         if ($compose_new_win == '1') {

-            Header("Location: $location/compose.php?mail_sent=yes");
-        }else {
-            Header("Location: $location/right_main.php?mailbox=$urlMailbox".
-                   "&startMessage=$startMessage&mail_sent=yes");
+            if ( !isset($pageheader_sent) || !$pageheader_sent ) {
+                Header("Location: $location/compose.php?mail_sent=yes");
+            } else {
+                echo '   <br><br><center><a href="' . $location
+                    . '/compose.php?mail_sent=yes">'
+                    . _("Return") . '</a></center>';
+            }
+            exit();
+        } else {
+            if ( !isset($pageheader_sent) || !$pageheader_sent ) {
+                Header("Location: $location/right_main.php?mailbox=$urlMailbox".
+                    "&startMessage=$startMessage&mail_sent=yes");
+            } else {
+                echo '   <br><br><center><a href="' . $location
+                    . "/right_main.php?mailbox=$urlMailbox"
+                    . "&amp;startMessage=$startMessage&amp;mail_sent=yes\">"
+                    . _("Return") . '</a></center>';
+            }
+            exit();

         }
     } else {
         if ($compose_new_win == '1') {
         }
     } else {
         if ($compose_new_win == '1') {


@@ -1631,4 +1659,4 @@ function deliverMessage($composeMessage, $draft=false) {
 }
 
 // vim: et ts=4
 }
 
 // vim: et ts=4

-?>
\ No newline at end of file
+?>