Changeset 6171 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

05/14/12 12:29:34 (12 years ago)

Author:

cristiano

Message:

Ticket #2314 - Reutilização da conexão IMAP

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (6 diffs)

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

@@ -29 +29 @@
         var $ldap;
         var $mbox;
-        var $mboxFolder;
+    var $mboxFolder;
         var $imap_port;
         var $has_cid;
@@ -39 +39 @@
         var $rawMessage;
         var $folders;
-        var $cache = false;
-        var $useCache = false;
-        var $expirationCache = false;
+        var $cache = false;
+        var $useCache = false;
+        var $expirationCache = false;
+
         
         function imap_functions (){
@@ -84 +85 @@
         // BEGIN of functions.
         function open_mbox( $folder = false, $force_die = true)
-        {
-            $this->mboxFolder =  mb_convert_encoding($folder, 'UTF7-IMAP','UTF-8, ISO-8859-1, UTF7-IMAP');
+        {       
+                        $newFolder = mb_convert_encoding($folder, 'UTF7-IMAP','UTF-8, ISO-8859-1, UTF7-IMAP');
+                
+                        if($newFolder ===  $this->mboxFolder && is_resource( $this->mbox ))
+                                return $this->mbox;
+                        
+            $this->mboxFolder =  $newFolder;
             $url = '{'.$this->imap_server.":".$this->imap_port.$this->imap_options.'}'.$this->mboxFolder;
             
@@ -4892 +4898 @@
                                 $return['msgs'][$i]['from'] = '';
                                 
-                                $from = $msg->from[0]->mailbox;
-                                if($msg->from[0]->personal != "")
-                                        $from = $msg->from[0]->personal;
-                                $return['msgs'][$i]['from']     = mb_convert_encoding($this->decode_string($from), 'UTF-8'); 
+                                if(isset($msg->from[0]))
+                                {
+                                        $from = self::formatMailObject( $msg->from[0] );
+                                        $return['msgs'][$i]['from']     = mb_convert_encoding($from['name'] ? $from['name'] : $from['email'], 'UTF-8');
+                                }
+                                else
+                                        $return['msgs'][$i]['from']     = ''; 
                                 
                                 $return['msgs'][$i]['subject'] = ' ';
@@ -4905 +4914 @@
                                 $filter = array('AND', array('=', 'folderName', $folder), array('=','messageNumber', $v));
                                 $followupflagged = Controller::find(
-                                        array('concept' => 'followupflagged'),
+                                        array('concept' => 'followupflagged' , 'folder' => $folder ),
                                         false, 
                                         array('filter' => $filter, 'criteria' => array('deepness' => '2'))
@@ -4922 +4931 @@
                                         array('filter' => $filter, 'criteria' => array('deepness' => '2'))
                                 );
+                                if(is_array($labeleds))
                                 foreach ($labeleds as $e){
                                         $labels = Controller::read( array( 'concept' => 'label', 'id' =>  $e['labelId']));