Changeset 3018 for branches/2.2/expressoMail1_2/inc/gotodownload.php

Timestamp:

07/08/10 17:52:20 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Aplicando alterações do branches 2.0 no branches 2.2

File:

• branches/2.2/expressoMail1_2/inc/gotodownload.php (modified) (2 diffs)

branches/2.2/expressoMail1_2/inc/gotodownload.php

@@ -12 +12 @@
         $msg_number = $_GET['msg_number'];
         $idx_file = $_GET['idx_file'];
-        $newfilename = $_GET['newfilename'];
+        $newfilename = urldecode($_GET['newfilename']);
         $msg_part = $_GET['msg_part'];
         $msg_folder = $_GET['msg_folder'];
@@ -171 +171 @@
                         if (preg_match("#^".ini_get('session.save_path')."/(".$GLOBALS['phpgw']->session->sessionid."/)*[A-z]+_".$GLOBALS['phpgw']->session->sessionid."[A-z0-9]*(\.[A-z]{3,4})?$#",$strFileName))
                         {
-                                readfile($strFileName);
-                                exec("rm -f ".escapeshellcmd(escapeshellarg($strFileName)));
+                                if (preg_match("#^".dirname( __FILE__ ) . '/../tmpLclAtt'."/source_#",$strFileName)) {
+                                        //avoid stuck request 
+                                        session_write_close(); 
+
+                                        //reset time limit for big files 
+                                        set_time_limit(0); 
+                                        ob_end_flush(); 
+
+                                        if ($fp = fopen ($strFileName, 'rb')) 
+                                        { 
+                                                $bufferSize=1024; 
+                                                for ($i=$bufferSize; $i<=(filesize($strFileName)+$bufferSize); $i+=$bufferSize)  
+                                                { 
+                                                        echo fread($fp, $i); 
+                                                        flush(); 
+                                                } 
+                                                fclose ($fp); 
+                                        } 
+                                        //readfile($strFileName);       
+
+                                        exec("rm -f ".escapeshellcmd(escapeshellarg($strFileName)));
+                                }
+                                else 
+                                        if (preg_match("#^".dirname( __FILE__ ) . '/../tmpLclAtt'."/source_#",$strFileName)) {
+                                                readfile($strFileName);
+                                        }
                         }
-                        else 
-                                if (preg_match("#^".dirname( __FILE__ ) . '/../tmpLclAtt'."/source_#",$strFileName)) {
-                                        readfile($strFileName);
-                                }
-        }
 ?>