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

Timestamp:

12/16/11 17:03:00 (12 years ago)

Author:

acoutinho

Message:

Ticket #2385 - Sem acao ao marcar flags em mensagens resultantes de pesquisa rapida

File:

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

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

@@ -378 +378 @@
         */
         function import_msgs($params) {
+                
+                ob_start();
+                print_r($params);
+                $output = ob_get_clean();
+                file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
+
+                
                 if(!$this->mbox)
                         $this->mbox = $this->open_mbox();
 
-                if( preg_match('/local_/',$params["folder"]) )
-                {
+                if( preg_match('/local_/',$params["folder"]) ){
+                        
                         // PLEASE, BE CAREFULL!!! YOU SHOULD USE EMAIL CONFIGURATION VALUES (EMAILADMIN MODULE)
                         $tmp_box = mb_convert_encoding('INBOX'.$this->imap_delimiter.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].$this->imap_delimiter.'tmpMoveToLocal', "UTF7-IMAP", "UTF-8");
-                        if ( ! imap_createmailbox( $this -> mbox,"{".$this -> imap_server."}$tmp_box" ) )
+                        if ( ! imap_createmailbox( $this->mbox,"{".$this -> imap_server."}$tmp_box" ) )
                                 return $this->functions->getLang( 'Import to Local : fail...' );
                         imap_reopen($this->mbox, "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$tmp_box);
                         $params["folder"] = $tmp_box;
                 }
+                
                 $errors = array();
                 $invalid_format = false;
                 $filename = $params['FILES'][0]['name'];
-                $params["folder"] = mb_convert_encoding($params["folder"], "UTF7-IMAP","ISO_8859-1");
+                $params["folder"] = mb_convert_encoding($params["folder"], "UTF7-IMAP","ISO-8859-1, UTF-8");
                 $quota = imap_get_quotaroot($this->mbox, $params["folder"]);
+                
                 if((($quota['limit'] - $quota['usage'])*1024) <= $params['FILES'][0]['size']){
                         return array( 'error' => $this->functions->getLang("fail in import:").
                                                         " ".$this->functions->getLang("Over quota"));
                 }
+                
                 if(substr($filename,strlen($filename)-4)==".zip") {
                         $zip = zip_open($params['FILES'][0]['tmp_name']);
-
                         if ($zip) {
                                 while ($zip_entry = zip_read($zip)) {
@@ -418 +427 @@
                                 zip_close($zip);
                         }
-
-                        if ( isset( $tmp_box ) && ! sizeof( $errors ) )
-                        {
-
+                        if (isset( $tmp_box ) && ! sizeof( $errors )){
                                 $mc = imap_check($this->mbox);
-
                                 $result = imap_fetch_overview( $this -> mbox, "1:{$mc -> Nmsgs}", 0 );
-
                                 $ids = array( );
                                 foreach ($result as $overview)
                                         $ids[ ] = $overview -> uid;
-
                                 return implode( ',', $ids );
                         }
-                        }
-                else if(substr($filename,strlen($filename)-4)==".eml") {
+                
+                }else if(substr($filename,strlen($filename)-4)==".eml") {
                         $email = implode("",file($params['FILES'][0]['tmp_name']));
-                        $status = @imap_append($this->mbox,
-                                                                "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$params["folder"],
-                                                                        $email
-                                                                        );
-                        if(!$status) {
-                                //TODO: remover zip_entry pois ele é tratado apenas ao importar mensagens zipadas
-                                array_push($errors,zip_entry_name($zip_entry));
-                                zip_entry_close($zip_entry);
-                        }
+                        $status = imap_append($this->mbox,"{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$params["folder"],$email);
+                        
+                        
+                        ob_start();
+                        var_dump($status);
+                        print($email);                  
+                        $output = ob_get_clean();
+                        file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
+                        
+                        if(!$status)
+                                return "Deu Pau :(";
                         
                         if ( isset( $tmp_box ) && ! sizeof( $errors ) ) {
@@ -457 +462 @@
                         }
                 }
-                else
-                {
+                else{
                         if ( isset( $tmp_box ) )
                                 imap_deletemailbox( $this->mbox,"{".$this -> imap_server."}$tmp_box" );
@@ -3830 +3834 @@
         }
 
+        
+        function set_messages_flag_from_search($params){                
+                $error = False;
+                $fileNames = "";
+                
+                $sel_msgs = explode(",", $params['msg_to_flag']);
+                @reset($sel_msgs);
+                $sorted_msgs = array();
+                foreach($sel_msgs as $idx => $sel_msg) {
+                        $sel_msg = explode(";", $sel_msg);
+                        if(array_key_exists($sel_msg[0], $sorted_msgs)){
+                                $sorted_msgs[$sel_msg[0]] .= ",".$sel_msg[1];
+                        }
+                        else {
+                                $sorted_msgs[$sel_msg[0]] = $sel_msg[1];
+                        }
+                }
+                unset($sorted_msgs['']);                        
+                $array_names_keys = array_keys($sorted_msgs);   
+                // Verifica se as n mensagens selecionadas
+                // se encontram em um mesmo folder
+                if (count($sorted_msgs)==1){
+                        $param['folder'] = $array_names_keys[0];
+                        $param['msgs_to_set'] = $sorted_msgs[$array_names_keys[0]];
+                        $param['flag'] = $params['flag'];
+                        $returns[0] = $this->set_messages_flag($param);
+                        return $returns;
+                }else{
+                        for($i = 0; $i < count($array_names_keys); $i++){ 
+                                $param['folder'] = $array_names_keys[$i];
+                                $param['msgs_to_set'] = $sorted_msgs[$array_names_keys[$i]];
+                                $param['flag'] = $params['flag'];
+                                $returns[$i] = $this->set_messages_flag($param);
+                }
+        }
+        return $returns;
+}
         function set_messages_flag($params)
-        {         
-                $folder = $params['folder'];
+        {               
+                $folder = mb_convert_encoding($params['folder'], "UTF7-IMAP","UTF-8, ISO-8859-1, UTF7-IMAP");
                 $msgs_to_set = $params['msgs_to_set'];
                 $flag = $params['flag'];
@@ -3840 +3881 @@
                 $return["msgs_not_to_set"] = "";
                         
-                if(!$this->mbox && !is_resource($this->mbox))
-                        $this->mbox = $this->open_mbox($folder);
+                $this->mbox = $this->open_mbox($folder);
                         
                 if ($flag == "unseen"){