Changeset 4751

Timestamp:

07/14/11 16:58:20 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1820 - modificados headers passados para o user agent no download de anexos para arquivamento. r4595

File:

• trunk/expressoMail1_2/inc/gotodownload.php (modified) (3 diffs)

trunk/expressoMail1_2/inc/gotodownload.php

@@ -8 +8 @@
 }
 require_once '../../header.inc.php';
-        //TODO: alterar a string /tmp logo abaixo, pelo caminho temporario configurado no expresso       
-        $GLOBALS['phpgw_info']['server']['download_temp_dir'] = "/tmp"; 
+
 
         $msg_number = $_GET['msg_number'];
         $idx_file = $_GET['idx_file'];
-        $newfilename = html_entity_decode(rawurldecode($_GET['newfilename']));
+        $newfilename = html_entity_decode(rawurldecode($_GET['newfilename']));
         $msg_part = $_GET['msg_part'];
         $msg_folder = $_GET['msg_folder'];
@@ -163 +162 @@
                 header("Expires: 0"); // set expiration time
                 header ("Content-Disposition: attachment; filename=\"". addslashes($newFileName)."\"");
-                
-                if($fileContent) {
+                // No IE para que os nomes de arquivos com caracteres especiais no download fiquei corretos o nome deve ser codificado com urlencode.
+                 if (preg_match('/msie/i', $_SERVER['HTTP_USER_AGENT']))
+                        $newFileName=urlencode($newFileName);
+                if($fileContent) {
                         if($encoding == 'base64')
                                 echo imap_base64($fileContent);
@@ -173 +174 @@
                 }
                 else
-                {
-                        $tempDir = $GLOBALS['phpgw_info']['server']['download_temp_dir'];
-                        if (preg_match("#^".$tempDir."/(".$GLOBALS['phpgw']->session->sessionid."/)*[A-z0-9_]+_".$GLOBALS['phpgw']->session->sessionid."[A-z0-9]*(\.[A-z]{3,4})?$#",$strFileName))
+
+                        if (strstr($strFileName,$GLOBALS['phpgw']->session->sessionid)&&file_exists($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();
+                            header("Content-Type: $ContentType");
+                            header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+                            header("Pragma: public");
+                            header("Expires: 0"); // set expiration time
+                            header ("Content-Disposition: attachment; filename=\"". addslashes($newFileName)."\"");
+                            readfile($strFileName);
+                        }else{
+                            header("HTTP/1.1 404 Not Found");
+                        }
+
+
+                        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))
+                        {
+                                if ( ! preg_match("#^".dirname( __FILE__ ) . '/../tmpLclAtt'."/source_#",$strFileName)) {
+                                        //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);
                                         }
-                                        fclose ($fp);
+                                        //readfile($strFileName);
+
+                                        exec("rm -f ".escapeshellcmd(escapeshellarg($strFileName)));
                                 }
-
-                                //removendo pelo php, garante a suportabilidade cross-platform
-                                cleanup( dirname( $strFileName ) );
+                                else
+                                        readfile($strFileName);
                         }
-                        else 
-                        {
-                                if (preg_match("#^".dirname( __FILE__ ) . '/../tmpLclAtt'."/source_#",$strFileName)) {
-                                        readfile($strFileName);
-                                }
-                        }
-                }
         }
 ?>