From a019eeb8401ccc6d9dcae41a4a558e19a8e60b71 Mon Sep 17 00:00:00 2001 From: teepe Date: Thu, 1 Nov 2001 00:39:47 +0000 Subject: [PATCH] changed the retrieval error: enabled submitting of messages git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1672 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mime.php | 33 +++++++++++---- src/retrievalerror.php | 94 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 8 deletions(-) create mode 100644 src/retrievalerror.php diff --git a/functions/mime.php b/functions/mime.php index c9571e95..90e32a90 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -405,15 +405,32 @@ } else if (ereg('"([^"]*)"', $topline, $regs)) { $ret = $regs[1]; } else { - $ret = "Body retrieval error. Please report this bug!\n" . - "Response: $response\n" . - "Message: $message\n" . - "FETCH line: $topline" . - "---------------\n$wholemessage"; - - foreach ($data as $d) { - $ret .= htmlspecialchars($d) . "\n"; + global $where, $what, $mailbox, $passed_id, $startMessage; + $par = "mailbox=".urlencode($mailbox)."&passed_id=$passed_id"; + if (isset($where) && isset($what)) { + $par .= "&where=".urlencode($where)."&what=".urlencode($what); + } else { + $par .= "&startMessage=$startMessage&show_more=0"; } + $par .= '&response='.urlencode($response).'&message='.urlencode($message). + '&topline='.urlencode($topline); + + echo 'Body retrieval error. The reason for this is most probably that
' . + 'the message is malformed. Please help us making future versions
' . + "better by submitting this message to the developers knowledgebase!
\n" . + "Submit message
" . + + "Response: $response
" . + "Message: $message
" . + "FETCH line: $topline
"; + + fputs ($imap_stream, "$sid FETCH $passed_id BODY[]\r\n"); + $data = sqimap_read_data ($imap_stream, $sid, true, $response, $message); + array_shift($data); + $wholemessage = implode('', $data); + + $ret = "---------------\n$wholemessage"; + } return( $ret ); } diff --git a/src/retrievalerror.php b/src/retrievalerror.php new file mode 100644 index 00000000..ac950ec7 --- /dev/null +++ b/src/retrievalerror.php @@ -0,0 +1,94 @@ +The message has been submitted to the developers knowledgebase!
' . + 'Thank you very much
' . + 'Please submit every message only once
' . + "View the message
"; + +?> -- 2.25.1