Changeset 2766 in subversion

Timestamp:

Jul 19, 2009 5:28:30 AM (4 years ago)

Author:

alec

Message:

• handle big attachments with file pointers to not exceed memory_limit in rcmail_save_attachment()

Location:

trunk/roundcubemail

Files:

• plugins/database_attachments/database_attachments.php (modified) (1 diff)
• plugins/filesystem_attachments/filesystem_attachments.php (modified) (1 diff)
• program/steps/mail/compose.inc (modified) (2 diffs)

trunk/roundcubemail/plugins/database_attachments/database_attachments.php

@@ -64 +64 @@
 
         $key = $this->_key($args['name']);
+
+        if ($args['path'])
+            $args['data'] = file_get_contents($args['path']);
+
         $data = base64_encode($args['data']);
 

trunk/roundcubemail/plugins/filesystem_attachments/filesystem_attachments.php

@@ -74 +74 @@
     {
         $args['status'] = false;
-        $rcmail = rcmail::get_instance();
-        $temp_dir = unslashify($rcmail->config->get('temp_dir'));
-        $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
+        
+        if (!$args['path']) {
+            $rcmail = rcmail::get_instance();
+            $temp_dir = unslashify($rcmail->config->get('temp_dir'));
+            $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
 
-        if ($fp = fopen($tmp_path, 'w')) {
-            fwrite($fp, $args['data']);
-            fclose($fp);
+            if ($fp = fopen($tmp_path, 'w')) {
+                fwrite($fp, $args['data']);
+                fclose($fp);
+                $args['path'] = $tmp_path;
+            } else
+                return $args;
+        }
+        
+        $args['id'] = count($_SESSION['plugins']['filesystem_attachments']['tmp_files'])+1;
+        $args['status'] = true;
             
-            $args['id'] = count($_SESSION['plugins']['filesystem_attachments']['tmp_files'])+1;
-            $args['path'] = $tmp_path;
-            $args['status'] = true;
-            
-            // Note the file for later cleanup
-            $_SESSION['plugins']['filesystem_attachments']['tmp_files'][] = $tmp_path;
-        }
+        // Note the file for later cleanup
+        $_SESSION['plugins']['filesystem_attachments']['tmp_files'][] = $args['path'];
 
         return $args;

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -602 +602 @@
 {
   global $OUTPUT;
-  
+echo "^^^^^";  
   $cid_map = array();
   foreach ((array)$message->mime_parts as $pid => $part)
@@ -644 +644 @@
 {
   $part = $message->mime_parts[$pid];
-  
+  $mem_limit = parse_bytes(ini_get('memory_limit'));
+  $curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
+  $data = $path = null;
+
+  // don't load too big attachments into memory
+  if ($mem_limit > 0 && $part->size > $mem_limit - $curr_mem) {
+    $rcmail = rcmail::get_instance();
+    $temp_dir = unslashify($rcmail->config->get('temp_dir'));
+    $path = tempnam($temp_dir, 'rcmAttmnt');
+    if ($fp = fopen($path, 'w')) {
+      $message->get_part_content($pid, $fp);
+      fclose($fp);
+    } else
+      return false;
+  } else {
+    $data = $message->get_part_content($pid);
+  }
+
   $attachment = array(
     'name' => $part->filename ? $part->filename : 'Part_'.$pid.'.'.$part->ctype_secondary,
     'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
     'content_id' => $part->content_id,
-    'data' => $message->get_part_content($pid),
+    'data' => $data,
+    'path' => $path
   );
   
   $attachment = rcmail::get_instance()->plugins->exec_hook('save_attachment', $attachment);
+
   if ($attachment['status']) {
     unset($attachment['data'], $attachment['status']);
     return $attachment;
-  }
-
+  } else if ($path) {
+    @unlink($path);
+  }
+  
   return false;
 }