Changeset 4457 for sandbox/2.2.0.2/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

05/19/11 13:38:13 (13 years ago)

Author:

airton

Message:

Ticket #1991 - Parametrizacao das buscas LDAP no ExpressoMail?

File:

• sandbox/2.2.0.2/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (5 diffs)

sandbox/2.2.0.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1425 +1425 @@
                 $regs_found = array(); 
                 $tags_found = @mb_eregi("<style\b[^>]*>(.*?)</style>", $body, $regs_found);
-                $wrapper_class = 'ExpressoCssWrapper'.time();
                 
                 foreach ($regs_found as $block_found) { 
@@ -1439 +1438 @@
                         $prefix = ".$wrapper_class "; 
                         foreach ($css->css[41] as $key => $value) {
-                        //explode multiple selectors per block
-                         $selectors = explode(',', $key);
-                        foreach ($selectors as $selector) {
-                                if (ereg('\*', $key)) {
-                                        //skip selecto '*'
-                                        continue;
-                                }
-
-                                $selector = eregi_replace('[^#\.]*body.*', '', $selector);
-                                $css->css[41][$prefix.trim($selector)] = $value;
-                        }
+                                                //explode multiple selectors per block 
+                                                $selectors = explode(',', $key); 
+                                                         
+                                    foreach ($selectors as $selector) { 
+                                        if (ereg('\*', $key)) { 
+                                                                //skip selecto '*' 
+                                            continue; 
+                                        } 
+                                                                 
+                                                        $selector = eregi_replace('[^#\.]*body.*', '', $selector); 
+                                                        $css->css[41][$prefix.trim($selector)] = $value; 
+                                    } 
                         unset($css->css[41][$key]);
                         }
@@ -2925 +2925 @@
                         $imagesParts[$value[6]] = $value[3];    
 
-                //Build Forwarding Attachments!!!       
-                foreach($forwarding_attachments as $forwarding_attachment)
+                //Build Forwarding Attachments!!!                    
+                foreach($forwarding_attachments as $forwarding_attachment) 
                 {
                         $file_description = unserialize(rawurldecode($forwarding_attachment));
-                        
-                        $file_description = array_values($file_description);
-                        foreach($file_description as $i => $descriptor){                                
-                                $file_description[$i] = eregi_replace('\'*\'','',$descriptor);
-                        }
-                        $fileContent = $this->get_forwarding_attachment($file_description[0], $file_description[1], $file_description[3],$file_description[4]);
-                        $fileName = $file_description[2];
-                        
-                        $file_description[5] = strlen($fileContent); //Size of file
-                        $return_forward[] = $file_description;
-                
-                        $mail->AddStringAttachment($fileContent, $fileName, $file_description[4], $this->get_file_type($file_description[2]));
+                        $file_description = array_values($file_description); 
+                                        
+                                foreach($file_description as $i => $descriptor){                                 
+                                                        $file_description[$i] = eregi_replace('\'*\'','',$descriptor); 
+                                                } 
+                                                $fileContent = $this->get_forwarding_attachment($file_description[0], $file_description[1], $file_description[3],$file_description[4]); 
+                                                $fileName = $file_description[2]; 
+                                                 
+                                                $file_description[5] = strlen($fileContent); //Size of file 
+                                                $return_forward[] = $file_description; 
+                                         
+                                                $mail->AddStringAttachment($fileContent, $fileName, $file_description[4], $this->get_file_type($file_description[2])); 
                 }
                 
@@ -3035 +3035 @@
                                 if (array_key_exists("name", $_attachment))
                                 {
-                                        //unset($return_files[$index]);
+                                        unset($return_files[$index]);
                                         $return_files[$index] = $_attachment['name']."_SIZE_".$return_files[$index][1] = $_attachment['size'];
                                 }
                                 else
                                 {
-                                        //unset($return_files[$index]);
+                                        unset($return_files[$index]);
                                         $return_files[$index] = $_attachment[2]."_SIZE_". $return_files[$index][1] = $_attachment[5];
                                 }
@@ -4103 +4103 @@
         if($timestamp){
                         $pdate = date_parse(date('r')); // pega a data atual do servidor (TODO: pegar a data da mensagem local) 
-                $file = $tempDir."imap_".$_SESSION[ 'phpgw_session' ][ 'session_id' ];          
                         $timestamp += $pdate['zone']*(60); //converte a data da mensagem para o fuso horário GMT 0. Isto é feito devido ao Expresso Mail armazenar a data no fuso horário GMT 0 e para exibi-la converte ela para o fuso horário local. 
-                                 
-                /* TODO: o diretorio /tmp deve ser substituido pelo diretorio temporario configurado no setup */ 
-                $file = "/tmp/sess_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]; 
+                        /* TODO: o diretorio /tmp deve ser substituido pelo diretorio temporario configurado no setup */ 
+                        $file = "/tmp/sess_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]; 
+                
                 $f = fopen($file,"w");
                 fputs($f,base64_encode($source));
-            fclose($f);
-            $command = "python ".$_SESSION['rootPatch']."/expressoMail1_2/imap.py ".escapeshellarg($imap_server)." ".escapeshellarg($imap_port)." ".escapeshellarg($username)." ".escapeshellarg($password)." ".escapeshellarg($timestamp)." ".escapeshellarg($folder)." ".escapeshellarg($file);
+            fclose($f);           
+                   $command = "python ".$_SESSION['rootPatch']."/expressoMail1_2/imap.py ".escapeshellarg($imap_server)." ".escapeshellarg($imap_port)." ".escapeshellarg($username)." ".escapeshellarg($password)." ".escapeshellarg($timestamp)." ".escapeshellarg($folder)." ".escapeshellarg($file);
             $return['command']=exec(escapeshellcmd($command));
         }else{