Changeset 5372

Timestamp:

01/12/12 13:35:15 (12 years ago)

Author:

cristiano

Message:

Ticket #2440 - Correção de bugs set de flag seen automatica , tradução

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (6 diffs)
• setup/phpgw_pt-br.lang (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -207 +207 @@
         static function decodeMimeString( $string )
         {
-          return preg_replace_callback( '/\=\?([^\?]*)\?([qb])\?([^\?]*)\?=/i' ,array( self , 'decodeMimeStringCallback'), $string);
+          return preg_replace_callback( '/\=\?([^\?]*)\?([qb])\?([^\?]*)\?=/i' ,array( 'self' , 'decodeMimeStringCallback'), $string);
         }
       
@@ -288 +288 @@
             {
                 if($appendSample !== false && !isset($return['msg_sample'])) //verifica o msg_sample caso seja alterada a preferencia e não esteja em cache carregar
-                   $return['msg_sample'] = $this->get_msg_sample($msg_number);
+                {
+                    $return['msg_sample'] = $this->get_msg_sample($msg_number);
+                    $this->cache->set( 'infoHead://'.$this->username.'://'.$this->mboxFolder.'://'.$msg_number , $return , $this->expirationCache);
+                }
                
                 return $return;
             }
-            
+      
             $importance = array();
             $mimeHeader = imap_fetchheader( $this->mbox, $msg_number , FT_UID ); //Resgata o Mime Header da mensagem
-            $mimeBody = imap_body( $this->mbox, $msg_number  , FT_UID  ); //Resgata o Mime Body da mensagem
+            $mimeBody = imap_body( $this->mbox, $msg_number  , FT_UID|FT_PEEK  ); //Resgata o Mime Body da mensagem sem marcar como lida
             $offsetToGMT =  $this->functions->CalculateDateOffset();
             $return['ContentType'] = $this->getMessageType( $msg_number , $mimeHeader , $mimeBody ); 
@@ -308 +311 @@
             $return['subject']  =  ( isset($header->subject) && trim($header->subject) !== '' ) ?  self::decodeMimeString($header->subject) : $this->functions->getLang('(no subject)   ');
             $return['attachment'] = ( preg_match('/((Content-Disposition:(.)*(\r\n filename=|filename=))|(Content-Type:(.)*(\r\n name=|name=)))/', $mimeBody) ) ? '1' : '0'; //Verifica se a anexos na mensagem
-            $return['reply_toaddress'] = isset($header->reply_toaddress) ? $header->reply_toaddress : '';
+            $return['reply_toaddress'] = isset($header->reply_toaddress) ? self::decodeMimeString($header->reply_toaddress) : '';
             $return['flag'] = $header->Unseen.$header->Recent.$header->Flagged.$header->Draft.$header->Answered.$header->Deleted.( $return['attachment'] === '1' ? 'T': '' );
 
@@ -328 +331 @@
             if( $this->useCache === true )
                 $this->cache->set( 'infoHead://'.$this->username.'://'.$this->mboxFolder.'://'.$msg_number , $return , $this->expirationCache);
-            
+                        
             return $return;
         }
@@ -4424 +4427 @@
                                                         {
                                                                 $elem = $this->get_info_head_msg($new_search);
-                                                                
+                                                                $elem['udate']       = gmdate('d/m/Y', $elem['udate'] + $this->functions->CalculateDateOffset()); 
                                                                 $elem['boxname'] = mb_convert_encoding( $name_box, "ISO-8859-1", "UTF7-IMAP" ); 
                                                                 $elem['uid'] = $new_search;
@@ -4469 +4472 @@
                                     {
                                         foreach($search_criteria as $new_search)
-                                        {
+                                        {                                   
                                             $elem = $this->get_info_head_msg( $new_search );
+                                            $elem['udate']       = gmdate('d/m/Y', $elem['udate'] + $this->functions->CalculateDateOffset()); 
                                             $elem['boxname'] = mb_convert_encoding( $name_box, "ISO-8859-1", "UTF7-IMAP" ); 
                                             $elem['uid'] = $new_search;
                                             /* compare dates in ordering */
-                                            $elem['udatecomp'] = substr ($elem['udate'], -4) ."-". substr ($elem['udate'], 3, 2) ."-". substr ($elem['udate'], 0, 2);
+                                            $elem['udatecomp'] = substr ($elem['udate'], -4) ."-". substr ($elem['udate'], 3, 2) ."-". substr ($elem['udate'], 0, 2);                                                 
                                             $retorno[] = $elem;
                                         }

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -740 +740 @@
 Error marking messages. expressoMail1_2 pt-br   Erro ao marcar as mensagens.
 Error importing.        expressoMail1_2 pt-br   Erro ao Importar.
-Using cache for list of messages        admin   pt-br   Tempo maximo para listagem de mensagems ficar no cache
+Using cache for list of messages        admin   pt-br   Usar cache para lista de mensagens
 Maximum time for the list of messages keep in cache     admin   pt-br   Tempo maximo para listagem de mensagems ficar no cache