Changeset 2295

Timestamp:

03/18/10 15:14:48 (14 years ago)

Author:

amuller

Message:

Ticket #535 - Tentativa de usar menos memoria no phpmailer e smtp

Location:

trunk/expressoMail1_2/inc

Files:

• class.phpmailer.php (modified) (6 diffs)
• class.smtp.php (modified) (1 diff)

trunk/expressoMail1_2/inc/class.phpmailer.php

@@ -670 +670 @@
         }
         else
-                {
-                        $smtpSent = $this->smtp->Data($header . $body);
-                }
+        {
+                $smtpSent = $this->smtp->Data($header.$body);
+        }
 
         if(!$smtpSent)
@@ -712 +712 @@
                                 $header = substr($header, 0, $target) . $this->AddrAppend("Bcc", $this->bcc) . substr($header, $target);
                         }
-            $new_headerx = str_replace(chr(0x0A),chr(0x0D).chr(0x0A), $header);
-                        $new_bodyx = str_replace(chr(0x0A),chr(0x0D).chr(0x0A), $body);
-                        $new_header = str_replace(chr(0x0D).chr(0x0D).chr(0x0A), chr(0x0D).chr(0x0A),$new_headerx);
-                        $new_body = str_replace(chr(0x0D).chr(0x0D).chr(0x0A), chr(0x0D).chr(0x0A), $new_bodyx);
+                        $header = str_replace("\n","\r\n", $header);
+                        $header = str_replace("\r\r\n","\r\n",$header);
+                        $body = str_replace("\n","\r\n", $body);
+                        $body = str_replace("\r\r\n","\r\n",$body);
                         
                         if ($this->SaveMessageAsDraft){
-                                imap_append($mbox_stream, "{".$imap_server.":".$imap_port."}".$this->SaveMessageInFolder, $new_header . $new_body, "\\Seen \\Draft");
+                                imap_append($mbox_stream, "{".$imap_server.":".$imap_port."}".$this->SaveMessageInFolder, $header.$body, "\\Seen \\Draft");
                                 return true;
                         }
                         else
-                                imap_append($mbox_stream, "{".$imap_server.":".$imap_port."}".$this->SaveMessageInFolder, $new_header . $new_body, "\\Seen");
+                                imap_append($mbox_stream, "{".$imap_server.":".$imap_port."}".$this->SaveMessageInFolder, $header.$body, "\\Seen");
         }       
         
@@ -731 +731 @@
     {
         $mail_retorno = FALSE;
-        if ((strlen($email) >= 6) && (substr_count($email,"@") == 1) && (substr($email,0,1) != "@") && (substr($email,strlen($email)-1,1) != "@"))
+        if ((strlen($email) >= 2) && (substr_count($email,"@") == 1) && (substr($email,0,1) != "@") && (substr($email,strlen($email)-1,1) != "@"))
         {
             if ((!strstr($email,"'")) && (!strstr($email,"\"")) && (!strstr($email,"\\")) && (!strstr($email,"\$")) && (!strstr($email," ")))
@@ -741 +741 @@
                     $term_dom = substr(strrchr ($email, '.'),1);
                     //verifica se terminação do dominio esta correcta
-                    if (strlen($term_dom)>1 && strlen($term_dom)<5 && (!strstr($term_dom,"@")) )
+                    if (strlen($term_dom)>1 && strlen($term_dom)<9 && (!strstr($term_dom,"@")) )
                     {
                         $antes_dom = substr($email,0,strlen($email) - strlen($term_dom) - 1);
@@ -1331 +1331 @@
             }
             else
-            {
-                $mime[] = $this->EncodeFile($path, $encoding);                
+            {
+                $filename = $this->EncodeFile($path, $encoding);
+                $handle = fopen($filename,'r');
+                $mime[] = fread($handle, filesize($filename));;        
                 if($this->IsError()) { return ""; }
                 $mime[] = $this->LE.$this->LE;
@@ -1344 +1346 @@
     
     /**
-     * Encodes attachment in requested format.  Returns an
-     * empty string on failure.
+     * Encodes attachment in requested format.  Returns
+     * path os encoded file or null on failure.
      * @access private
      * @return string
      */
     function EncodeFile ($path, $encoding = "base64") {
-        if(!@$fd = fopen($path, "rb"))
+        if(!@$fh = fopen($path, "rb"))
         {
             $this->SetError($this->Lang("file_open") . $path);
-            return "";
+            return null;
         }
         $magic_quotes = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        $file_buffer = fread($fd, filesize($path));
-        $file_buffer = $this->EncodeString($file_buffer, $encoding);
-        fclose($fd);
-        set_magic_quotes_runtime($magic_quotes);
-
-        return $file_buffer;
+        set_magic_quotes_runtime(0);
+
+        $nameOut = ini_get("session.save_path").'/'."email_".$_SESSION[ 'phpgw_session' ][ 'session_id' ].".base64";
+        $fh2 = fopen($nameOut, 'wb');
+        if ($encoding != 'base64')
+        {
+                return false;
+                $file_buffer = fread($fh, filesize($path));
+                $file_buffer = $this->EncodeString($file_buffer, $encoding);
+                fwrite($fh2, $file_buffer);
+        }
+        else
+        {
+
+                $cache = '';
+                $eof = false;
+
+                while (1) {
+                        if (!$eof) {
+                                if (!feof($fh)) {
+                                        $row = fgets($fh, 4096);
+                                } else {
+                                        $row = '';
+                                        $eof = true;
+                                }
+                        }
+
+                        if ($cache !== '')
+                                $row = $cache.$row;
+                        elseif ($eof)
+                                break;
+
+                        $b64 = base64_encode($row);
+                        $put = '';
+
+                        if (strlen($b64) < 76) {
+                                if ($eof) {
+                                        $put = $b64."\n";
+                                        $cache = '';
+                                } else {
+                                        $cache = $row;
+                                }
+
+                        } elseif (strlen($b64) > 76) {
+                                do {
+                                        $put .= substr($b64, 0, 76)."\n";
+                                        $b64 = substr($b64, 76);
+                                } while (strlen($b64) > 76);
+
+                                $cache = base64_decode($b64);
+
+                        } else {
+                                if (!$eof && $b64{75} == '=') {
+                                        $cache = $row;
+                                } else {
+                                        $put = $b64."\n";
+                                        $cache = '';
+                                }
+                        }
+
+                        if ($put !== '')
+                                fputs($fh2, $put);
+                }
+        }
+        fclose($fh2);
+        fclose($fh); 
+
+        set_magic_quotes_runtime($magic_quotes);
+
+        return $nameOut;
+        //return $file_buffer;
     }
 

trunk/expressoMail1_2/inc/class.smtp.php

@@ -307 +307 @@
         $msg_data = str_replace("\r\n","\n",$msg_data);
         $msg_data = str_replace("\r","\n",$msg_data);
-        $lines = explode("\n",$msg_data);
+        $lines = preg_split("/\n/",$msg_data);
 
         # we need to find a good way to determine is headers are