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

diff --git a/functions/mime.php b/functions/mime.php
index c9571e950e553a9b207f56fddcb6000523043bd4..90e32a90a727b51ef2f4399ef95655e61cfd9a06 100644 (file)
--- 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   '<b><font color=$color[2]>Body retrieval error. The reason for this is most probably that<BR> ' .
+                   'the message is malformed. Please help us making future versions<BR> ' .
+                   "better by submitting this message to the developers knowledgebase!<BR>\n" .
+                   "<A HREF=\"../src/retrievalerror.php?$par\">Submit message</A><BR>" .
+
+                   "<tt>Response:  $response<BR>" .
+                   "Message:  $message<BR>" .
+                   "FETCH line:  $topline<BR></tt></font></b>";
+
+            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 (file)
index 0000000..ac950ec
--- /dev/null
+++ b/src/retrievalerror.php
@@ -0,0 +1,94 @@
+<?php
+   require_once('../src/validate.php');
+   require_once("../functions/imap.php");
+   require_once("../functions/smtp.php");
+   require_once("../functions/page_header.php");
+   require_once("../src/load_prefs.php");
+
+   $destination = "retrievalerror@gm44c.xs4all.nl";
+
+   $attachments = array();
+
+
+   function ClearAttachments() {
+       global $attachments, $attachment_dir;
+
+       foreach ($attachments as $info) {
+           if (file_exists($attachment_dir . $info['localfilename'])) {
+               unlink($attachment_dir . $info['localfilename']);
+           }
+       }
+
+       $attachments = array();
+   }
+
+   $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+   sqimap_mailbox_select($imap_stream, $mailbox);
+   $sid = sqimap_session_id();
+   fputs ($imap_stream, "$sid FETCH $passed_id BODY[]\r\n");
+   $data = sqimap_read_data ($imap_stream, $sid, true, $response, $message);
+   sqimap_logout($imap_stream);
+   $topline2 = array_shift($data);
+   $thebastard = implode('', $data);
+
+
+
+   $localfilename = GenerateRandomString(32, '', 7);
+   while (file_exists($attachment_dir . $localfilename))
+       $localfilename = GenerateRandomString(32, '', 7);
+   // Write Attachment to file
+   $fp = fopen ($attachment_dir.$localfilename, 'w');
+   fputs ($fp, $thebastard);
+   fclose ($fp);
+
+   $newAttachment = array();
+   $newAttachment['localfilename'] = $localfilename;
+   $newAttachment['remotefilename'] = 'message.duh';
+   $newAttachment['type'] = 'application/octet-stream';
+   $attachments[] = $newAttachment;
+
+
+   $body = "Response: $response\n" .
+           "Message: $message\n" .
+           "FETCH line: $topline\n" .
+           "Server Type: $imap_server_type\n";
+
+   $imap_stream = fsockopen ($imapServerAddress, $imapPort, &$error_number, &$error_string);
+   $server_info = fgets ($imap_stream, 1024);
+   if ($imap_stream)
+   {
+       $body .=  "  Server info:  $server_info";
+       fputs ($imap_stream, "a001 CAPABILITY\r\n");
+       $read = fgets($imap_stream, 1024);
+       $list = explode(' ', $read);
+       array_shift($list);
+       array_shift($list);
+       $read = implode(' ', $list);
+       $body .= "  Capabilities:  $read";
+       fputs ($imap_stream, "a002 LOGOUT\r\n");
+       fclose($imap_stream);
+   }
+
+   $body .= "\nFETCH line for gathering the whole message: $topline2\n";
+
+
+   sendMessage($destination, "", "", "submitted message", $body, 0);
+
+
+
+
+   displayPageHeader($color, $mailbox);
+
+   $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";
+   }
+
+   echo '<BR>The message has been submitted to the developers knowledgebase!<BR>' .
+        'Thank you very much<BR>' .
+        'Please submit every message only once<BR>' .
+        "<A HREF=\"../src/read_body.php?$par\">View the message</A><BR>";
+
+?>