Changeset 3289 for branches/2.2/expressoMail1_2/inc/class.exporteml.inc.php

Timestamp:

09/24/10 16:20:17 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #1275 - anexos com caracteres especiais convertidos para underline.

File:

• branches/2.2/expressoMail1_2/inc/class.exporteml.inc.php (modified) (3 diffs)

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

@@ -91 +91 @@
         function createFileZip($files, $tempDir){               
                 $tmp_zip_filename = "email_".$_SESSION[ 'phpgw_session' ][ 'session_id' ].".zip";
-                $command = "cd " . escapeshellarg($tempDir) . " && nice zip -m9 " . escapeshellarg($tmp_zip_filename) . " " .  escapeshellcmd($files);
+                
+                if (!empty($files))
+                {
+                    if (is_array($files))
+                    {
+                        for ($i=0; $i < count($files); $i++)
+                        {
+                            $files[$i] = escapeshellarg($files[$i]);
+                        }
+                        $files = implode(' ', $files);
+                    }
+                    else
+                    {
+                        $files = escapeshellcmd($files);
+                    }
+                }
+                
+                $command = "cd " . escapeshellarg($tempDir) . " && nice zip -m9 " . escapeshellarg($tmp_zip_filename) . " " .  $files;
                 if(!exec($command)) {
-                        $command = "cd " .  escapeshellarg($tempDir) . " && rm ".escapeshellcmd($files)." ". escapeshellarg($tmp_zip_filename);
+                        $command = "cd " .  escapeshellarg($tempDir) . " && rm ".$files." ". escapeshellarg($tmp_zip_filename);
                         exec($command);
                         return null;
@@ -464 +481 @@
                 $imap_attachment = new imap_attachment();
                 $attachments = $imap_attachment->download_attachment($this->mbox_stream, $id_number);
-                foreach($attachments as $i => $attachment){
-                        if($i && $i == 'names')
-                                continue;
-                                                                                                                                                
+                
+                $fileNames = Array();
                         
-                        $fileName = $this->remove_accents($attachment['name']);
+                for ($i = 0; $i < count($attachments); $i++)
+                {
+                   $attachments[$i]['name'] = $this->remove_accents($attachments[$i]['name']);
+                   $fileNames[$i] = $attachments[$i]['name'];
+                }
+
+                for ($i = 0; $i < count($attachments); $i++)
+                {
+                        $fileName = $attachments[$i]['name'];
+                        $result = array_keys($fileNames, $fileName);
+
+                        // Detecta duplicatas
+                        if (count($result) > 1)
+                        {
+                            for ($j = 1; $j < count($result); $j++)
+                            {
+                                $replacement = '('.$j.')$0';
+                                if (preg_match('/\.\w{2,4}$/', $fileName))
+                                {
+                                    $fileNames[$result[$j]] = preg_replace('/\.\w{2,4}$/', $replacement, $fileName);
+                                }
+                                else
+                                {
+                                    $fileNames[$result[$j]] .= "($j)";
+                                }
+                                $attachments[$result[$j]]['name'] = $fileNames[$result[$j]];
+                            }
+                        }
+                        // Fim detecta duplicatas
+
                         $f = fopen($tempDir . '/'.$tempSubDir.'/'.$fileName,"wb");
                         if(!$f)
                                 return False;                   
                                                 
-                        $fileNames .= "'".$fileName."' ";
-                        $fileContent = imap_fetchbody($this->mbox_stream, $id_number,$attachment['pid'], FT_UID);
-                        if($attachment['encoding'] == 'base64')
+                        $fileContent = imap_fetchbody($this->mbox_stream, $id_number,$attachments[$i]['pid'], FT_UID);
+                        if($attachments[$i]['encoding'] == 'base64')
                                 fputs($f,imap_base64($fileContent));
                         else            
@@ -487 +530 @@
                 $nameFileZip = '';
                 
-                if($fileNames) {
+                if(!empty($fileNames)) {
                         $nameFileZip = $this -> createFileZip($fileNames, $tempDir . '/'.$tempSubDir);                                          
                         if($nameFileZip)