Changeset 5960

Timestamp:

04/17/12 16:34:36 (12 years ago)

Author:

adriano

Message:

Ticket #2633 - correcoes de codigos desatualizado inserido acidentamente no ultimo commit

File:

• trunk/prototype/services/ImapServiceAdapter.php (modified) (6 diffs)

trunk/prototype/services/ImapServiceAdapter.php

@@ -160 +160 @@
                                 for ($i=0; $i<count($result); $i++)
                                 {
-                                        $flags_enum = array('Recent', 'Unseen',  'Answered',  'Draft',  'Deleted', 'Flagged');
+                                        $flags_enum = array('Unseen'=> 1,  'Answered'=> 1, 'Forwarded'=> 1, 'Flagged'=> 1, 'Recent'=> 1, 'Draft'=> 1 ); 
 
                                         foreach ($flags_enum as $key => $flag)
                                         {
-                                                if ( !isset($result[$i][$flag]) || !trim($result[$i][$flag]) || trim($result[$i][$flag]) == '') 
-                                                        unset($flags_enum[$key]);
+                                                if ( !isset($result[$i][$key]) || !trim($result[$i][$key]) || trim($result[$i][$key]) == '')  
+                                                        $flags_enum[$key] = 0; 
 
                                                 unset($result[$i][$flag]);
@@ -176 +176 @@
                                                 $response["rows"][$i]['flags'] = implode(',', $flags_enum);
                                                 $response["rows"][$i]['size'] = $response["rows"][$i]['Size'];
+                                                $response["rows"][$i]['folder'] = $folder_name; 
                                                 //$response["rows"][$i]['udate'] = ( $result[$i]['udate'] + $this->functions->CalculateDateOffset()  * 1000 );
                                                 unset($response["rows"][$i]['Size']);
@@ -559 +560 @@
                                 $body = $data['body'];
                                 $body = str_replace("%nbsp;","&nbsp;",$body);
-                                $body = preg_replace("/\n/"," ",$body);
-                                $body = preg_replace("/\r/","" ,$body);
                                 $body = html_entity_decode ( $body, ENT_QUOTES , 'ISO-8859-1' );                                        
 
@@ -571 +570 @@
                                 $mailService->addHeaderField('Message-Id', UUID::generate( UUID::UUID_RANDOM, UUID::FMT_STRING ) . '@Draft');
 
-                                $mailService->addTo($data['input_to']);
-                                $mailService->addCc( $data['input_cc']);
-                                $mailService->addBcc($data['input_cco']);
-                                $mailService->setSubject($data['input_subject']);
+                                $mailService->addTo(mb_convert_encoding(($data['input_to']), 'ISO-8859-1', 'UTF-8,ISO-8859-1')); 
+                                $mailService->addCc( mb_convert_encoding(($data['input_cc']), 'ISO-8859-1', 'UTF-8,ISO-8859-1')); 
+                                $mailService->addBcc(mb_convert_encoding(($data['input_cco']), 'ISO-8859-1', 'UTF-8,ISO-8859-1')); 
+                                $mailService->setSubject(mb_convert_encoding(($data['input_subject']), 'ISO-8859-1', 'UTF-8,ISO-8859-1')); 
+                                
                                 if(isset($data['input_important_message']))
                                         $mailService->addHeaderField('Importance','High');
@@ -581 +581 @@
                                         $mailService->addHeaderField('Disposition-Notification-To', Config::me('mail'));
 
-                                $isHTML = ( ( array_key_exists( 'type', $data ) && in_array( strtolower( $data[ 'type' ] ), array( 'html', 'plain' ) ) ) ? strtolower( $data[ 'type' ] ) != 'plain' : true );
+                                $isHTML = ( isset($data['type']) && $data['type'] == 'html' )?  true : false;
 
                                 if (!$body) $body = ' ';
@@ -646 +646 @@
 
                                         if($data['uidsSave'] )
-                                        $this->delete_msgs(array('folder'=> $folder , 'msgs_number' => $data['uidsSave']));
+                                                $this->delete_msgs(array('folder'=> $folder , 'msgs_number' => $data['uidsSave']));
                                 }