Changeset 3414 for branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

10/26/10 14:18:29 (14 years ago)

Author:

brunocosta

Message:

Ticket #1276 - Limite de tamanho para exibição de partes text/plain ou text/html no Expresso mail

File:

• branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -934 +934 @@
                                                 && $file_type != 'attachment')
                                 {
+
+                                       
+                                       if($this->prefs['max_msg_size'] == "1")
+                                            $max_size = 1048576;
+                                        else
+                                            $max_size = 102400;
+
                                         if($file_type == "text/plain" && !$show_only_html && $has_multipart)
                                         {
                                                 // if TXT file size > 100kb, then it will not expand.
-                                                if(!($file_type == "text/plain" && $msg->fsize[$msg_number][$values] > 102400)) {
+                                                if(!($file_type == "text/plain" && $msg->fsize[$msg_number][$values] > $max_size)) {
                                                          $content .= htmlentities($this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values])); 
-                                 $content = '<pre>' . $content . '</pre>';    
+                                                        $content = '<pre>' . $content . '</pre>';
                                                 }
                                         }
                                         // if HTML attachment file size > 300kb, then it will not expand.
-                                        else if($file_type == "text/html"  && $msg->fsize[$msg_number][$values] < 307200)
+                                        else if($file_type == "text/html"  && $msg->fsize[$msg_number][$values] < $max_size*3)
                                         {
                                                 $content .= $this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]);