Changeset 1000

Timestamp:

06/16/09 18:29:16 (15 years ago)

Author:

rafaelraymundo

Message:

Ticket #550 - Unificação de funcionalidade do SERPRO referentes ao arquivamento local.

Location:

trunk/expressoMail1_2

Files:

• imap.py (added)
• inc/class.exporteml.inc.php (modified) (7 diffs)
• inc/class.imap_functions.inc.php (modified) (7 diffs)
• js/TreeS.js (modified) (3 diffs)
• js/common_functions.js (modified) (2 diffs)
• js/doiMenuData.js (modified) (1 diff)
• js/draw_api.js (modified) (7 diffs)
• js/local_messages.js (modified) (7 diffs)
• js/main.js (modified) (6 diffs)
• js/messages_proxy.js (modified) (2 diffs)
• js/search.js (modified) (1 diff)
• setup (modified) (1 prop)
• setup/phpgw_pt-br.lang (modified) (previous)

trunk/expressoMail1_2/inc/class.exporteml.inc.php

@@ -44 +44 @@
         
         // create EML File.
-    function createFileEml($sEMLData, $tempDir, $id)  
+        // Funcao alterada para tratar a exportacao
+        // de mensagens arquivadas localmente.
+        // Rommel Cysne (rommel.cysne@serpro.gov.br)
+        // em 17/12/2008.
+        function createFileEml($sEMLData, $tempDir, $id, $subject=false, $i)
     {
         if($id)
@@ -54 +58 @@
                 $subject = substr($subject, 0, 59);
  
-            $subject = ereg_replace('/', '\'', $subject);            
+                        //$subject = ereg_replace('/', '\'', $subject);
+                        $from = "áàâãäéèêëíìîïóòôõöúùûüç?\"!@#$%š&*()-=+Ž`[]{}~^,<>;:/?\\|¹²³£¢¬§ªº°ÁÀÂÃÄÉÈÊËÍÌÎÏÓÒÔÕÖÚÙÛÜÇ";
+                        $to =   "aaaaaeeeeiiiiooooouuuuc__________________________________________AAAAAEEEEIIIIOOOOOUUUUC";
+                        $subject = strtr($subject,$from,$to);
             $file =    $subject."_".$id.".eml";
+                } else{
+                        // Se mensagem for arquivada localmente, $subject (assunto da mensagem)
+                        // sera passado para compor o nome do arquivo .eml;
+
+                        if($subject){
+                                $from = "áàâãäéèêëíìîïóòôõöúùûüç?\"!@#$%š&*()-=+Ž`[]{}~^,<>;:/?\\|¹²³£¢¬§ªº°ÁÀÂÃÄÉÈÊËÍÌÎÏÓÒÔÕÖÚÙÛÜÇ";
+                                $to =   "aaaaaeeeeiiiiooooouuuuc__________________________________________AAAAAEEEEIIIIOOOOOUUUUC";
+                                $subject = strtr($subject,$from,$to);
+                                //$subject = ereg_replace(':', '_', $subject);
+                                //$subject = ereg_replace('/', '_', $subject);
+                                $file = $subject."_".$i.".eml";
+                        } else{
+                                $file = "email_".md5(microtime()).".eml";
         }    
-        else{
-            $file =    "email_".md5(microtime()).".eml";
         }
         
@@ -124 +142 @@
         }
 
+        // Funcao alterada para tratar a exportacao
+        // de mensagens arquivadas localmente.
+        // Rommel Cysne (rommel.cysne@serpro.gov.br)
+        // em 17/12/2008.
         function makeAll($params) {
-                
-                $this-> folder = $params['folder'];
-                $this->folder = mb_convert_encoding($this->folder, "UTF7-IMAP","UTF-8");
-                $array_ids = explode(',', $params['msgs_to_export']);   
-                $error = False;         
-                $fileNames = "";
-                $tempDir = ini_get("session.save_path");
-                $this->connectImap();
-                                
-                for($i = 0; $i < count($array_ids); $i++) {
-                                
+                // Exportacao de mensagens arquivadas localmente
+                if($params['l_msg'] == "t"){
+                // Recebe todos os subjects e bodies das mensagens locais selecionadas para exportacao
+                // e gera arrays com os conteudos separados;
+                $array_mesgs = explode('@@',$params['mesgs']);
+                $array_subjects = explode('@@',$params['subjects']);
+            $array_ids = explode(',', $params['msgs_to_export']);
+            $tempDir = ini_get("session.save_path");
+                        // Para cada mensagem selecionada sera gerado um arquivo .eml cujo titulo sera o assunto (subject) da mesma;
+                        include_once("class.imap_functions.inc.php");
+                        $imapf = new imap_functions();
+                foreach($array_ids as $i=>$id) {
+                                $sEMLData=$imapf->treat_base64_from_post($array_mesgs[$i]);
+                                $fileName=$this->CreateFileEml($sEMLData, $tempDir,'',$array_subjects[$i],$i);
+                                if(!$fileName){
+                                        $error = True;
+                                        break;
+                                } else{
+                                        $fileNames .= "\"".$fileName."\" ";
+                                }
+                        }
+                        $nameFileZip = 'False';
+                        if($fileNames && !$error) {
+                                $nameFileZip = $this -> createFileZip($fileNames, $tempDir);
+                                if($nameFileZip){
+                                        $file = $tempDir.'/'.$nameFileZip;
+                                } else{
+                                        $file = false;
+                                }
+
+                        } else{
+                                $file = false;
+                        }
+
+            return $file;
+
+                // Exportacao de mensagens da caixa de entrada (imap) - processo original do Expresso
+                } else{
+            $this-> folder = $params['folder'];
+            $this->folder = mb_convert_encoding($this->folder, "UTF7-IMAP","UTF-8");
+            $array_ids = explode(',', $params['msgs_to_export']);
+            $error = False;
+            $fileNames = "";
+            $tempDir = ini_get("session.save_path");
+            $this->connectImap();
+                        for($i = 0; $i < count($array_ids); $i++) {
                         $header         = $this-> getHeader($array_ids[$i]);                                                                                    
                         $body           = $this-> getBody($array_ids[$i]);                      
@@ -165 +222 @@
                         
                 return $file;
-        }
+        }
+    }
 
         function export_msg($params) {
@@ -209 +267 @@
                 imap_close($this->mbox_stream);
                 return $urlPath;
-        }
+        }
 
         function remove_accents($string) {
@@ -241 +299 @@
                 $imap_attachment = new imap_attachment();
                 $attachments = $imap_attachment->download_attachment($this->mbox_stream, $id_number);
-                
-
-                
                 foreach($attachments as $i => $attachment){
                         if($i && $i == 'names')
@@ -280 +335 @@
                 imap_close($this->mbox_stream);
                 return $return_attachments;
-        }
+        }
         
         private function getFileType($nameFile) {

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

@@ -209 +209 @@
         * com .emls gerados pelo expresso, e o arquivo pode ser um zip contendo vários emls ou um .eml.
         */
+/**
+        * Função que importa arquivos .eml exportados pelo expresso para a caixa do usuário. Testado apenas
+        * com .emls gerados pelo expresso, e o arquivo pode ser um zip contendo vários emls ou um .eml.
+        */
         function import_msgs($params) {
-                if(!$this->mbox)                
+                if(!$this->mbox)
                         $this->mbox = $this->open_mbox();
+
+                if( preg_match('/local_/',$params["folder"]) )
+                {
+
+                        $tmp_box = mb_convert_encoding('INBOX/Lixeira/tmpMoveToLocal', "UTF7-IMAP", "UTF-8");
+                        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;
@@ -218 +232 @@
                 if((($quota['limit'] - $quota['usage'])*1024) <= $params['FILES'][0]['size']){
                         return array( 'error' => $this->functions->getLang("fail in import:").
-                                                        " ".$this->functions->getLang("Over quota"));           
+                                                        " ".$this->functions->getLang("Over quota"));
                 }
                 if(substr($filename,strlen($filename)-4)==".zip") {
@@ -225 +239 @@
                         if ($zip) {
                                 while ($zip_entry = zip_read($zip)) {
-                                        
+
                                         if (zip_entry_open($zip, $zip_entry, "r")) {
                                                 $email = zip_entry_read($zip_entry, zip_entry_filesize($zip_entry));
@@ -239 +253 @@
                                 zip_close($zip);
                         }
+
+                        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") {
@@ -251 +279 @@
                         }
                 }
-                else 
-                {
+                else
+                {
+                        if ( isset( $tmp_box ) )
+                                imap_deletemailbox( $this->mbox,"{".$this -> imap_server."}$tmp_box" );
+
                         return array("error" => $this->functions->getLang("wrong file format"));
                         $invalid_format = true;
                 }
-                
+
                 if(!$invalid_format) {
                         if(count($errors)>0) {
@@ -266 +297 @@
                         }
                         else
-                                return $this->functions->getLang("The import was executed successfully.");                      
-                }
-        }       
-        /*
+                                return $this->functions->getLang("The import was executed successfully.");
+                }
+        }
+        /*
                 Remove os anexos de uma mensagem. A estratégia para isso é criar uma mensagem nova sem os anexos, mantendo apenas
                 a primeira parte do e-mail, que é o texto, sem anexos.
@@ -2851 +2882 @@
                 return $header;
         }
+
+//Por Bruno Costa(bruno.vieira-costa@serpro.gov.br - Insere emails no imap a partir do fonte do mesmo. Se o argumento timestamp for passado ele utiliza do script python
+///expressoMail1_2/imap.py para inserir uma msg com o horário correto pois isso não é porssível com a função imap_append do php.
+
+    function insert_email($source,$folder,$timestamp){
+        $username = $_SESSION['phpgw_info']['expressomail']['user']['userid'];
+        $password = $_SESSION['phpgw_info']['expressomail']['user']['passwd'];
+        $imap_server = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer'];
+        $imap_port      = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort'];
+        $imap_options = '/notls/novalidate-cert';
+        $mbox_stream = imap_open("{".$imap_server.":".$imap_port.$imap_options."}".$folder, $username, $password);
+        if(imap_last_error())
+        {
+            imap_createmailbox($mbox_stream,imap_utf7_encode("{".$imap_server."}".$folder));
+       }
+        if($timestamp){
+            $tempDir = ini_get("session.save_path");
+            $file = $tempDir."imap_".md5(microtime());
+                $f = fopen($file,"w");
+                fputs($f,base64_encode($source));
+            fclose($f);
+            $command = "python ".$_SERVER['DOCUMENT_ROOT']."expressoMail1_2/imap.py ".$imap_server." ".$imap_port." ".$username." ".$password." ".$timestamp." ".$folder." ".$file;
+            $return['command']=exec($command);
+        }else{
+            $return['append'] = imap_append($mbox_stream, "{".$imap_server.":".$imap_port."}".$folder, $source, "\\Seen");
+        }
+        $status = imap_status($mbox_stream, "{".$this->imap_server.":".$this->imap_port."}".$folder, SA_UIDNEXT);
+        $return['msg_no'] = $status->uidnext - 1;
+                $return['error'] = imap_last_error();
+        if($mbox_stream)
+                        imap_close($mbox_stream);
+        return $return;
+
+    }
+
+//Por Bruno Costa(bruno.vieira-costa@serpro.gov.br - Trata fontes de emails enviados via POST para o servidor por um xmlhttprequest, as partes codificados com
+//Base64 os "+" são substituidos por " " no envio e essa função arruma esse efeito.
+
+    function treat_base64_from_post($source){
+            $offset = 0;
+            do
+            {
+                    if($inicio = strpos($source, 'Content-Transfer-Encoding: base64', $offset))
+                    {
+                            $inicio = strpos($source, "\n\r", $inicio);
+                            $fim = strpos($source, '--', $inicio);
+                            if(!$fim)
+                                    $fim = strpos($source,"\n\r", $inicio);
+                            $length = $fim-$inicio;
+                            $parte = substr( $source,$inicio,$length-1);
+                            $parte = str_replace(" ", "+", $parte);
+                            $source = substr_replace($source, $parte, $inicio, $length-1);
+                    }
+                    if($offset > $inicio)
+                    $offset=FALSE;
+                    else
+                    $offset = $inicio;
+            }
+            while($offset);
+            return $source;
+    }
+
+//Por Bruno Costa(bruno.vieira-costa@serpro.gov.br - Recebe os fontes dos emails a serem desarquivados, separa e envia cada um para função insert_mail.
+
+    function unarchive_mail($params)
+    {
+        $dest_folder = $params['folder'];
+        $sources = explode("#@#@#@",$params['source']);
+        $timestamps = explode("#@#@#@",$params['timestamp']);
+        foreach($sources as $index=>$src) {
+                        if($src!=""){
+                                $source = $this->treat_base64_from_post($src);
+                                $insert = $this->insert_email($source,$dest_folder,$timestamps[$index]);
+                        }
+                }
+        return $insert;
+    }
+
+    function download_all_local_attachments($params)
+    {
+        $source = $params['source'];
+        $source = $this->treat_base64_from_post($source);
+        $insert = $this->insert_email($source,'INBOX'.$this->imap_delimiter.'decifradas');
+        $exporteml = new ExportEml();
+        $params['num_msg']=$insert['msg_no'];
+        $params['folder']='INBOX'.$this->imap_delimiter.'decifradas';
+        return $exporteml->download_all_attachments($params);
+    }
 }
 ?>

trunk/expressoMail1_2/js/TreeS.js

@@ -45 +45 @@
                                                             "</tr>"+
                                                             "<tr>"+
-                                                            "<td><input type='button' value='"+get_lang('Export messages')+"' onclick='ttreeBox.export_all_msg()'></td>"+
+                                                            //Por Bruno Costa(bruno.vieira-costa@serpro.gov.br - Chama o proxy_mensagens para que uma pasta local também possa ser exportada
+                                                            "<td><input type='button' value='"+get_lang('Export messages')+"' onclick='proxy_mensagens.proxy_export_all_msg()'></td>"+
                                                             "</tr>"+
                                                             "<tr><td><br><br><br><br><br></td></tr>"+
@@ -128 +129 @@
                 
                 folders_tree = new dFTree({name: name_tree});
-
                 if(click_root != ""){
                         var n_root = new dNode({id:'root', caption:get_lang("My Folders"), onClick:click_root});
@@ -166 +166 @@
                                 id: 'local_root',
                                 caption: get_lang("local messages"),
-                                plusSign: true
+                                plusSign: true,
+                                onClick:"ttree.get_folder('local_root')"
                         });
                         folders_tree.add(n_root_local, 'root');

trunk/expressoMail1_2/js/common_functions.js

@@ -119 +119 @@
 function set_msg_as_unread(msg_number){
         tr_message = Element(msg_number);
-        if (exist_className(tr_message, 'tr_msg_read') || exist_className(tr_message, 'tr_msg_read2')) 
+        if (exist_className(tr_message, 'tr_msg_read') || exist_className(tr_message, 'tr_msg_read2'))
                 increment_folder_unseen();
         remove_className(tr_message, 'selected_msg');
@@ -693 +693 @@
                 Element('new_m').innerHTML = '<font style="color:red">' + abas_unseen + '</font>';
         }
-        if ( current_folder.indexOf( 'INBOX' ) !== 0 )
+        if ( current_folder.indexOf( 'INBOX' ) !== 0 && current_folder.indexOf( 'local_' ) !== 0 )
         {
                 var display_unseen_in_shared_folders = Element('dftree_user_unseen');

trunk/expressoMail1_2/js/doiMenuData.js

@@ -159 +159 @@
                         _tab + get_lang("Move to")+" ... |wfolders.makeWindow('', 'move_to')",
                         _tab + get_lang("Delete")+"|"+"proxy_mensagens.delete_msgs('null','selected','null')",
-                        _tab + get_lang("Export")+"|"+"export_all_selected_msgs()"
+                        _tab + get_lang("Export")+"|"+"proxy_mensagens.export_all_messages()"
                 );
 

trunk/expressoMail1_2/js/draw_api.js

@@ -916 +916 @@
 
         proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort,search,sort_box_reverse,handler_draw_box);
-        cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+sort+"&search_box_type="+search+"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box);
         current_page = 1;
         //Comentado para nao sobrepor o numero de msgs nao lidas ao utilizar os filtros
@@ -978 +977 @@
                         currentTab = ID;
                         openTab.type[ID] = 2;
-                        cExecute("$this.imap_functions.get_info_msg&msg_number="+folder.nextSibling.id+"&msg_folder="+nextMsgBox, show_msg);
+                        proxy_mensagens.get_msg(parseInt(folder.nextSibling.id),nextMsgBox,true,show_msg);
+                        //cExecute("$this.imap_functions.get_info_msg&msg_number="+folder.nextSibling.id+"&msg_folder="+nextMsgBox, show_msg);
                 };
         }
@@ -1014 +1014 @@
                         currentTab = ID;
                         openTab.type[ID] = 2;
-                        cExecute("$this.imap_functions.get_info_msg&msg_number="+folder.previousSibling.id+"&msg_folder=" + previousMsgBox, show_msg);
+                        //cExecute("$this.imap_functions.get_info_msg&msg_number="+folder.previousSibling.id+"&msg_folder=" + previousMsgBox, show_msg);
+                        proxy_mensagens.get_msg(parseInt(folder.previousSibling.id),previousMsgBox,true,show_msg);
                 };
         }
@@ -1500 +1501 @@
                         if(info_msg.attachments.length > 1) {
                                 var link_attachment     = document.createElement("A");
-                                link_attachment.setAttribute("href", "javascript:download_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
+                 if(proxy_mensagens.is_local_folder(current_folder))
+                    link_attachment.setAttribute("href", "javascript:expresso_local_messages.download_all_local_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
+                else
+                    link_attachment.setAttribute("href", "javascript:download_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
                                 link_attachment.innerHTML = " "+info_msg.attachments.length+' '+get_lang('files')+' :: '+get_lang('Download all atachments');
                                 link_attachment.innerHTML += '<BR>';
@@ -1603 +1607 @@
                         var showImgLink = document.createElement('DIV');
                         showImgLink.id="show_img_link";
-                        showImgLink.onclick = function () { cExecute('$this.imap_functions.get_info_msg&msg_number='+info_msg.msg_number+'&msg_folder='+info_msg.msg_folder,show_msg_img); };
+                        showImgLink.onclick = function(){show_msg_img(info_msg.msg_number,info_msg.msg_folder)};
                         showImgLink.className="show_img_link";
                         showImgLink.innerHTML = get_lang("Show images from")+": "+info_msg.from.email;
@@ -1642 +1646 @@
                         _link_attachments       = document.createElement("A");
                         _link_attachments.className = "message_options";
-                        _link_attachments.setAttribute("href", "javascript:download_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
+             if(proxy_mensagens.is_local_folder(current_folder))
+                _link_attachments.setAttribute("href", "javascript:expresso_local_messages.download_all_local_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
+            else
+                _link_attachments.setAttribute("href", "javascript:download_all_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"')");
                         _link_attachments.innerHTML = get_lang('Download all atachments');
                 }
@@ -2617 +2624 @@
                 '<span class="message_options_move"><span ' + change_font_color + ' title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindow(\"\",\"move_to\")>'+get_lang("Move")+'</span></span>'+
                 '<span class="message_options_print"><span ' + change_font_color + ' title="'+get_lang("Print")+'" class="message_options" onclick=print_all()>'+get_lang("Print")+'</span></span>'+
-                '<span class="message_options_export"><span ' + change_font_color + ' title="'+get_lang("Export")+'" class="message_options" onclick="export_all_selected_msgs()">'+get_lang("Export")+'</span></span>' +
+        '<span class="message_options_export"><span ' + change_font_color + ' title="'+get_lang("Export")+'" class="message_options" onclick="proxy_mensagens.export_all_messages()">'+get_lang("Export")+'</span></span>' +
                 '<span class="message_options_import"><span ' + change_font_color + ' title="'+get_lang("Import")+'" class="message_options" onclick="import_window()">'+get_lang("Import")+'</span></span>';
-        if(preferences.use_local_messages==1)
-                span_options.innerHTML += '&nbsp;<span ' + change_font_color + ' title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null)">'+get_lang("Archive")+'</span>';
+    if(preferences.use_local_messages==1)
+                if(proxy_mensagens.is_local_folder(current_folder))
+                        span_options.innerHTML += '&nbsp; <span title="'+get_lang("Unarchive")+'" class="message_options" onclick="expresso_local_messages.unarchive_msgs(\''+folder+'\',null)">'+get_lang("Unarchive")+'</span>';
+                else
+                        span_options.innerHTML += '&nbsp; <span title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null)">'+get_lang("Archive")+'</span>';
         if (use_spam_filter) {
                 if ( current_folder == 'INBOX'+cyrus_delimiter+'Spam' ) {

trunk/expressoMail1_2/js/local_messages.js

@@ -59 +59 @@
         
         local_messages.prototype.insert_mail = function(msg_info,msg_header,anexos,folder) {
-
                 try {
                         this.init_local_messages();
@@ -82 +81 @@
                         msg_info.cc = null;
                         msg_header.Size=null;
-                        
                         //If the mail was archieved in the same date the user received it, the date cames with the time.
                         //here I solved it
@@ -109 +107 @@
                         
                         var rs = this.dbGears.execute("select rowid from folder where folder=? and uid_usuario=?",[folder,account_id]);
-                        
-                        if(rs.isValidRow())
+                        if(rs.isValidRow())
                                 id_folder=rs.field(0);
                         else {
@@ -119 +116 @@
                         if(msg_info.Unseen=="U")
                                 unseen = 1;
-                        this.dbGears.execute("insert into mail (mail,original_id,original_folder,header,timestamp,uid_usuario,unseen,id_folder,ffrom,subject,fto,cc,body,size) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)",[mail,original_id,original_folder,header,timestamp,login,unseen,id_folder,from,subject,to,cc,body,size]);
+            this.dbGears.execute("insert into mail (mail,original_id,original_folder,header,timestamp,uid_usuario,unseen,id_folder,ffrom,subject,fto,cc,body,size) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)",[mail,original_id,original_folder,header,timestamp,login,unseen,id_folder,from,subject,to,cc,body,size]);
                         var call_back = function() {
                         }
@@ -148 +145 @@
                 retorno['subject'] = rs.field(3);
                 retorno['body'] = rs.field(4);
+                //Codigo que as imagens embutidas em emails (com multipart/related ou multipart/mixed) sejam corretamente mostradas em emails arquivados. Os links do
+                //tipo "./inc/show_embedded_attach.php?msg_folder=[folder]&msg_num=[msg_num]&msg_part=[part]"
+                //são substituidos pelos links dos anexos capturados pelo gears.
+
+                var thumbs= retorno.thumbs;
+                var anexos= retorno.array_attach;
+                for (i in anexos)
+                {
+                    nomeArquivo = anexos[i]['name'].substring(0,anexos[i]['name'].length - 4);
+                    if(nomeArquivo.match('jpg')||anexos[i]['name'].match('gif')||anexos[i]['name'].match('png'))
+                        {
+                            var er_imagens = new RegExp("\\.\\/inc\\/show_embedded_attach.php\\?msg_folder=[\\w/]+\\&msg_num=[0-9]+\\&msg_part="+anexos[i]['pid']);
+                            var Result_imagens = er_imagens.exec(retorno['body']);
+                            retorno['body'] = retorno['body'].replace(Result_imagens,anexos[i]['url']);
+                            if(thumbs && thumbs[i]){
+                                er_imagens = new RegExp("\\.\\/inc\\/show_thumbs.php\\?file_type=image\\/[\\w]+\\&msg_num=[0-9]+\\&msg_folder=[\\w/%]+\\&msg_part="+anexos[i]['pid']);
+                                Result_imagens = er_imagens.exec(thumbs[i]);
+                                thumbs[i] = thumbs[i].replace(Result_imagens,"'"+anexos[i]['url']+"'");
+                                er_imagens = new RegExp("\\.\\/inc\\/show_img.php\\?msg_num=[0-9]+\\&msg_folder=[\\w/%]+\\&msg_part="+anexos[i]['pid']);
+                                Result_imagens = er_imagens.exec(thumbs[i]);
+                                thumbs[i] = thumbs[i].replace(Result_imagens,"'"+anexos[i]['url']+"'");
+                                thumbs[i] = thumbs[i].replace(/<IMG/i,'<img width="120"');
+                            }
+                        }
+                }
+
                 retorno['to'] = connector.unserialize(rs.field(5));
                 retorno['cc'] = connector.unserialize(rs.field(6));
@@ -508 +531 @@
                                                 sql += " and";
                                 }
-                                sql+=" mail."+this.aux_convert_filter_field(friendly_filters[z])+" like '%"+friendly_filters[z+1]+"%'";
+                                sql+=" mail."+this.aux_convert_filter_field(friendly_filters[z])+" like '%"+url_decode(friendly_filters[z+1])+"%'";
                         }
                 }
@@ -559 +582 @@
                 return retorno;
         }
+
+     //Por Bruno Costa(bruno.vieira-costa@serpro.gov.br - Essa função é um AJAX simples que serve apenas para pegar o fonte de uma msg local (no formato RFC 822).
+    local_messages.prototype.get_src = function(url){
+        AJAX = false;
+        if (window.XMLHttpRequest) { // Mozilla, Safari,...
+            AJAX = new XMLHttpRequest();
+            if (AJAX.overrideMimeType) {
+                AJAX.overrideMimeType('text/xml');
+            }
+        } else if (window.ActiveXObject) { // IE
+            try {
+                AJAX = new ActiveXObject("Msxml2.XMLHTTP");
+            } catch (e) {
+                try {
+                AJAX = new ActiveXObject("Microsoft.XMLHTTP");
+                } catch (e) {}
+            }
+        }
+
+        if (!AJAX) {
+            alert('ERRO :(Seu navegador não suporta a aplicação usada neste site');
+            return false;
+        }
+
+        AJAX.onreadystatechange = function() {
+            if (AJAX.readyState == 4) {
+                AJAX.src=AJAX.responseText;
+                if (AJAX.status == 200) {
+                    return AJAX.responseText;
+                    } else {
+                    return false;
+                }
+            }
+        }
+
+        AJAX.open('get', url, false);
+        AJAX.send(null);
+        return AJAX.responseText;
+    };
+
+  //Por Bruno Costa(bruno.vieira-costa@serpro.gov.br - Dessarquiva msgs locais pegando o codigo fonte das mesmas e mandando via POST para o servidor
+  //para que elas sejam inseridas no imap pela função  imap_functions.unarchive_mail.
+    local_messages.prototype.unarchive_msgs = function (folder,new_folder,msgs_number){
+
+        if(!new_folder)
+            new_folder='INBOX';
+        this.init_local_messages();
+       // alert(folder+new_folder+msgs_number);
+        var handler_unarchive = function(data)
+        {
+            if(data.error == '')
+                write_msg(get_lang('All messages are successfully unarchived'));
+            else
+                alert(data.error);
+        }
+        if(msgs_number =='selected' || !msgs_number)
+        {
+            msgs_number = get_selected_messages()
+            if (!msgs_number){
+                write_msg(get_lang('No selected message.'));
+                return;
+            }
+            var rs = this.dbGears.execute("select mail,timestamp from mail where rowid in ("+msgs_number+")");
+            var source="";
+            var timestamp="";
+            while(rs.isValidRow()) {
+                mail=connector.unserialize(rs.field(0));
+                source_tmp=escape(this.get_src(mail.url_export_file));
+                    source+="#@#@#@"+source_tmp;
+                    timestamp+="#@#@#@"+rs.field(1);
+                rs.next();
+            }
+            rs.close();
+            this.finalize();
+        }
+        else
+        {
+            var rs = this.dbGears.execute("select mail,timestamp from mail where rowid="+msgs_number);
+            mail=connector.unserialize(rs.field(0));
+            var source ="";
+            source = this.get_src(mail.url_export_file);
+            timestamp=rs.field(1);
+             rs.close();
+             this.finalize();
+        }
+            params="&folder="+new_folder+"&source="+source+"&timestamp="+timestamp;
+            cExecute ("$this.imap_functions.unarchive_mail&", handler_unarchive, params);
+    }
+
+
+    local_messages.prototype.download_all_local_attachments = function(folder,id){
+        this.init_local_messages();
+        var rs = this.dbGears.execute("select mail from mail where rowid="+id);
+        var tmp = connector.unserialize(rs.field(0));
+        rs.close();
+        this.finalize();
+        source = this.get_src(tmp.url_export_file);
+        source = escape(source);
+        var handler_source = function(data){
+            download_attachments(null, null, data, null,null,'anexos.zip');
+        }
+        cExecute("$this.imap_functions.download_all_local_attachments",handler_source,"source="+source);
+    }
+
+    /*************************************************************************/
+/* Funcao usada para exportar mensagens arquivadas localmente.
+ * Rommel de Brito Cysne (rommel.cysne@serpro.gov.br)
+ * em 22/12/2008.
+ */
+    local_messages.prototype.local_messages_to_export = function(){
+
+        if (openTab.type[currentTab] > 1){
+            var msgs_to_export_id = currentTab.substring(0,currentTab.length-2,currentTab);
+        }else{
+            var msgs_to_export_id = get_selected_messages();
+        }
+        var handler_local_mesgs_to_export = function(data){
+            download_attachments(null, null, data, null,null,'mensagens.zip');
+        }
+        if(msgs_to_export_id){
+            this.init_local_messages();
+            var l_msg = "t";
+            var mesgs ="";
+            var subjects ="";
+            var rs = this.dbGears.execute("select mail,subject from mail where rowid in ("+msgs_to_export_id+")");
+            while(rs.isValidRow()){
+                mail = connector.unserialize(rs.field(0));
+                src = this.get_src(mail.url_export_file);
+                subject = rs.field(1);
+                mesgs += src;
+                mesgs += "@@";
+                subjects += subject;
+                subjects += "@@";
+                rs.next();
+            }
+            rs.close();
+            this.finalize();
+            mesgs = escape(mesgs);
+            subjects = escape(subjects);
+            params = "subjects="+subjects+"&mesgs="+mesgs+"&l_msg="+l_msg+"&msgs_to_export="+msgs_to_export_id;
+            cExecute ("$this.exporteml.makeAll&", handler_local_mesgs_to_export, params);
+        }
+        return true;
+    }
+
+    local_messages.prototype.get_all_local_folder_messages= function(folder_name){
+
+
+         var mesgs = new Array();
+         var subjects = new Array();
+         var hoje = new Date();
+         var msgs_to_export = new Array();
+         var l_msg="t";
+
+        this.init_local_messages();
+        var query = "select mail,subject,mail.rowid from mail inner join folder on (mail.id_folder=folder.rowid) where folder.folder='" + folder_name + "'";
+
+        var rs = this.dbGears.execute(" "+query)
+
+            var handler_local_mesgs_to_export = function(data){
+                    //alert("data - " + data + " - tipo - " + typeof(data));
+                    download_attachments(null, null, data, null,null,'mensagens.zip');
+            }
+        var j=0;
+        while (rs.isValidRow()){
+              msgs_to_export[j]=rs.field(2)
+              mail = connector.unserialize(rs.field(0));
+                      msg=this.get_src(mail.url_export_file);
+                      subject = rs.field(1);
+                      mesgs += msg;
+                      mesgs += "@@";
+                      subjects += subject;
+                      subjects += "@@";
+                      rs.next();
+              j++;
+
+        }
+           rs.close();
+           this.finalize();
+           source = escape(mesgs);
+           subjects = escape(subjects);
+           params = "folder="+folder_name+"&subjects="+subjects+"&mesgs="+source+"&l_msg="+l_msg+"&msgs_to_export="+msgs_to_export;
+           cExecute ("$this.exporteml.makeAll&", handler_local_mesgs_to_export, params);
+          
+
+    }
+
+
+    /*************************************************************************/
+
         
         var expresso_local_messages;

trunk/expressoMail1_2/js/main.js

@@ -103 +103 @@
 }
 
-function show_msg_img(msg_info){
-       delete_border(msg_info.msg_number+"_r");
-       msg_info.showImg = true;
-       if (!Element(msg_info.msg_number)){
+function show_msg_img(msg_number,folder){
+    var call_back = function(data){
+       delete_border(data.msg_number+"_r");
+       data.showImg = true;
+       if (!Element(data.msg_number)){
                trElement = document.createElement('DIV');
-               trElement.id = msg_info.msg_number;
+               trElement.id = data.msg_number;
                Element("tbody_box").appendChild(trElement);
        }
-       show_msg(msg_info);
+       show_msg(data);
+    }
+
+    proxy_mensagens.msg_img(msg_number,folder,call_back);
+
 }
 
@@ -281 +286 @@
 }
 
-function delete_msgs(folder, msgs_number, border_ID, show_success_msg)
+function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive)
 {
         if (arguments.length < 4){
@@ -297 +302 @@
         }
 
-        if ((parseInt(preferences.save_deleted_msg)) && (folder!='INBOX'+cyrus_delimiter+trashfolder)){
+        if (!archive && (parseInt(preferences.save_deleted_msg)) && (folder!='INBOX'+cyrus_delimiter+trashfolder)){
                 move_msgs2(folder, msgs_number, border_ID, 'INBOX'+cyrus_delimiter+trashfolder,trashfolder,show_success_msg );
                 return;
@@ -595 +600 @@
                 var msgs_to_remove = new Array();
                 var update_tree;
-
                 for (var i = 0; i < data.length; i++) {
                         msg_info = connector.unserialize(data[i]);
+                        if ( folder == 'INBOX/Lixeira/tmpMoveToLocal' ){
+                                msg_info.msg_folder += (Date.parse(new Date));
+                        }
                         temp = expresso_local_messages.insert_mail(msg_info, msg_info['header'],msg_info['array_attach'],folder_dest );
                         if ( Element("check_box_message_" + msg_info.msg_number) )
@@ -609 +616 @@
                         if ( Element(msg_info.msg_number) )
                                 remove_className(Element(msg_info.msg_number), 'selected_msg');
+                       if ( tree_folders._selected.id.indexOf( 'local_' ) == 0 || folder.indexOf( 'INBOX/Lixeira/tmpMoveToLocal' ) == 0 )
+                        {
+                                openTab.imapBox[0] = '';
+                                tree_folders.getNodeById( 'local_Inbox' )._select( );
+                                change_folder('local_Inbox','Inbox')
+                        }
 
                 }
                 
                 if (preferences.keep_archived_messages == 0) { //Remove as mensagens
-                                delete_msgs(folder,msgs_to_remove,'null',false);
+                                delete_msgs(folder,msgs_to_remove,'null',false,true);
                 }
                 update_tree=(!has_local_messages_before) && expresso_local_messages.has_local_mails();
@@ -1915 +1928 @@
                 if(data == 'Post-Content-Length')
                         write_msg(get_lang('The size of this message has exceeded  the limit (%1B).',Element('upload_max_filesize').value));
-                else {
-                        write_msg(data);
-                        arrayJSWin["import_window"].close();
-                        if(openTab.imapBox[0] == wfolders_tree._selected.id){
-                                openTab.imapBox[0] = '';
-                                change_folder(wfolders_tree._selected.id, wfolders_tree._selected.caption);
-                        }
-                        else{
-                                refresh();
-                        }
-                }
-        }
+                else {  /*
+                        * @author Rommel Cysne (rommel.cysne@serpro.gov.br)
+                        * @date 2009/05/15
+                        * Foi colocado um teste para verificar se a pasta selecionada, passada como parametro,
+                        * eh uma pasta local (qualquer uma)
+                        */
+                        var er = /^local_/;
+                        if ( er.test(wfolders_tree._selected.id) )
+                        {
+                                archive_msgs('INBOX/Lixeira/tmpMoveToLocal',wfolders_tree._selected.id,data);
+                                cExecute('$this.imap_functions.delete_mailbox',function(){},'del_past=INBOX/Lixeira/tmpMoveToLocal');
+                        }
+                         else{
+                                write_msg(data);
+                                arrayJSWin["import_window"].close();
+                                if(openTab.imapBox[0] == wfolders_tree._selected.id)
+                                {
+                                        openTab.imapBox[0] = '';
+                                        change_folder(wfolders_tree._selected.id, wfolders_tree._selected.caption);
+                                } else{
+                                        refresh();
+                                }
+                        }
+        }
+    }
+
 }
 

trunk/expressoMail1_2/js/messages_proxy.js

@@ -183 +183 @@
                         }
                         else {
-                                write_msg(get_lang("you can't move mails from local to server folders"));
+                //Por Bruno Costa (bruno.vieira-costa@serpro.gov.br) permite o desarquivamento de menssagens chamando a função unarchive_msgs quando uma msg é movida de uma pasta local para uma pasta remota.
+
+                                expresso_local_messages.unarchive_msgs(folder,new_folder,msgs_number);
+                //write_msg(get_lang("you can't move mails from local to server folders"));
                         }
                 
@@ -250 +253 @@
         }
 
+        messages_proxy.prototype.msg_img = function(msgs_number,folder_name,call_back) {
+     if(this.is_local_folder(folder_name)){
+         var msg = expresso_local_messages.get_local_mail(msgs_number);
+                 eval('call_back(msg)');
+     }
+     else
+        cExecute('$this.imap_functions.get_info_msg&msg_number='+msgs_number+'&msg_folder='+folder_name,call_back);
+    }
+
+    messages_proxy.prototype.export_all_messages = function(folder){
+
+                if (!folder){
+                        folder = get_current_folder();
+                }
+
+                if(!this.is_local_folder(folder)){
+                        export_all_selected_msgs();
+                }else{
+                        local_messages.prototype.local_messages_to_export();
+                }
+        }
+
+        messages_proxy.prototype.proxy_export_all_msg=function(){
+
+                var er=/^local/;
+
+
+                if(ttree.FOLDER == "local_root"){return false;}   //Usuario não selecionou uma pasta local e esta no começo dos nós
+                var nm_bx = ttree.FOLDER.split(cyrus_delimiter);
+
+                var name_f = nm_bx[nm_bx.length -1].replace("local_","");
+
+                if (!er.test(nm_bx)){
+                        //Se a pasta nao for local, ou seja a string nao contem a string "local"
+                        ttreeBox.export_all_msg();
+                } else{
+                        expresso_local_messages.get_all_local_folder_messages(name_f);
+                }
+        }
+
         var proxy_mensagens;
         proxy_mensagens = new messages_proxy();

trunk/expressoMail1_2/js/search.js

@@ -351 +351 @@
                                 add_className(tr,'tr_msg_unread');
                         add_className(tr, i%2 != 0 ? 'tr_msg_read2' : 'tr_msg_read');
-                          
-                        var _onclick = function () { cExecute("$this.imap_functions.get_info_msg&msg_number="+this.parentNode.id+"&msg_folder="+url_encode(this.parentNode.getAttribute('name')),show_msg); };                  
-                        for(var j=0 ; j < 10 ; j++)
+            var _onclick = function () { proxy_mensagens.get_msg(this.parentNode.id,url_encode(this.parentNode.getAttribute('name')),false,show_msg);};
+            for(var j=0 ; j < 10 ; j++)
                         {
                                 var td = document.createElement("TD");