Be somewhat clearer in the error message: default_pref not readable

[squirrelmail.git] / functions / mime.php

diff --git a/functions/mime.php b/functions/mime.php
index f912e8085e6528a368e52d59afa1795b63fab941..a312c831c2a4e63d04f5ca0bc8efe3b6ba16efcd 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -134,14 +134,12 @@ function mime_fetch_body($imap_stream, $id, $ent_id) {
         echo   '<tt><br>' .
                '<table width="80%"><tr>' .
                '<tr><td colspan=2>' .
-               _("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!") .
-               " <A HREF=\"../src/retrievalerror.php?$par\"><br>" .
-               _("Submit message") . '</A><BR>&nbsp;' .
+               _("Body retrieval error. The reason for this is most probably that the message is malformed.") .
                '</td></tr>' .
-               '<td><b>' . _("Command:") . "</td><td>$cmd</td></tr>" .
-               '<td><b>' . _("Response:") . "</td><td>$response</td></tr>" .
-               '<td><b>' . _("Message:") . "</td><td>$message</td></tr>" .
-               '<td><b>' . _("FETCH line:") . "</td><td>$topline</td></tr>" .
+               '<tr><td><b>' . _("Command:") . "</td><td>$cmd</td></tr>" .
+               '<tr><td><b>' . _("Response:") . "</td><td>$response</td></tr>" .
+               '<tr><td><b>' . _("Message:") . "</td><td>$message</td></tr>" .
+               '<tr><td><b>' . _("FETCH line:") . "</td><td>$topline</td></tr>" .
                "</table><BR></tt></font><hr>";
 
         $data = sqimap_run_command ($imap_stream, "FETCH $passed_id BODY[]", true, $response, $message, $uid_support);
@@ -456,7 +454,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
                      . "&amp;passed_id=$id&amp;mailbox=$urlMailbox"
                      . '&amp;ent_id='.$ent.$passed_ent_id_link;
         if ($where && $what) {
-           $defaultlink = '&amp;where='. urlencode($where).'&amp;what='.urlencode($what);
+           $defaultlink .= '&amp;where='. urlencode($where).'&amp;what='.urlencode($what);
         }
         /* This executes the attachment hook with a specific MIME-type.
          * If that doesn't have results, it tries if there's a rule
@@ -628,9 +626,9 @@ function find_ent_id($id, $message) {
             $ret = find_ent_id($id, $message->entities[$i]);
         } else {
             if (strcasecmp($message->entities[$i]->header->id, $id) == 0) {
-                if (sq_check_save_extension($message->entities[$i])) {
+//                if (sq_check_save_extension($message->entities[$i])) {
                     return $message->entities[$i]->entity_id;
-                } 
+//                } 
             }
         }
     }