Changeset 7414 for trunk

Timestamp:

10/11/12 18:14:36 (12 years ago)

Author:

marcosw

Message:

Ticket #3088 - Realização de merge da melhoria do MailArchiver?

Location:

trunk

Files:

• expressoMail1_2/inc/class.exporteml.inc.php (modified) (7 diffs)
• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (5 diffs)
• expressoMail1_2/inc/class.user.inc.php (modified) (1 diff)
• expressoMail1_2/index.php (modified) (2 diffs)
• expressoMail1_2/js/MAExpressoPattern.js (copied) (copied from sandbox/2.5.0-expresso1/expressoMail1_2/js/MAExpressoPattern.js)
• expressoMail1_2/js/MAQueryConfig.js (copied) (copied from sandbox/2.5.0-expresso1/expressoMail1_2/js/MAQueryConfig.js)
• expressoMail1_2/js/abas.js (modified) (2 diffs)
• expressoMail1_2/js/common_functions.js (modified) (4 diffs)
• expressoMail1_2/js/doiMenuData.js (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (26 diffs)
• expressoMail1_2/js/local_messages.js (modified) (2 diffs)
• expressoMail1_2/js/mail_archiver.js (copied) (copied from sandbox/2.5.0-expresso1/expressoMail1_2/js/mail_archiver.js)
• expressoMail1_2/js/main.js (modified) (36 diffs)
• expressoMail1_2/js/messages_controller.js (modified) (8 diffs)
• expressoMail1_2/js/search.js (modified) (21 diffs)
• expressoMail1_2/js/wfolders.js (modified) (1 diff)
• expressoMail1_2/setup/phpgw_pt-br.lang (modified) (1 diff)
• expressoMail1_2/templates/default/images/archive.png (copied) (copied from sandbox/2.5.0-expresso1/expressoMail1_2/templates/default/images/archive.png)
• expressoMail1_2/templates/default/images/config.png (copied) (copied from sandbox/2.5.0-expresso1/expressoMail1_2/templates/default/images/config.png)
• expressoMail1_2/templates/default/images/connect_delete.gif (copied) (copied from sandbox/2.5.0-expresso1/expressoMail1_2/templates/default/images/connect_delete.gif)
• expressoMail1_2/templates/default/main.css (modified) (2 diffs)
• info.php (copied) (copied from sandbox/2.5.0-expresso1/info.php)
• prototype/modules/attach_message/attach_message.js (modified) (1 diff)
• prototype/modules/mail/js/foldertree.js (modified) (1 diff)
• prototype/modules/mail/templates/detailedfoldertree.ejs (modified) (2 diffs)
• prototype/modules/mail/templates/float_folder_menu.ejs (modified) (4 diffs)
• prototype/services/ImapServiceAdapter.php (modified) (1 diff)

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

@@ -56 +56 @@
         // Rommel Cysne (rommel.cysne@serpro.gov.br)
         // em 17/12/2008.
+
+    function createFileEml_by_localFolder($sEMLData, $tempDir, $file){ 
+
+        $file = "{$file}.eml";
+
+        $f = fopen($tempDir.'/'.$file,"w");
+        if(!$f)
+            return False;
+
+        fputs($f,$sEMLData);
+        fclose($f);
+        
+        return $file;
+    }
+
         function createFileEml($sEMLData, $tempDir, $id, $subject=false, $i=false)
     {
@@ -101 +116 @@
     } 
 
-        function createFileZip($files, $tempDir){               
+        function createFileZip($files, $tempDir){       
+
                 $tmp_zip_filename = "email_".$_SESSION[ 'phpgw_session' ][ 'session_id' ].".zip";
-                
                 if (!empty($files))
                 {
@@ -119 +134 @@
                     }
                 }
-                
-                $command = "cd " . escapeshellarg($tempDir) . " && nice zip -m9 " . escapeshellarg($tmp_zip_filename) . " " .  $files;
+
+
+$command = "cd " . escapeshellarg($tempDir) . " && nice zip -m9 " . escapeshellarg($tmp_zip_filename) . " " .  $files;
+
+
                 if(!exec($command)) {
                         $command = "cd " .  escapeshellarg($tempDir) . " && rm ".$files." ". escapeshellarg($tmp_zip_filename);
@@ -126 +144 @@
                         return null;
                 }
-                
+
                 return $tmp_zip_filename;
                                 
         }
 
-        function export_all($params){
-                
+function export_all_byLocalFolder($params){
+        $error = false;
+
+        if(empty($params['messages'])){
+            $file["empty_folder"] = true;
+        } else {
+            foreach($params['messages'] as $eachMsg){
+               $header = "";
+               $body = "";
+               $tempDir = $this->tempDir;
+
+               $this->get_header_byLocalFolder($eachMsg, $header);
+               $this->get_body_byLocalFolder($eachMsg, $body);
+               $sEMLData    = $this->parseEml($header, $body);
+               $fileName   = $this->createFileEml_by_localFolder($sEMLData, $tempDir,$eachMsg['msg_number']);
+
+               if(!$fileName){
+                   $error = true;
+                   break;
+               } else 
+                   $fileNames .= "\"".$fileName."\" ";
+            }
+
+            $nameFileZip = 'False';         
+            if($fileNames && !$error) {         
+                $nameFileZip = $this->createFileZip($fileNames, $tempDir);
+                ($nameFileZip) ? ($file = $tempDir.'/'.$nameFileZip) : ($file = false);
+            } else 
+                $file = false;
+        }
+       
+       return $file;
+
+}
+
+function get_header_byLocalFolder($eachMsg, &$header){
+    $header = <<<header
+        MIME-Version: 1.0
+        Content-Type: text/html; charset=ISO-8859-1
+        Content-Transfer-Encoding: quoted-printable
+        From: "{$eachMsg['from']['name']}" <{$eachMsg['from']['email']}>
+        To: {$eachMsg['to']['email']}
+        Subject: {$eachMsg['subject']}
+        Message-Id: {$eachMsg['msg_number']}
+        Date: {$eachMsg['date']}
+header;
+}
+
+function get_body_byLocalFolder($eachMsg, &$body){
+    $body = $eachMsg['msg_sample']['body'];
+}
+
+function export_all($params){
+
                 $this->folder = $params['folder'];
                 $this->folder = mb_convert_encoding($this->folder, "UTF7-IMAP","UTF-8");
@@ -140 +210 @@
                 
                 $msgs = imap_search($this->mbox_stream,"ALL",SE_UID);
+
                 if($msgs){
                         foreach($msgs as $nMsgs){
-                                $header         = $this-> getHeader($nMsgs);                                                                    
-                                $body           = $this-> getBody($nMsgs);                      
+
+                                $header         = $this-> getHeader($nMsgs);                                                             
+                                $body           = $this-> getBody($nMsgs);              
+
                                 $sEMLData       = $this -> parseEml($header, $body);
                                 $fileName       = $this -> CreateFileEml($sEMLData, $tempDir,$nMsgs);
@@ -478 +551 @@
         }
 
+        //MAILARCHIVER 
+        function js_source_var($params) {
+                $this-> folder = $params['folder'];
+                if(!$this->folder){
+                   $aux = explode(';',$params['msgs_to_export']);
+                   $this->folder = $aux[0];
+                   $id_number = $aux[1];
+                }
+                else{
+                        $id_number = $params['msgs_to_export'];
+                }
+                $this->folder = mb_convert_encoding($this->folder, "UTF7-IMAP","ISO_8859-1");
+                $tempDir = ini_get("session.save_path");
+
+                $this->connectImap();
+                $header         = $this-> getHeader($id_number);
+                $body           = $this-> getBody($id_number);
+                
+                if(!strpos($header,"Date: ")){
+                        $header = "Date: " . $this->getHeaderInfo($id_number)->Date . "\r\n" .$header ;
+                }
+
+                imap_close($this->mbox_stream);
+
+                $input = $header . "\r\n\r\n" . $body;
+                $input = preg_replace('/\x1d/', '', $input); //remove special char control detected (hex 1D)
+                
+                return($input);
+        } 
+        
     function export_msg_data($id_msg,$folder) {
                 $this->folder = $folder;
@@ -752 +855 @@
                 return imap_fetchheader($this->mbox_stream, $msg_number, FT_UID);
         }
+
+        function getHeaderInfo($msg_number){                    
+                $header = imap_headerinfo($this->mbox_stream, imap_msgno($this->mbox_stream, $msg_number), 80, 255);
+                return $header;
+        }
         
         function getBody($msg_number){

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

@@ -3163 +3163 @@
                 $mailService->addHeaderField('Disposition-Notification-To', $_SESSION['phpgw_info']['expressomail']['user']['email']);
 
+            $mailService->addHeaderField('Date', date("r"));
 
             if ($folder != 'null') {
@@ -4660 +4661 @@
 
     function insert_email($source,$folder,$timestamp,$flags){
-                
+
         $username = $_SESSION['phpgw_info']['expressomail']['user']['userid'];
         $password = $_SESSION['phpgw_info']['expressomail']['user']['passwd'];
@@ -4667 +4668 @@
         $imap_options = '/notls/novalidate-cert';
 
-        
         $folder = mb_convert_encoding( $folder, "UTF7-IMAP","ISO-8859-1");
-
         $mbox_stream = imap_open("{".$imap_server.":".$imap_port.$imap_options."}".$folder, $username, $password);
         
         if(imap_last_error() === 'Mailbox already exists')
             imap_createmailbox($mbox_stream,imap_utf7_encode("{".$imap_server."}".$folder));
+
         if($timestamp){
-                        $pdate = date_parse(date('r')); // pega a data atual do servidor (TODO: pegar a data da mensagem local) 
-                        $timestamp += $pdate['zone']*(60); //converte a data da mensagem para o fuso horário GMT 0. Isto é feito devido ao Expresso Mail armazenar a data no fuso horário GMT 0 e para exibi-la converte ela para o fuso horário local. 
-                        /* TODO: o diretorio /tmp deve ser substituido pelo diretorio temporario configurado no setup */ 
-                        $file = "/tmp/sess_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]; 
-                
-                $f = fopen($file,"w");
-                fputs($f,base64_encode($source));
-            fclose($f);
-            $command = "python ".dirname(__FILE__)."/../imap.py \"$imap_server\" \"$imap_port\" \"$username\" \"$password\" \"$timestamp\" \"$folder\" \"$file\"";
-            $return['command']= exec($command);
+            if(version_compare(PHP_VERSION, '5.3.2', '>=')){
+                $return['append'] = imap_append($mbox_stream, "{".$imap_server.":".$imap_port."}".mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1"), $source,'',date('d-M-Y H:i:s O',$timestamp));
+            }else{
+                                $pdate = date_parse(date('r')); // pega a data atual do servidor (TODO: pegar a data da mensagem local) 
+                                $timestamp += $pdate['zone']*(60); //converte a data da mensagem para o fuso horário GMT 0. Isto é feito devido ao Expresso Mail armazenar a data no fuso horário GMT 0 e para exibi-la converte ela para o fuso horário local. 
+                                /* TODO: o diretorio /tmp deve ser substituido pelo diretorio temporario configurado no setup */ 
+                                $file = "/tmp/sess_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]; 
+                        
+                        $f = fopen($file,"w");
+                        fputs($f,base64_encode($source));
+                    fclose($f);
+                    $command = "python ".dirname(__FILE__)."/../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");
         }
+
+        if (!empty($return['command']))
+        {
+            list ($result, $msg) = explode(':',$return['command']);
+            if (strtoupper($result) === 'NO')
+            {
+                $return['error'] = $msg;
+                return $return;
+            }
+        }
+
         $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(!$return['error'] && $flags != '' ){
-
-                  $flags_array=explode(':',$flags);
-                  //"Answered","Draft","Flagged","Unseen"
-                  $flags_fixed = "";
-                  if($flags_array[0] == 'A')
-                        $flags_fixed.="\\Answered ";
-                  if($flags_array[1] == 'X')
-                        $flags_fixed.="\\Draft ";
-                  if($flags_array[2] == 'F')
-                        $flags_fixed.="\\Flagged ";
-                  if($flags_array[3] != 'U')
-                        $flags_fixed.="\\Seen ";
-                  if($flags_array[4] == 'F')
-                        $flags_fixed.="\\Answered \\Draft ";
-                  imap_setflag_full($mbox_stream, $return['msg_no'], $flags_fixed, ST_UID);
-                }
+                
+        $return['error'] = '';
+                if(imap_last_error() && imap_last_error() != "SECURITY PROBLEM: insecure server advertised AUTH=PLAIN")
+            $return['error'] = imap_last_error();
+
+                if(!$return['error'] && $flags != '' ){
+                        $flags_array=explode(':',$flags);
+                        //"Answered","Draft","Flagged","Unseen"
+                        $flags_fixed = "";
+                        if($flags_array[0] == 'A')
+                            $flags_fixed.="\\Answered ";
+                        if($flags_array[1] == 'X')
+                            $flags_fixed.="\\Draft ";
+                        if($flags_array[2] == 'F')
+                            $flags_fixed.="\\Flagged ";
+                        if($flags_array[3] != 'U')
+                            $flags_fixed.="\\Seen ";
+                        if($flags_array[4] == 'F')
+                            $flags_fixed.="\\Answered \\Draft ";
+                        imap_setflag_full($mbox_stream, $return['msg_no'], $flags_fixed, ST_UID);
+                }
         
         //Ignorando erro de AUTH=Plain
@@ -4773 +4791 @@
 
     function treat_base64_from_post($source){
-            $offset = 0;
-            do
+        $source = preg_replace('/(?<!\r)\n/', "\r\n", $source);
+
+        $offset = 0;
+        do
+        {
+            if($inicio = strpos($source, 'Content-Transfer-Encoding: base64', $offset))
             {
-                    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;
+                    $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);
             }
-            while($offset);
-            return $source;
+            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.
+        //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'];
+    {   
+        $dest_folder = urldecode($params['folder']);
         $sources = explode("#@#@#@",$params['source']);
-        //Add user timeszone
         $timestamps = explode("#@#@#@",$params['timestamp']);
-
-
         $flags = explode("#@#@#@",$params['flags']);
-                
-                foreach($sources as $index=>$src) {
-                        if($src!=""){
-                $source = $this->treat_base64_from_post($src);
-                $timestampsactual = $timestamps[$index] + $this->functions->CalculateDateOffset(); 
-                        $insert = $this->insert_email($source, mb_convert_encoding( $dest_folder,"ISO-8859-1","UTF-8"), $timestampsactual,$flags[$index]); 
+        $ids = explode("#@#@#@",$params['id']);
+        $return = array();
+        $archived = array();
+        $error = array();
+
+        foreach($sources as $index=>$src)
+        {
+            if($src!="")
+            {
+                //If it is a MailArchiver incomming data
+                if($params['madata'])
+                    $sourcedec = utf8_decode($src);
+                //Default data
+                else
+                    $sourcedec = $src;
+
+                                $source = $this->treat_base64_from_post($sourcedec);
+
+                                $insert = $this->insert_email($source,$dest_folder,$timestamps[$index],$flags[$index]);
+
+                if($insert['error'])
+                {
+                    $error[] = $ids[$index];
+                }
+                else 
+                {
+                    $archived[] = $ids[$index];
+                }
+            }else{
+                $error[] = $ids[$index];
             }
-        }
-        return $insert;
+                }
+        
+        if (!empty($error))
+        {
+            $return['error'] = $error;
+        }
+        if (!empty($archived))
+        {
+            $return['archived'] = $archived;
+        }
+        
+        return $return;
     }
 
@@ -5484 +5535 @@
         }
 
+        //MailArchiver -> get offsettogmt as a global javascript variable, invoked at "main.js", init()
+    function get_offset_gmt(){
+        return($this->functions->CalculateDateOffset());
+    }
+
+    //MailArchiver -> get message flags only, invoked at archive operation
+    function get_msg_flags($args){  
+        $msg_folder = $args['folder'];
+        $msg_n = $args['msg_number'];
+        $arr_msg = explode(",", $msg_n);
+       
+        for($i=0; $i<count($arr_msg); $i++){
+                        
+            if(!$this->mbox || !is_resource($this->mbox))
+                $this->mbox = $this->open_mbox($msg_folder);
+        
+            if(!is_resource($this->mbox))
+                return(false);
+                       
+            $msgno_imap = imap_msgno($this->mbox, $msg_n);          
+                $header = @imap_headerinfo($this->mbox, $msgno_imap, 80, 255);
+                
+            if (!is_object($header))
+                return false;
+
+            $taglist[$i]["msgid"] = $msg_n;
+            $taglist[$i]["unseen"] = $header->Unseen;
+            $taglist[$i]["recent"] = $header->Recent;
+            $taglist[$i]["flagged"] = $header->Flagged;
+            $taglist[$i]["draft"] = $header->Draft;
+            $taglist[$i]["answered"] = $header->Answered;
+            $taglist[$i]["deleted"] = $header->Deleted;
+        
+            if($header->Answered =='A' && $header->Draft == 'X')
+                $taglist[$i]['forwarded'] = 'F';
+            else
+                $taglist[$i]['forwarded'] = ' ';
+        }
+
+                return $taglist;        
+    }    
 }
 ?>

trunk/expressoMail1_2/inc/class.user.inc.php

@@ -50 +50 @@
                         return $_SESSION['phpgw_info']['expressomail']['user']['email'];        
                 }
-                
+
+        //MailArchiver login validate operations
+        function get_mailarchiver_authid(){
+            if((isset($_COOKIE["BALANCEID"])) && ($_COOKIE["BALANCEID"] != null) && ($_COOKIE["BALANCEID"] != " "))
+                $cookie_balancer = $_COOKIE["BALANCEID"];
+            else
+                $cookie_balancer = "";
+            if((isset($_COOKIE["sessionid"])) && ($_COOKIE["sessionid"] != null) && ($_COOKIE["sessionid"] != " "))
+                $cookie_session = $_COOKIE["sessionid"];
+            else
+                $cookie_session = "";
+            if(isset($_SESSION['phpgw_info']['expressomail']['user']['userid']) && ($_SESSION['phpgw_info']['expressomail']['user']['userid'] != null) && ($_SESSION['phpgw_info']['expressomail']['user']['userid'] != " "))
+                $cookie_user = $_SESSION['phpgw_info']['expressomail']['user']['userid'];
+            else
+                $cookie_user = "";
+            
+            if(isset($_SESSION['phpgw_info']['expressomail']['user']['passwd']) && ($_SESSION['phpgw_info']['expressomail']['user']['passwd'] != null) && ($_SESSION['phpgw_info']['expressomail']['user']['passwd'] != " "))
+                $cookie_pass = $_SESSION['phpgw_info']['expressomail']['user']['passwd'];
+            else
+                $cookie_pass = "";
+            
+            return(array($cookie_balancer, $cookie_session, $cookie_user, $cookie_pass));                    
+        }
+
         }
 ?>

trunk/expressoMail1_2/index.php

@@ -348 +348 @@
     // End Set Imap Folder names options
         //User info
-        echo "<script language='javascript'> var account_id = ".$GLOBALS['phpgw_info']['user']['account_id'].";var expresso_offline = false;</script>";
+    echo "<script language='javascript'> var account_id = ".$GLOBALS['phpgw_info']['user']['account_id'].";var expresso_offline = false; var mail_archive_host = '127.0.0.1';</script>\n";
+        
+    //MAILARCHIVER-02
+    //todo: remover a linha abaixo e implementar a configuração
+    //$GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] = true;
+        if ( $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] == true ) {
+        $mail_archiver_host = '127.0.0.1';
+        //Check protocol in use (https or http)
+        if($_SERVER['HTTPS'] != 'on'){
+            $mail_archiver_protocol = "http";
+            $mail_archiver_port = "4333";
+        }
+        else{
+            $mail_archiver_protocol = "https";
+            $mail_archiver_port = "4334";
+        }
+    
+        //JS Variables (to add on jscripts variables, needed by dependence scripts following)
+        echo '<script type="text/javascript">var mail_archive_protocol="'.$mail_archiver_protocol.'"; var mail_archive_port="'.$mail_archiver_port.'";</script>';
+    
+        //CXF custom js files, from MailArchiver ArcServUtil JS files repository, intended to be running already: CORS support and custom TRANSPORT object
+        echo '<script type="text/javascript" src="'.$mail_archiver_protocol.'://'.$mail_archiver_host.':'.$mail_archiver_port.'/arcservutil/cxf-addon-xdr-adapter.js"></script>';
+        echo '<script type="text/javascript" src="'.$mail_archiver_protocol.'://'.$mail_archiver_host.':'.$mail_archiver_port.'/arcservutil/cxf-addon-cors-request-object.js"></script>';
+        echo '<script type="text/javascript" src="'.$mail_archiver_protocol.'://'.$mail_archiver_host.':'.$mail_archiver_port.'/arcservutil/cxf-addon-cors-utils.js"></script>';
+
+        //CXF UTILS MAIN FILE
+        echo '<script type="text/javascript" src="'.$mail_archiver_protocol.'://'.$mail_archiver_host.':'.$mail_archiver_port.'/arcserv/ArchiveServices?js&nojsutils"></script>';
+    
+        //QueryConfig add on
+        echo '<script src="js/MAQueryConfig.js?'.$update_version.'"></script>';        
+        //Expresso serialized format add on
+        echo '<script src="js/MAExpressoPattern.js?'.$update_version.'"></script>';        
+    
+        //echo $obj -> getFilesJs("js/mail_archiver.js," . $GLOBALS['phpgw_info']['flags']['update_version']);
+        echo '<script src="js/mail_archiver.js?'.$update_version.'"></script>';
+    
+    }
+        //echo "<script language='javascript'> var account_id = ".$GLOBALS['phpgw_info']['user']['account_id'].";var expresso_offline = false;</script>";
 
         $obj = createobject("expressoMail1_2.functions");
@@ -376 +413 @@
                 $scripts .= "js/shortcut.js,";
         }
-                                
+        echo "<script> use_local_messages = ".$_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages']."</script>";         
         if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'])
                 $scripts .= "js/local_messages.js,";

trunk/expressoMail1_2/js/abas.js

@@ -220 +220 @@
                         var id_border = currentTab.replace(/[a-zA-Z_]+/, "");
                         ID_TR = ID.toString().substr(0,ID.toString().indexOf("_r"));
-                        var tr = Element(ID_TR);
+                        var tr = Element(ID_TR) ? Element(ID_TR) : Element(ID_TR+"_s"+id_border);
                         openTab.imapBox[ID] = (tr.getAttribute('name') == null?get_current_folder():tr.getAttribute('name'));
                 }else
@@ -255 +255 @@
                                 cc = document.getElementById("em_message_search").value;
                         else{
-                                cc = document.getElementsByName(currentTab)[0].value;
+                                if (currentTab == 0)
+                                        cc = "";
+                                else
+                                        cc = document.getElementsByName(currentTab)[0].value;
                         }
                 }else{

trunk/expressoMail1_2/js/common_functions.js

@@ -20 +20 @@
 
 var message = "Não Informado";
+
+//MAILARCHIVER-01
+try{
+   var ArchiveServices = new web_service_mailarchiver_serpro__ArchiveServices();
+   ArchiveServices.url = mail_archive_protocol + "://" + mail_archive_host + ":" + mail_archive_port + "/arcserv/ArchiveServices";
+   ArchiveServices.synchronous = true;
+}
+catch (e){
+    var ArchiveServices = null;
+}
 
 function config_events(pObj, pEvent, pHandler)
@@ -245 +255 @@
         }
         div_attachment.innerHTML="<iframe style='display:none;width:0;height:0' name='attachment' src='"+url+"'></iframe>";
-}
+        window.onbeforeunload = function(){return unloadMess();}
+} 
 
 function download_attachments(msg_folder, msg_number, idx_file, msg_part, encoding, new_file_name, show_iframe){
@@ -666 +677 @@
 
 function configureLabels(data){
+    if(get_current_folder().split("_")[0] == "local"){
+        alert("Pastas locais não fornece suporte para marcadores");
+        return true;
+    }
 
         dialogElement = $('.label-configure-win').html(DataLayer.render("../prototype/modules/mail/templates/label_configure.ejs", {}))
@@ -693 +708 @@
 
 function configureFollowupflag(){
+
+    if(get_current_folder().split("_")[0] == "local"){
+        alert("Pastas locais não fornece suporte para acompanhamento.");
+        return true;
+    }
 
         var messages = new Array();

trunk/expressoMail1_2/js/doiMenuData.js

@@ -1 @@
-function labeledMessages(isLabel){
-                        if (isLabel) {
-                                var label = {
-                                        id: isLabel
-                                }       
-                                var lableleds = new Array();
-                                var msg_folder = current_folder;
-                                var messages = new Array();
-                                if(currentTab == 0){
-                                        var id = get_selected_messages().split(',');
-                                        for (i = 0; i < id.length; i++){
-                                                messages.push({
-                                                        msg_number: id[i],
-                                                        msg_folder: msg_folder
-                                                });
-                                        }
-                                }else{
-                                        // var id = get_selected_messages_search().split(',');
-                                        // var id_border = currentTab.replace(/[a-zA-Z_]+/, "");
-                                        // for (i = 0; i < id.length; i++){
-                                                // var tr = Element(id[i]+'_s'+id_border);
-                                                // msg_folder = tr.getAttribute('name'); 
-                                                // messages.push({
-                                                        // "msg_number": id[i],
-                                                        // "msg_folder": msg_folder,
-                                                // });
-                                        // }    
-                                        
-                                        var roles = get_selected_messages_search_role().split(',');
-                                        for (i = 0; i < roles.length; i++){
-                                                var tr = $('[role="'+roles[i]+'"]');
-                                                msg_folder = $(tr).attr('name'); 
-                                                var id = $(tr).attr('id'); 
-                                                messages.push({
-                                                        "msg_number": id.replace(/_[a-zA-Z0-9]+/,""),
-                                                        "msg_folder": msg_folder
-                                                });
-                                        }
-                                }
-
-                                for (var i=0; i < messages.length; i++) {
-                                        var hasLabel = DataLayer.get('labeled', {
-                                                filter: [
-                                                        'AND',
-                                                        ['=', 'labelId', label.id], 
-                                                        ['=', 'folderName', messages[i].msg_folder], 
-                                                        ['=', 'messageNumber', messages[i].msg_number]
-                                        ]});
-                                        if (!hasLabel || hasLabel == "") {
-                                                lableleds.push(
-                                                        DataLayer.put('labeled', {
-                                                                labelId:label.id, 
-                                                                folderName:messages[i].msg_folder, 
-                                                                messageNumber:messages[i].msg_number
-                                                        })
-                                                );
-                                                
-                                        }
-                                }
-                                DataLayer.commit(false, false, function(data){
-                                        for (var i=0; i < messages.length; i++) {
-                                                updateLabelsColumn({msg_number:messages[i].msg_number, boxname:messages[i].msg_folder, labels:false});
-                                        }               
-                                });
-                                
-
-                        }
-}
-
-function openListUsers(border_id) {
-        connector.loadScript("QuickCatalogSearch");
-        if (typeof(QuickCatalogSearch) == 'undefined'){
-                                        setTimeout('openListUsers('+border_id+')',500);
-                                        return false;
-                                }
-        QuickCatalogSearch.showCatalogList(border_id);
-}
-
-
-/**
- * Cria a lista de marcadores para o submenu "Marcadores"
- */
-function getLabels(){
-        var labels = DataLayer.get('label',{criteria:{order: 'name'}});
-        var menuLabelItems = {};
-                menuLabelItems["new"] = {
-                        "name" : get_lang('New Label'),
-                        callback:function() {configureLabels({applyToSelectedMessages:true});}
-                };
-        for(var i=0; i<labels.length; i++) {
-                menuLabelItems["label"+labels[i].id] = {
-                        "name" : labels[i].name
-                }
-        }
-        return menuLabelItems;
-}
-
-/**
- *      Carrega o menu de opção de uma mensagem
- */
-function loadMenu(){
-        var labelItems = getLabels();
-        $.contextMenu({
-                selector: ".table_box tbody tr",
-                callback: function(key, options) {
-                        //TODO - default actions
-                        
-                        /** 
-                         * Apply labels to selected messages
-                         */
-                        var isLabel = key.match(/label(.*)/);
-                        if (isLabel && isLabel.length > 1) {
-                                labeledMessages(isLabel[1]);
-                        }
-                        selectAllFolderMsgs(false);
-                },
-                items: {
-                        "flagSeen":      {"name": get_lang("Mark as") + " " + get_lang('seen'), "icon": "seen", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('seen','get_selected_messages'); }},
-                        "flagUnseen":    {"name": get_lang("Mark as") + " " + get_lang('unseen'), "icon": "unseen", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('unseen','get_selected_messages'); }},
-                        "flagFlagged":   {"name": get_lang("Mark as") + " " + get_lang('important'), "icon": "important", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('flagged','get_selected_messages'); }},
-                        "flagUnflagged": {"name": get_lang("Mark as") + " " + get_lang('normal'), callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('unflagged','get_selected_messages'); }},
-                        
-                        "sep1": "---------",
-                        "label": { "name": get_lang("Labels"), "items": labelItems},
-                        "follouwpflag":{"name": get_lang("Follow up"), callback: function(key, opt){ configureFollowupflag(); } },
-                        
-                        "sep2": "---------",
-                        "move": {"name": get_lang("Move to")+"...", "icon": "move", callback: function(key, opt){ wfolders.makeWindow('', 'move_to'); }},
-                        "remove": {"name": get_lang("Delete"),      "icon": "delete", callback: function(key, opt){ proxy_mensagens.delete_msgs('null','selected','null'); }},
-                        "export": {"name": get_lang("Export"),      "icon": "export", callback: function(key, opt){ proxy_mensagens.export_all_messages(); }}
-                }
-        });
-}
-/*FIM*/
-loadMenu();
-
-if (!expresso_offline) {
-        var menuToolsItems = {
-                "i01": {"name": get_lang("Preferences"), "icon": "preferences-mail", callback: preferences_mail },
-                "i02": {"name": get_lang("Search"), "icon": "search-mail", callback: function(key, opt){ search_emails(""); }},
-                "103": {"name": get_lang("Edit filters"), "icon": "filter", callback: filterbox2 },
-                "i05": {"name": get_lang("Share mailbox"), "icon": "share-mailbox", callback: sharebox },
-                "i06": {"name": get_lang("Labels"), "icon": "tag", callback: configureLabels }, 
-                "i08": {"name": get_lang("Empty trash"), "icon": "empty-trash", callback: function(key, opt){ empty_trash_imap(); }}
-        };
-                
-        if(preferences.use_local_messages==1) {
-                if(expresso_local_messages.is_offline_installed()) {
-                        menuToolsItems["i09"] = {"name": get_lang("Send from queue"), "icon": "queue", callback: force_check_queue };
-                }
-        }
-} else {
-        var menuToolsItems = {
-                "i01": {"name": get_lang("Search"), "icon": "search-mail", callback: function(key, opt){ search_emails(""); }}
-        }
-}
-$.contextMenu({
-        selector: "#link_tools",
-        trigger: 'hover',
-        className: 'context-menu-tools',
-        position: function($menu, x, y){
-                $menu.$menu.position({ my: "center top", at: "center bottom", of: this, offset:"0 0"});
-        },
-        determinePosition: function($menu, x, y){
-                $menu.css('display', 'block').position({ my: "center top", at: "center bottom", of: this}).css('display', 'none');
-        },
-        delay:500,
-        autoHide:true,
-        events: {
-                show: function(opt) {
-                        var $trigger = $(opt.selector).css({'background-color': '#ffffff', 'border': '1px solid #CCCCCC'});
-                        $('.context-menu-tools.context-menu-list.context-menu-root').css({'width': $trigger.css('width') });
-                        $('.context-menu-tools.context-menu-list').css({'background': '#ffffff'})
-                        .find(".context-menu-item").css({'background-color': '#ffffff'}).hover(
-                                function(){
-                                        $(this).css({'background-color': '#CCCCCC'});
-                                }, 
-                                function(){
-                                        $(this).css({'background-color': '#ffffff'});
-                                }
-                        );
-                        return true;
-                },
-                hide: function(opt) {
-                        $(opt.selector).css({'background-color': '', 'border': 'none'});
-                        return true;
-                }
-        },
-        callback: function(key, options) {
-                //TODO - default actions
-
-        },
-        items: menuToolsItems
-});
-var reComplexEmail = /<([^<]*)>[\s]*$/;
-$.contextMenu({
-        selector: ".box",
-        autoHide:true,
-        items: {
-                "add" : {name: get_lang("Quick Add"), icon : "quick-add",callback: function(key, opt){ var fname = $(opt.$trigger).find("input").val().split('"')[1];ccQuickAddOne.showList(','+fname+', ,'+$.trim($(opt.$trigger).find("input").val()).match(reComplexEmail)[1]); }},
-                "remove" : {name:get_lang("Remove recipient"), icon:"delete-box",callback: function(key, opt){ $(opt.$trigger).remove(); }},
-                "sep1": "---------",
-                "quick_search" : {name:get_lang("Quick search of messages"), icon: "quick-search-contact",callback: function(key, opt){ search_emails($.trim($(opt.$trigger).find("input").val()).match(reComplexEmail)[1]); }},
-                "full_search" : {name:get_lang("Search messages of ..."), icon: "quick-search-contact",callback: function(key, opt){ search_emails("", $.trim($(opt.$trigger).find("input").val()).match(reComplexEmail)[1]);}}         
-        }
-});
-
-function updateLabelsColumn(messageInfo) {
-        var msg_number = messageInfo.msg_number;
-        //uid é o numero da mensagem quando os dados são carregados na busca rapida.
-        if(messageInfo.uid != '' && messageInfo.uid != 'undefined' && messageInfo.uid != null){
-                msg_number = messageInfo.uid;
-        }
-        var msg_folder = current_folder;
-        if(messageInfo.boxname != '' && messageInfo.boxname != 'undefined' && messageInfo.boxname != null){
-                msg_folder = messageInfo.boxname;
-        }
-        
-         if(current_folder == msg_folder || !current_folder){
-                 $('#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number)
-                 .html('<img src="../prototype/modules/mail/img/tag.png">');
-        }else{
-                $('tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number)
-                .html('<img src="../prototype/modules/mail/img/tag.png">');
-        }
-        
-        var menuItems = {};
-        if (messageInfo.labels) {
-                if($.isArray(messageInfo.labels)){
-                        var labels = messageInfo.labels;
-                        messageInfo.labels = {};
-                        for(var i in labels)
-                                messageInfo.labels[labels[i].id] = {backgroundColor: labels[i]['backgroundColor'],
-                                        borderColor: labels[i]['borderColor'],
-                                        fontColor: labels[i]['fontColor'], id: labels[i]['id'], name: labels[i]['name'], 
-                                        uid: labels[i]['uid'] }
-                }       
-                menuItems = messageInfo.labels;
-        } else {
-                var labeleds = DataLayer.get('labeled', {
-                        criteria: {deepness: '2'},
-                        filter: [
-                                'AND',
-                                ['=', 'folderName', msg_folder], 
-                                ['=', 'messageNumber', msg_number]
-                        ]
-                        
-                });
-                if (labeleds) {
-                        for (var i=0; i < labeleds.length; i++)
-                                menuItems[labeleds[i].label.id] = labeleds[i].label;
-                } else {
-                        $('#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number)
-                        .html('');
-                        //$.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number+':first');
-                        $.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number);
-                        return false;
-                }
-        }
-        var menuItensLabel = {};
-        for(index in menuItems){
-                menuItensLabel[index] = {type: "label", customName: menuItems[index].name, id: msg_folder+"/"+msg_number+"#"+index};            
-        }
-        $.contextMenu.types.label = function(item, opt, root) {
-        $('<span>'+item.customName+'</span><span class="removeLabeled" title="'+get_lang("Remove Label")+'">x</span>')
-            .appendTo(this);
-                $(this).find('span.removeLabeled').click(function(){
-                        //TODO Mudar quando API abstrair atualizações no cache
-                        DataLayer.remove('labeled', false);
-                        DataLayer.get('labeled');
-                        DataLayer.remove('labeled', item.id);
-                        DataLayer.commit(false, false, function(){
-                                updateLabelsColumn({msg_number:msg_number, boxname:msg_folder, labels:false});
-                        });
-                });
-        };
-        if(current_folder == msg_folder || !current_folder){
-                $.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number);
-                $.contextMenu({
-                        selector: '#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number,
-                        trigger: 'hover',
-                        delay:100,
-                        autoHide:true,
-                        callback: function(key, options) {
-                                //TODO - default actions
-                        },
-                        items: menuItensLabel
-                });
-        }else{
-                $.contextMenu( 'destroy', 'tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number);
-
-                $.contextMenu({
-                        selector: 'tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number,
-                        trigger: 'hover',
-                        delay:100,
-                        autoHide:true,
-                        callback: function(key, options) {
-                                //TODO - default actions
-                        },
-                        items: menuItensLabel 
-                });     
-        }
-}
-
-function loadExtraLDAPBox(data, element){
-
-    if(!!data[0]){
-        var decoded = {};
-
-        $.each(data, function(i, e){
-            decoded[e.name] = e.value;
-        });
-
-        data = decoded;
-    }
-
-        menuItensLabel = {};
-        menuItensLabel["Name"] = {name: "<b>"+data.name+"</b>", disabled: true};
-        menuItensLabel["Email"] = {name: data.email, disabled: true};
-        if(!!data.telephone){
-                menuItensLabel["TelefoneLabel"] = {name: "<b>"+get_lang("Telephone")+"</b>", disabled: true};
-                menuItensLabel["TelefoneValue"] = {name: data.telephone, disabled: true};
-        }
-        if(data.vacationActive){
-                if(data.vacationActive == "TRUE"){
-                        menuItensLabel["outOffice"] = {name: "<b>"+get_lang("Out of office")+"</b>", disabled: true};
-                        menuItensLabel["outOfficeValue"] = {name: data.vacationInfo.substring(0, 20), disabled: true};
-                }
-        }
-        $.contextMenu({
-                selector: "#content_id_"+currentTab+" "+element+" .box-info",
-                trigger: 'hover',
-                delay:100,
-                autoHide:true,
-                items: menuItensLabel
-        });     
-}
-
-function loadGroupBox(data, element){
-        menuItensLabel = {};
-        menuItensLabel["ContactGroupLabelAll"] = {name:"<b>"+get_lang("Group contacts")+"</b>", disabled: true};
-        menuItensLabel["sep1"] = "---------";
-        if(data.itens){
-                var aux = 0;
-                var ctcName = "";
-                for(var item in data.itens){
-                        if(parseInt(item) <= 4){
-                                ctcName = data.itens[item].data[0].value;
-                                ctcName = ctcName.length > 2 ? ctcName : data.itens[item].data[2].value.substr(0,data.itens[item].data[2].value.indexOf("@"));
-                                menuItensLabel["ContactGroupLabel"+item] = {name: "<b>"+ctcName+"</b>", disabled: true};
-                                menuItensLabel["ContactGroupValue"+item] = {name: data.itens[item].data[2].value, disabled: true};
-                        }else{
-                                aux++;
-                                if(aux == 1)
-                                        menuItensLabel["MoreContactGroupValue"] = {name : get_lang("And more %1 contact", aux), disabled: true };
-                                else
-                                        menuItensLabel["MoreContactGroupValue"] = {name : get_lang("And more %1 contact", aux)+"s", disabled: true };
-                        }
-                }
-        }
-        $.contextMenu({
-                selector: "#content_id_"+currentTab+" "+element+" .box-info",
-                trigger: 'hover',
-                delay:100,
-                autoHide:true,
-                items: menuItensLabel
-        });     
-}
-
-
-
-
-
+    function labeledMessages(isLabel){
+        if(get_current_folder().split("_")[0] == "local"){
+            alert("Pastas locais não fornece suporte para adição de marcadores.")
+            return true;
+        }
+                        if (isLabel) {
+                                var label = {
+                                        id: isLabel
+                                }       
+                                var lableleds = new Array();
+                                var msg_folder = current_folder;
+                                var messages = new Array();
+                                if(currentTab == 0){
+                                        var id = get_selected_messages().split(',');
+                                        for (i = 0; i < id.length; i++){
+                                                messages.push({
+                                                        msg_number: id[i],
+                                                        msg_folder: msg_folder
+                                                });
+                                        }
+                                }else{
+                                        // var id = get_selected_messages_search().split(',');
+                                        // var id_border = currentTab.replace(/[a-zA-Z_]+/, "");
+                                        // for (i = 0; i < id.length; i++){
+                                                // var tr = Element(id[i]+'_s'+id_border);
+                                                // msg_folder = tr.getAttribute('name'); 
+                                                // messages.push({
+                                                        // "msg_number": id[i],
+                                                        // "msg_folder": msg_folder,
+                                                // });
+                                        // }    
+                                        
+                                        var roles = get_selected_messages_search_role().split(',');
+                                        for (i = 0; i < roles.length; i++){
+                                                var tr = $('[role="'+roles[i]+'"]');
+                                                msg_folder = $(tr).attr('name'); 
+                                                var id = $(tr).attr('id'); 
+                                                messages.push({
+                                                        "msg_number": id.replace(/_[a-zA-Z0-9]+/,""),
+                                                        "msg_folder": msg_folder
+                                                });
+                                        }
+                                }
+
+                                for (var i=0; i < messages.length; i++) {
+                                        var hasLabel = DataLayer.get('labeled', {
+                                                filter: [
+                                                        'AND',
+                                                        ['=', 'labelId', label.id], 
+                                                        ['=', 'folderName', messages[i].msg_folder], 
+                                                        ['=', 'messageNumber', messages[i].msg_number]
+                                        ]});
+                                        if (!hasLabel || hasLabel == "") {
+                                                lableleds.push(
+                                                        DataLayer.put('labeled', {
+                                                                labelId:label.id, 
+                                                                folderName:messages[i].msg_folder, 
+                                                                messageNumber:messages[i].msg_number
+                                                        })
+                                                );
+                                                
+                                        }
+                                }
+                                DataLayer.commit(false, false, function(data){
+                                        for (var i=0; i < messages.length; i++) {
+                                                updateLabelsColumn({msg_number:messages[i].msg_number, boxname:messages[i].msg_folder, labels:false});
+                                        }               
+                                });
+                                
+
+                        }
+    }
+
+    function openListUsers(border_id) {
+        connector.loadScript("QuickCatalogSearch");
+        if (typeof(QuickCatalogSearch) == 'undefined'){
+                                        setTimeout('openListUsers('+border_id+')',500);
+                                        return false;
+                                }
+        QuickCatalogSearch.showCatalogList(border_id);
+    }
+
+
+    /**
+     * Cria a lista de marcadores para o submenu "Marcadores"
+     */
+    function getLabels(){
+        var labels = DataLayer.get('label',{criteria:{order: 'name'}});
+        var menuLabelItems = {};
+                menuLabelItems["new"] = {
+                        "name" : get_lang('New Label'),
+                        callback:function() {configureLabels({applyToSelectedMessages:true});}
+                };
+        for(var i=0; i<labels.length; i++) {
+                menuLabelItems["label"+labels[i].id] = {
+                        "name" : labels[i].name
+                }
+        }
+        return menuLabelItems;
+    }
+
+    /**
+     *  Carrega o menu de opção de uma mensagem
+     */
+    function loadMenu(){
+        var archive = "";
+        if(use_local_messages != 0){
+            archive = {"name": get_lang("Archive"), "icon": "archive", callback: function(key, opt){ proxy_mensagens.archive_message('inbox', 'get_selected_messages'); }}
+        }else{
+            archive = "";
+        }
+
+        var labelItems = getLabels();
+        $.contextMenu({
+                selector: ".table_box tbody tr",
+            build: function($trigger, e) {
+
+                var itensNotLocal = {
+                    "label": { "name": get_lang("Labels"), "items": labelItems},
+                    "follouwpflag":{"name": get_lang("Follow up"), callback: function(key, opt){ configureFollowupflag(); } },
+                    "sep2": "---------"
+                }
+
+                var items= {
+                    "flagSeen":      {"name": get_lang("Mark as") + " " + get_lang('seen'), "icon": "seen", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('seen','get_selected_messages'); }},
+                    "flagUnseen":    {"name": get_lang("Mark as") + " " + get_lang('unseen'), "icon": "unseen", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('unseen','get_selected_messages'); }},
+                    "flagFlagged":   {"name": get_lang("Mark as") + " " + get_lang('important'), "icon": "important", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('flagged','get_selected_messages'); }},
+                    "flagUnflagged": {"name": get_lang("Mark as") + " " + get_lang('normal'), callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('unflagged','get_selected_messages'); }},
+                    "sep1": "---------"
+                }
+
+                var lastItens = {
+                    "move": {"name": get_lang("Move to")+"...", "icon": "move", callback: function(key, opt){ wfolders.makeWindow('', 'move_to'); }},
+                    "remove": {"name": get_lang("Delete"),      "icon": "delete", callback: function(key, opt){ proxy_mensagens.delete_msgs('null','selected','null'); }},
+                    "export": {"name": get_lang("Export"),      "icon": "export", callback: function(key, opt){ proxy_mensagens.export_all_messages(); }},
+                    "archive": archive
+                }
+
+                var realItens = {};
+
+                if(currentTab == 0){
+                    if(get_current_folder().split("local").length > 1){
+                        realItens = $.extend(items, lastItens);
+                    }else{
+                        realItens = $.extend(items, itensNotLocal);
+                        realItens = $.extend(realItens, lastItens);
+                    }
+                }else if(currentTab.split("local").length > 1){
+                    realItens = $.extend(items, lastItens);
+                }else{
+                    realItens = $.extend(items, itensNotLocal);
+                    realItens = $.extend(realItens, lastItens);
+                }
+
+                        return { 
+                    callback: function(key, options) {
+                                //TODO - default actions
+                                
+                                /** 
+                                 * Apply labels to selected messages
+                                 */
+                                var isLabel = key.match(/label(.*)/);
+                                if (isLabel && isLabel.length > 1) {
+                                        labeledMessages(isLabel[1]);
+                                }
+                                selectAllFolderMsgs(false);
+                        },
+                        items: realItens
+                }
+            }
+        });
+    }
+    /*FIM*/
+    loadMenu();
+
+    if (!expresso_offline) {
+        var menuToolsItems = {
+                "i01": {"name": get_lang("Preferences"), "icon": "preferences-mail", callback: preferences_mail },
+                "i02": {"name": get_lang("Search"), "icon": "search-mail", callback: function(key, opt){ search_emails(""); }},
+                "103": {"name": get_lang("Edit filters"), "icon": "filter", callback: filterbox2 },
+                "i05": {"name": get_lang("Share mailbox"), "icon": "share-mailbox", callback: sharebox },
+                "i06": {"name": get_lang("Labels"), "icon": "tag", callback: configureLabels }, 
+                "i08": {"name": get_lang("Empty trash"), "icon": "empty-trash", callback: function(key, opt){ empty_trash_imap(); }}
+        };
+                
+        if(preferences.use_local_messages==1) {
+                if(expresso_local_messages.is_offline_installed()) {
+                        menuToolsItems["i09"] = {"name": get_lang("Send from queue"), "icon": "queue", callback: force_check_queue };
+                }
+        }
+    } else {
+        var menuToolsItems = {
+                "i01": {"name": get_lang("Search"), "icon": "search-mail", callback: function(key, opt){ search_emails(""); }}
+        }
+    }
+    $.contextMenu({
+        selector: "#link_tools",
+        trigger: 'hover',
+        className: 'context-menu-tools',
+        position: function($menu, x, y){
+                $menu.$menu.position({ my: "center top", at: "center bottom", of: this, offset:"0 0"});
+        },
+        determinePosition: function($menu, x, y){
+                $menu.css('display', 'block').position({ my: "center top", at: "center bottom", of: this}).css('display', 'none');
+        },
+        delay:500,
+        autoHide:true,
+        events: {
+                show: function(opt) {
+                        var $trigger = $(opt.selector).css({'background-color': '#ffffff', 'border': '1px solid #CCCCCC'});
+                        $('.context-menu-tools.context-menu-list.context-menu-root').css({'width': $trigger.css('width') });
+                        $('.context-menu-tools.context-menu-list').css({'background': '#ffffff'})
+                        .find(".context-menu-item").css({'background-color': '#ffffff'}).hover(
+                                function(){
+                                        $(this).css({'background-color': '#CCCCCC'});
+                                }, 
+                                function(){
+                                        $(this).css({'background-color': '#ffffff'});
+                                }
+                        );
+                        return true;
+                },
+                hide: function(opt) {
+                        $(opt.selector).css({'background-color': '', 'border': 'none'});
+                        return true;
+                }
+        },
+        callback: function(key, options) {
+                //TODO - default actions
+
+        },
+        items: menuToolsItems
+    });
+    var reComplexEmail = /<([^<]*)>[\s]*$/;
+    $.contextMenu({
+        selector: ".box",
+        autoHide:true,
+        items: {
+                "add" : {name: get_lang("Quick Add"), icon : "quick-add",callback: function(key, opt){ var fname = $(opt.$trigger).find("input").val().split('"')[1];ccQuickAddOne.showList(','+fname+', ,'+$.trim($(opt.$trigger).find("input").val()).match(reComplexEmail)[1]); }},
+                "remove" : {name:get_lang("Remove recipient"), icon:"delete-box",callback: function(key, opt){ $(opt.$trigger).remove(); }},
+                "sep1": "---------",
+                "quick_search" : {name:get_lang("Quick search of messages"), icon: "quick-search-contact",callback: function(key, opt){ search_emails($.trim($(opt.$trigger).find("input").val()).match(reComplexEmail)[1]); }},
+                "full_search" : {name:get_lang("Search messages of ..."), icon: "quick-search-contact",callback: function(key, opt){ search_emails("", $.trim($(opt.$trigger).find("input").val()).match(reComplexEmail)[1]);}}         
+        }
+    });
+
+    function updateLabelsColumn(messageInfo) {
+        var msg_number = messageInfo.msg_number;
+        //uid é o numero da mensagem quando os dados são carregados na busca rapida.
+        if(messageInfo.uid != '' && messageInfo.uid != 'undefined' && messageInfo.uid != null){
+                msg_number = messageInfo.uid;
+        }
+        var msg_folder = current_folder;
+        if(messageInfo.boxname != '' && messageInfo.boxname != 'undefined' && messageInfo.boxname != null){
+                msg_folder = messageInfo.boxname;
+        }
+        
+         if(current_folder == msg_folder || !current_folder){
+                 $('#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number)
+                 .html('<img src="../prototype/modules/mail/img/tag.png">');
+        }else{
+                $('tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number)
+                .html('<img src="../prototype/modules/mail/img/tag.png">');
+        }
+        
+        var menuItems = {};
+        if (messageInfo.labels) {
+                if($.isArray(messageInfo.labels)){
+                        var labels = messageInfo.labels;
+                        messageInfo.labels = {};
+                        for(var i in labels)
+                                messageInfo.labels[labels[i].id] = {backgroundColor: labels[i]['backgroundColor'],
+                                        borderColor: labels[i]['borderColor'],
+                                        fontColor: labels[i]['fontColor'], id: labels[i]['id'], name: labels[i]['name'], 
+                                        uid: labels[i]['uid'] }
+                }       
+                menuItems = messageInfo.labels;
+        } else {
+                var labeleds = DataLayer.get('labeled', {
+                        criteria: {deepness: '2'},
+                        filter: [
+                                'AND',
+                                ['=', 'folderName', msg_folder], 
+                                ['=', 'messageNumber', msg_number]
+                        ]
+                        
+                });
+                if (labeleds) {
+                        for (var i=0; i < labeleds.length; i++)
+                                menuItems[labeleds[i].label.id] = labeleds[i].label;
+                } else {
+                        $('#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number)
+                        .html('');
+                        //$.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number+':first');
+                        $.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number);
+                        return false;
+                }
+        }
+        var menuItensLabel = {};
+        for(index in menuItems){
+                menuItensLabel[index] = {type: "label", customName: menuItems[index].name, id: msg_folder+"/"+msg_number+"#"+index};            
+        }
+        $.contextMenu.types.label = function(item, opt, root) {
+            $('<span>'+item.customName+'</span><span class="removeLabeled" title="'+get_lang("Remove Label")+'">x</span>')
+                .appendTo(this);
+                $(this).find('span.removeLabeled').click(function(){
+                        //TODO Mudar quando API abstrair atualizações no cache
+                        DataLayer.remove('labeled', false);
+                        DataLayer.get('labeled');
+                        DataLayer.remove('labeled', item.id);
+                        DataLayer.commit(false, false, function(){
+                                updateLabelsColumn({msg_number:msg_number, boxname:msg_folder, labels:false});
+                        });
+                });
+        };
+        if(current_folder == msg_folder || !current_folder){
+                $.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number);
+                $.contextMenu({
+                        selector: '#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number,
+                        trigger: 'hover',
+                        delay:100,
+                        autoHide:true,
+                        callback: function(key, options) {
+                                //TODO - default actions
+                        },
+                        items: menuItensLabel
+                });
+        }else{
+                $.contextMenu( 'destroy', 'tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number);
+
+                $.contextMenu({
+                        selector: 'tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number,
+                        trigger: 'hover',
+                        delay:100,
+                        autoHide:true,
+                        callback: function(key, options) {
+                                //TODO - default actions
+                        },
+                        items: menuItensLabel 
+                });     
+        }
+    }
+
+    function loadExtraLDAPBox(data, element){
+
+        if(!!data[0]){
+            var decoded = {};
+
+            $.each(data, function(i, e){
+                decoded[e.name] = e.value;
+            });
+
+            data = decoded;
+        }
+
+        menuItensLabel = {};
+        menuItensLabel["Name"] = {name: "<b>"+data.name+"</b>", disabled: true};
+        menuItensLabel["Email"] = {name: data.email, disabled: true};
+        if(!!data.telephone){
+            menuItensLabel["TelefoneLabel"] = {name: "<b>"+get_lang("Telephone")+"</b>", disabled: true};
+            menuItensLabel["TelefoneValue"] = {name: data.telephone, disabled: true};
+        }
+        if(data.vacationActive){
+            if(data.vacationActive == "TRUE"){
+                menuItensLabel["outOffice"] = {name: "<b>"+get_lang("Out of office")+"</b>", disabled: true};
+                menuItensLabel["outOfficeValue"] = {name: data.vacationInfo.substring(0, 20), disabled: true};
+            }
+        }
+        $.contextMenu({
+            selector: "#content_id_"+currentTab+" "+element+" .box-info",
+            trigger: 'hover',
+            delay:100,
+            autoHide:true,
+            items: menuItensLabel
+        }); 
+    }
+
+    function loadGroupBox(data, element){
+        menuItensLabel = {};
+        menuItensLabel["ContactGroupLabelAll"] = {name:"<b>"+get_lang("Group contacts")+"</b>", disabled: true};
+        menuItensLabel["sep1"] = "---------";
+        if(data.itens){
+                var aux = 0;
+                var ctcName = "";
+                for(var item in data.itens){
+                        if(parseInt(item) <= 4){
+                                ctcName = data.itens[item].data[0].value;
+                                ctcName = ctcName.length > 2 ? ctcName : data.itens[item].data[2].value.substr(0,data.itens[item].data[2].value.indexOf("@"));
+                                menuItensLabel["ContactGroupLabel"+item] = {name: "<b>"+ctcName+"</b>", disabled: true};
+                                menuItensLabel["ContactGroupValue"+item] = {name: data.itens[item].data[2].value, disabled: true};
+                        }else{
+                                aux++;
+                                if(aux == 1)
+                                        menuItensLabel["MoreContactGroupValue"] = {name : get_lang("And more %1 contact", aux), disabled: true };
+                                else
+                                        menuItensLabel["MoreContactGroupValue"] = {name : get_lang("And more %1 contact", aux)+"s", disabled: true };
+                        }
+                }
+        }
+        $.contextMenu({
+                selector: "#content_id_"+currentTab+" "+element+" .box-info",
+                trigger: 'hover',
+                delay:100,
+                autoHide:true,
+                items: menuItensLabel
+        });     
+    }
+
+
+
+
+

trunk/expressoMail1_2/js/draw_api.js

@@ -108 +108 @@
                 }
 
+                
+                //MAILARCHIVER-01
+                //Create local folders main structure tree
+                if(preferences.use_local_messages=="1"){
+                    var disabled_local_span = document.getElementById('llocal_disabledtree_folders');
+
+                    //Services are disabled: because Mail Archiver is not running/installed or have just crashed. Link activation is created here
+                    if(!expresso_mail_archive.enabled){
+                        //window.alert('tem o nodo disabled? ' + tree_folders.getNodeById("local_disabled") + '[' + typeof(tree_folders.getNodeById('local_disabled')) + ']');
+                        if(typeof(tree_folders.getNodeById("local_disabled")) == 'undefined'){
+                          var n_LocalDisabled = new dNode({id: "local_disabled", caption: get_lang('Offline'), onClick: "services_retry()", plusSign:false});
+                          tree_folders.add(n_LocalDisabled, 'local_root');
+                        }
+
+                        tree_folders.getNodeById("local_disabled").alter({caption:get_lang('Offline'), onClick: "retry_local_folders()"});
+                        tree_folders.getNodeById("local_disabled")._refresh();
+                        
+                        if((disabled_local_span) && (!document.getElementById('services_retry'))){
+                            disabled_local_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_services.png)";
+
+                            var service_retry = document.createElement("SPAN");
+                            service_retry.id = 'services_retry';
+                            service_retry.className = 'clean_trash';
+                            service_retry.style.cursor = 'pointer';
+                            service_retry.onclick = function () {services_retry();};
+                            service_retry.innerHTML = "["+get_lang("Retry")+"]";
+                            service_retry.title="Reconectar ao Mail Archiver";
+                            service_retry.onmouseover = function() {service_retry.style.color="red";};
+                            service_retry.onmouseout= function() {service_retry.style.color="#666666";}; //#114FA4
+                            disabled_local_span.parentNode.appendChild(service_retry);
+                        }
+                        else{
+                            //Creates the tree node and MA console linkage
+                            if((!disabled_local_span) && (!document.getElementById('services_retry'))){
+                                var n_LocalDisabled = new dNode({id: "local_disabled", caption: get_lang('Offline'), onClick: "services_retry()", plusSign:false});
+                                tree_folders.add(n_LocalDisabled, 'local_root');
+                            
+                                var disabled_local_span = document.getElementById('llocal_disabledtree_folders');
+                                disabled_local_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_services.png)";
+                                var service_retry = document.createElement("SPAN");
+                                service_retry.id = 'services_retry';
+                                service_retry.className = 'clean_trash';
+                                service_retry.style.cursor = 'pointer';
+                                service_retry.onclick = function () {services_retry();};
+                                service_retry.innerHTML = "["+get_lang("Retry")+"]";
+                                service_retry.title= get_lang("Reconect to MailArchiver services");
+                                service_retry.onmouseover = function() {service_retry.style.color="red";};
+                                service_retry.onmouseout= function() {service_retry.style.color="#666666";}; //#114FA4
+                                disabled_local_span.parentNode.appendChild(service_retry);
+                            
+                                var div_ma_host = document.createElement('div');
+                                div_ma_host.id = 'div_login_ma_host';
+                                div_ma_host.style.position = 'absolute';
+                                div_ma_host.style.padding = '0px';
+                                div_ma_host.style.margin = '0px';
+                                div_ma_host.style.top = '25px';
+                                div_ma_host.style.left = '0px';
+                                div_ma_host.style.width = '145px';
+                                div_ma_host.style.height = '80px';
+                                div_ma_host.style.border = '1px solid #CCCCCC';
+                                div_ma_host.style.backgroundColor = '#F0F0F0';
+                                div_ma_host.style.fontWeight = 'normal';
+                                disabled_local_span.appendChild(div_ma_host);
+                                div_ma_host.innerHTML = '<p><b>'+get_lang('In trouble?')+'</b></p><p>&rarr; ' + get_lang('Try to access') + '<br/><a href="' + mail_archive_protocol + "://" + mail_archive_host + ":" + mail_archive_port + '/admin" target="_blank" title="MailArchiver Admin">'+get_lang('MailArchiver admin console')+'.</p>';                            
+                            }
+                            //Only creates the MA login linkage
+                            else{
+                                var div_ma_host = document.createElement('div');
+                                div_ma_host.id = 'div_login_ma_host';
+                                div_ma_host.style.position = 'absolute';
+                                div_ma_host.style.padding = '0px';
+                                div_ma_host.style.margin = '0px';
+                                div_ma_host.style.top = '25px';
+                                div_ma_host.style.left = '0px';
+                                div_ma_host.style.width = '145px';
+                                div_ma_host.style.height = '80px';
+                                div_ma_host.style.border = '1px solid #CCCCCC';
+                                div_ma_host.style.backgroundColor = '#F0F0F0';
+                                div_ma_host.style.fontWeight = 'normal';
+                                disabled_local_span.appendChild(div_ma_host);
+                                div_ma_host.innerHTML = '<p><b>'+get_lang('In trouble?')+'</b></p><p>&rarr; ' + get_lang('Try to access') + '<br/><a href="' + mail_archive_protocol + "://" + mail_archive_host + ":" + mail_archive_port + '/admin" target="_blank" title="MailArchiver Admin">'+get_lang('MailArchiver admin console')+'.</p>';                                                        
+                            }
+                        }
+                    }
+                    //Services enabled: list folders service must be invoqued
+                    else{
+                        var services_retry_span = document.getElementById('services_retry');
+
+                        if(services_retry_span){
+                            //window.alert('Tem services_retry -> vai remover o disabled_local_span');
+                            var node_disabled_to_remove = document.getElementById('nlocal_disabledtree_folders');
+                            //document.getElementById('chlocal_roottree_folders').removeChild('nlocal_disabledtree_folders');
+                            //services_retry_span.parentNode.removeChild(services_retry_span);
+                            node_disabled_to_remove.parentNode.removeChild(node_disabled_to_remove);
+                        }
+                        //else
+                          //  window.alert('Sem services retry');
+
+                        //tree_folders.getNodeById("local_disabled").alter({caption:get_lang('List_Folders')});
+                                                
+                       //expresso_mail_archive.getFoldersList('FERNANDAO22', "");
+                       var drawinginfo = {treeObject: tree_folders, treeName: 'tree_folders'};
+                       expresso_mail_archive.drawdata = drawinginfo;
+                       //expresso_mail_archive.getFoldersList("");                        
+                        
+                        //tree_folders.getNodeById("local_root")._refresh();
+
+                        if(disabled_local_span)
+                            disabled_local_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_folder.png)";                       
+                    }      
+                }
+
                 return;
         }
@@ -148 +260 @@
                 }
 
-
+                
+                //MAILARCHIVER-02
+                //Create local folders main structure tree
+                if(preferences.use_local_messages=="1"){   
+                    //Add the local_root node
+                    var root_local = new dNode({id: "local_root", caption: get_lang('local folders'), plusSign: true});
+                    tree_folders.add(root_local, "root");   
+                    
+                    //Services are disabled: because Mail Archiver is not running/installed or have just crashed. Link activation is created here
+                    if(!expresso_mail_archive.enabled){
+                        var n_LocalDisabled = new dNode({id: "local_disabled", caption: get_lang('Offline'), onClick: "services_retry()", plusSign:false});
+                        tree_folders.add(n_LocalDisabled, 'local_root');
+                        
+                    }
+                    
+                    //Services enabled: list folders service must be invoqued
+                    else{
+                        var drawinginfo = {treeObject: tree_folders, treeName: 'tree_folders'};
+                        expresso_mail_archive.drawdata = drawinginfo;
+                        //expresso_mail_archive.getFoldersList("");
+                    }
+                    
+                    //Opens the local folders tree view
+                    //tree_folders.getNodeById("local_root").open();
+                    
+                }
 
                 var handlerChannel = function(data){
@@ -183 +320 @@
                  * Pastas locais
                  */
-                if (preferences.use_local_messages==1 || expresso_offline) {
-                            //verifica se gears esta installado ou o offline
-                        if( (!window.google || !google.gears) &&
-                             !expresso_local_messages.installGears() ){
-                                preferences.use_local_messages = 0;
-                        }
-                        else if( !expresso_local_messages.is_offline_installed() )
-                                preferences.use_local_messages = 0;
-                        else{
-                                if (expresso_offline)
-                                        tree_folders = new dFTree({
-                                                name: 'tree_folders'
-                                        });
-                                var root_local = new dNode({
-                                        id: "local_root",
-                                        caption: get_lang('local folders')
-                                });
-                                tree_folders.add(root_local, "root"); //coloca root local
-                                var local_folders = expresso_local_messages.list_local_folders();
-                                for (var i in local_folders) { //Coloca as pastas locais.
-                                        var node_root = "local_root";
-                                        var new_caption = local_folders[i][0];
-                                        if (local_folders[i][0].indexOf("/") != "-1") {
-                                                final_pos = local_folders[i][0].lastIndexOf("/");
-                                                node_root = "local_" + local_folders[i][0].substr(0, final_pos);
-                                                new_caption = local_folders[i][0].substr(final_pos + 1);
-                                        }
-                                        if (local_folders[i][1] > 0)
-                                                var nodeLocal = new dNode({
-                                                        id: "local_" + local_folders[i][0],
-                                                        caption: lang_folder(new_caption) + '<font style=color:red>&nbsp(</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>',
-                                                        onClick: "change_folder('local_" + local_folders[i][0] + "','" + new_caption + "')",
-                                                        plusSign: local_folders[i][2]
-                                                });
-                                        else
-                                                var nodeLocal = new dNode({
-                                                        id: "local_" + local_folders[i][0],
-                                                        caption: lang_folder(new_caption),
-                                                        onClick: "change_folder('local_" + local_folders[i][0] + "','" + new_caption + "')",
-                                                        plusSign: local_folders[i][2]
-                                                });
-                                                tree_folders.add(nodeLocal, node_root);
-                                        }
-                                }
-                        }
 
                 /*tree_folders.draw(Element('content_folders'));
@@ -276 +368 @@
 
 
+                //MAILARCHIVER-04
+                if ((disabled_local_span) && (!expresso_mail_archive.enabled)){
+                    disabled_local_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_services.png)";
+                        //div to login at MA Admin console
+                        var div_ma_host = document.createElement('div');
+                        div_ma_host.id = 'div_login_ma_host';
+                        div_ma_host.style.position = 'absolute';
+                        div_ma_host.style.padding = '0px';
+                        div_ma_host.style.margin = '0px';
+                        div_ma_host.style.top = '25px';
+                        div_ma_host.style.width = '145px';
+                        div_ma_host.style.height = '80px';
+                        div_ma_host.style.border = '1px solid #CCCCCC';
+                        div_ma_host.style.backgroundColor = '#F0F0F0';
+                        div_ma_host.style.fontWeight = 'normal';
+                        disabled_local_span.appendChild(div_ma_host);
+                        div_ma_host.innerHTML = '<p><b>'+get_lang('In trouble?')+'</b></p><p>&rarr; ' + get_lang('Try to access') + '<br/><a href="' + mail_archive_protocol + "://" + mail_archive_host + ":" + mail_archive_port + '/admin" target="_blank" title="MailArchiver Admin">'+get_lang('MailArchiver admin console')+'.</p>';
+                }
+
+
                 draw_paging(Element('tot_m').innerHTML);
                 if(document.getElementById(mount_url_folder(["nINBOX",special_folders["Trash"]])+"tree_folders"))
@@ -305 +417 @@
                            }
 
-                if(!expresso_offline)
+        //MAILARCHIVER-05
+        if(document.getElementById("nlocal_disabledtree_folders") && (!expresso_mail_archive.enabled) && (!document.getElementById('services_retry')))
+        {
+            var service_retry = document.createElement("SPAN");
+            service_retry.id = 'services_retry';
+            service_retry.className = 'clean_trash';
+            service_retry.style.cursor = 'pointer';
+            service_retry.onclick = function () {services_retry();};
+            service_retry.innerHTML = "["+get_lang("Retry")+"]";
+            service_retry.title="Reconectar ao Mail Archiver";
+            service_retry.onmouseover = function() {service_retry.style.color="red";};
+            service_retry.onmouseout= function() {service_retry.style.color="#666666";}; //#114FA4
+            document.getElementById("nlocal_disabledtree_folders").appendChild(service_retry);
+        }
+
+            //MAILARCHIVER-00
+                //if(!expresso_offline)
                         var display_unseen_in_mailbox = tree_folders.getNodeById( 'root' );
-                else
-                        var display_unseen_in_mailbox = tree_folders.getNodeById( 'local_root' );
+                //else
+                        //var display_unseen_in_mailbox = tree_folders.getNodeById( 'local_root' );
                 display_unseen_in_mailbox.alter({caption:get_lang("My Folders")});
                 display_unseen_in_mailbox._refresh();
@@ -391 +519 @@
 
 function draw_tree_local_folders() {
-        /**
-         * Pastas locais
-         */
-                if(preferences.use_local_messages==1 || expresso_offline) {
-                        var local_folders = expresso_local_messages.list_local_folders();
-                        var has_changes = false;
-                        for (var i in local_folders) { //Coloca as pastas locais.
-
-                                var new_caption = local_folders[i][0];
-                                if(local_folders[i][0].indexOf("/")!="-1") {
-                                        final_pos = local_folders[i][0].lastIndexOf("/");
-                                        new_caption = local_folders[i][0].substr(final_pos+1);
-                                }
-
-                                var folder_unseen = Element('dftree_local_'+local_folders[i][0]+'_unseen');
-
-                                if ((folder_unseen) && (local_folders[i][1] > 0))
-                                {
-                                        folder_unseen.innerHTML = local_folders[i][1];
-                                        has_changes = true;
-                                }
-                                else if (local_folders[i][1] > 0)
-                                {
-                                        tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(new_caption) + '<font style=color:red>&nbsp(</font><span id="dftree_local_'+local_folders[i][0]+'_unseen" style=color:red>'+local_folders[i][1]+'</span><font style=color:red>)</font>'});
-                                        tree_folders.getNodeById("local_"+local_folders[i][0])._refresh();
-                                        has_changes = true;
-                                }
-                                else if (local_folders[i][1] <= 0)
-                                {
-                                        tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(new_caption)});
-                                        tree_folders.getNodeById("local_"+local_folders[i][0])._refresh();
-                                        has_changes = true;
-                                }
-
-                        if("local_"+local_folders[i][0] == get_current_folder()){
-                                        var old_new_m = isNaN(parseInt(Element('new_m').innerHTML)) ? parseInt(Element('new_m').firstChild.innerHTML) : parseInt(Element('new_m').innerHTML);
-                                        if(!isNaN(old_new_m) && old_new_m < local_folders[i][1]){
-                                                Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) + (parseInt(local_folders[i][1])-old_new_m);
-                                        }
-                                        Element('new_m').innerHTML = local_folders[i][1] ? '<font color="RED">'+local_folders[i][1]+'</font>' : 0;
-                                        draw_paging(Element('tot_m').innerHTML);
-                                        has_changes = true;
-                        }
-                }
-                        if(has_changes)
-                                tree_folders.getNodeById("local_root").open();
-        }
-}
+    /**
+     * Pastas locais
+     */
+        //MAILARCHIVER-04
+        if ( preferences.use_local_messages=="1" ) {
+            var local_folders_list = expresso_mail_archive.getFoldersList("");
+        }
+}
+
+// function draw_tree_local_folders() {
+//      /**
+//       * Pastas locais
+//       */
+//              if(preferences.use_local_messages==1 || expresso_offline) {
+//                      var local_folders = expresso_local_messages.list_local_folders();
+//                      var has_changes = false;
+//                      for (var i in local_folders) { //Coloca as pastas locais.
+
+//                              var new_caption = local_folders[i][0];
+//                              if(local_folders[i][0].indexOf("/")!="-1") {
+//                                      final_pos = local_folders[i][0].lastIndexOf("/");
+//                                      new_caption = local_folders[i][0].substr(final_pos+1);
+//                              }
+
+//                              var folder_unseen = Element('dftree_local_'+local_folders[i][0]+'_unseen');
+
+//                              if ((folder_unseen) && (local_folders[i][1] > 0))
+//                              {
+//                                      folder_unseen.innerHTML = local_folders[i][1];
+//                                      has_changes = true;
+//                              }
+//                              else if (local_folders[i][1] > 0)
+//                              {
+//                                      tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(new_caption) + '<font style=color:red>&nbsp(</font><span id="dftree_local_'+local_folders[i][0]+'_unseen" style=color:red>'+local_folders[i][1]+'</span><font style=color:red>)</font>'});
+//                                      tree_folders.getNodeById("local_"+local_folders[i][0])._refresh();
+//                                      has_changes = true;
+//                              }
+//                              else if (local_folders[i][1] <= 0)
+//                              {
+//                                      tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(new_caption)});
+//                                      tree_folders.getNodeById("local_"+local_folders[i][0])._refresh();
+//                                      has_changes = true;
+//                              }
+
+//                      if("local_"+local_folders[i][0] == get_current_folder()){
+//                                      var old_new_m = isNaN(parseInt(Element('new_m').innerHTML)) ? parseInt(Element('new_m').firstChild.innerHTML) : parseInt(Element('new_m').innerHTML);
+//                                      if(!isNaN(old_new_m) && old_new_m < local_folders[i][1]){
+//                                              Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) + (parseInt(local_folders[i][1])-old_new_m);
+//                                      }
+//                                      Element('new_m').innerHTML = local_folders[i][1] ? '<font color="RED">'+local_folders[i][1]+'</font>' : 0;
+//                                      draw_paging(Element('tot_m').innerHTML);
+//                                      has_changes = true;
+//                      }
+//              }
+//                      if(has_changes)
+//                              tree_folders.getNodeById("local_root").open();
+//      }
+// }
 
 
@@ -539 +677 @@
                         return true;
                 }
-                $.ajax({                        
-                        url: "controller.php?" + $.param( {action: "$this.imap_functions.getMessagesIds", 
-                                folder: folder,                         
-                                sort_box_type: "SORTARRIVAL", 
-                                search_box_type: search_box_type,
-                                sort_box_reverse: "1"
-                                }),
-                        success: function(data){
-                                data = connector.unserialize(data);
-                                if(data){
-                                        var _data = {};
-                                        $.each(data,function(index,value){
-                                                if (value){
-                                                        _data[index] = value;
-                                                }
-                                        });
-                                        populateSelectedMsgs(_data);
-                                
-                                }
-                        },
-                        beforeSend: function( jqXHR, settings ){
-                                connector.showProgressBar();
-                        },
-                        complete: function( jqXHR, settings ){
-                                connector.hideProgressBar();
-                        }
-                });
+                //MAILARCHIVE
+        //se for pasta local
+        if (/^local_messages/.test(current_folder)) {
+            $(".folders-loading").removeClass("folders-loading"); //remove o icone de loading ao clicar nas pastas locais
+            selectAllFolderMsgs(false);
+            //Método chamado para retornar todos os ids de mensagens por folder
+            expresso_mail_archive.listAllMessagesByFolder(folder.replace("local_messages_",""));
+            populateSelectedMsgs(expresso_mail_archive.allmessagesbyfolder);
+        }
+        else { //se não, processamento normal da pasta
+                $.ajax({
+                        url: "controller.php?" + $.param( {action: "$this.imap_functions.getMessagesIds", 
+                                folder: folder,
+                                 msg_range_begin: "0",
+                                 msg_range_end: "0",                                    
+                                sort_box_type: "SORTARRIVAL", 
+                                search_box_type: search_box_type,
+                                sort_box_reverse: "1"
+                                }),
+                        success: function(data){
+                                data = connector.unserialize(data);
+                                if(data){
+                                        var _data = {};
+                                        $.each(data,function(index,value){
+                                                if (data[index] && data[index].msg_number){
+                                                        _data[data[index].msg_number] = data[index].msg_number;
+                                                }
+                                        });
+                                        populateSelectedMsgs(_data);
+                                        _data = {};
+                                
+                                }
+                        },
+                        beforeSend: function( jqXHR, settings ){
+                                connector.showProgressBar();
+                        },
+                        complete: function( jqXHR, settings ){
+                                connector.hideProgressBar();
+                        }
+                });
+        }
                 proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort_box_type,search_box_type,sort_box_reverse,preferences.preview_msg_subject,preferences.preview_msg_tip,handler_draw_box);
         }
@@ -1573 +1725 @@
         if ( !currentTab )
                 alternate_border(numBox);
-        draw_footer_box(headers_msgs.num_msgs);
+        draw_footer_box(headers_msgs.length);
         Element('main_table').style.display = '';
         if(is_ie6)        // Stupid Fixing on IE6.
@@ -1667 +1819 @@
 
                 tr_element.msg_sample = "";
+        tr_element.tip = "";
                 //if(headers_msgs.msg_sample && headers_msgs.msg_sample.preview_msg_subject != "")
                 if(headers_msgs.msg_sample && preferences.preview_msg_subject == "1" && headers_msgs.msg_sample.body !== "")
@@ -1674 +1827 @@
                         else
                                 tr_element.msg_sample = html_entities(Base64.decode(headers_msgs.msg_sample.body).substr(0,120) + "..."); //trecho do body que sera exibido com o assunto;
-                }
-
-                tr_element.tip = "";
-                if(headers_msgs.msg_sample && preferences.preview_msg_tip == "1" && headers_msgs.msg_sample.body !== "")
-                {
-                        tr_element.tip = Base64.decode(headers_msgs.msg_sample.body).substr(3,300) + "..."; //trecho do body que sera exibido no tool-tip;
-                }
-
+
+            //if(preferences.use_local_messages==1 && !expresso_offline) { //MailArchive
+                if(proxy_mensagens.is_local_folder(current_folder)) {
+                    // preferencia da pre-visualizacao
+                    if (cssForResizing) {//Colunas redimensionaveis - nao trunca
+                        tr_element.msg_sample = headers_msgs.msg_sample.body.substr(0,180) + "..."; //trecho do body que sera exibido com o assunto; //blabla
+                    } else {
+                        tr_element.msg_sample = headers_msgs.msg_sample.body.substr(0,120) + "..."; //trecho do body que sera exibido com o assunto;
+                    }
+
+                    // preferencia dos tooltips
+                    if(headers_msgs.msg_sample && preferences.preview_msg_tip == "1" && headers_msgs.msg_sample.body !== "") {
+                        tr_element.tip = headers_msgs.msg_sample.body.substr(3,300) + "..."; //trecho do body que sera exibido no tool-tip;
+                    }
+
+                }
+
+            /*}*/ else { //IMAP
+                 // preferencia da pre-visualizacao
+                             if (cssForResizing) { //Colunas redimensionaveis - nao trunca
+                    /*problema no decode, se ele for utilizado, nao lista as mensagens -> CORRIGIDO em mail_archiver.js*/
+                    //if (headers_msgs.msg_sample.body.length > 0)
+                                    tr_element.msg_sample = Base64.decode(headers_msgs.msg_sample.body).substr(0,180) + "..."; //trecho do body que sera exibido com o assunto; //blabla
+                             } else {
+                                    //if (headers_msgs.msg_sample.body.length > 0)
+                                        tr_element.msg_sample = Base64.decode(headers_msgs.msg_sample.body).substr(0,120) + "..."; //trecho do body que sera exibido com o assunto;
+                          }
+
+                // preferencia dos tooltips
+                if(headers_msgs.msg_sample && preferences.preview_msg_tip == "1" && headers_msgs.msg_sample.body !== "") {
+                    tr_element.tip = Base64.decode(headers_msgs.msg_sample.body).substr(3,300) + "..."; //trecho do body que sera exibido no tool-tip;
+                }
+            }
+        }
+
+                
                 if ((headers_msgs.Unseen == 'U') || (headers_msgs.Recent == 'N')){
-                        if ((headers_msgs.Flagged == 'F') || headers_msgs.Importance.toLowerCase().indexOf("high")!=-1 )
+                        if ((headers_msgs.Flagged == 'F') || ( headers_msgs.Importance !== undefined && headers_msgs.Importance.toLowerCase().indexOf("high")!=-1 ) )
                                 add_className(tr_element, 'flagged_msg');
                         add_className(tr_element, 'tr_msg_unread');
@@ -1717 +1898 @@
 
                 td_element2 = createTDElement(0,1,"td_msg");
-                if (headers_msgs.attachment == 1)
+                if (headers_msgs.attachment == 1 || headers_msgs.attachment.number_attachments> 0)
                         td_element2.innerHTML = "<img src ='templates/"+template+"/images/clip.gif' >";
 
@@ -1887 +2068 @@
                 else
                 {
-                        td_element4.innerHTML += headers_msgs.subject + "<span style=\"color:#b3b3b3;\">  " + tr_element.msg_sample + "</span>";//modificacao feita para exibir o trecho do body ao lado do assunto da mensagem;
+                        td_element4.innerHTML += ($.trim(headers_msgs.subject) == "" ? "("+get_lang("No Subject")+")" : headers_msgs.subject) + "<span style=\"color:#b3b3b3;\">  " + tr_element.msg_sample + "</span>";//modificacao feita para exibir o trecho do body ao lado do assunto da mensagem;
                 }
 
@@ -1906 +2087 @@
                 }
                 
-                td_element26 = createTDElement(0,6,"td_msg","center","td_message_followup_"+headers_msgs.msg_number);
-                $(td_element26).addClass("td-followup-flag");
-                td_element26.innerHTML = '<div class="flag-edited" style="width:8px;height:6px;"><img src="../prototype/modules/mail/img/flagEditor.png"></div>';
-        
+                  td_element26 = createTDElement(0,6,"td_msg","center","td_message_followup_"+headers_msgs.msg_number);
+                  $(td_element26).addClass("td-followup-flag");
+
+        if(get_current_folder().split("_")[0] != "local"){
+                  td_element26.innerHTML = '<div class="flag-edited" style="width:8px;height:6px;"><img src="../prototype/modules/mail/img/flagEditor.png"></div>';
+            } else {
+            td_element26.innerHTML = "";
+        }
+        
                 if (headers_msgs.followupflagged) {
                         if(headers_msgs.followupflagged.followupflag.id < 7){
@@ -2125 +2311 @@
         search_box_type = search;
         if (typeof(clean_selected) == "undefined"){     
-                $.ajax({                        
+                
+        $.ajax({                        
                         url: "controller.php?" + $.param( {action: "$this.imap_functions.getMessagesIds", 
                                 folder: get_current_folder(),                                   
@@ -2151 +2338 @@
                         }
                 });
+        
         }       
         proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort,search,sort_box_reverse,preferences.preview_msg_subject,preferences.preview_msg_tip,handler_draw_box);
@@ -2430 +2618 @@
         var _maxChar = menuHidden ? 40 : 15;
 
-        if (info_msg.from.name)
-        {
-                var spanName = document.createElement("SPAN");
-                        spanName.innerHTML = info_msg.from.name;
-                _name = spanName.innerHTML.length > _maxChar ? spanName.innerHTML.substring(0,_maxChar) + "..." : spanName.innerHTML;
-        }
-        else
-                _name = info_msg.from.email.length > _maxChar ? info_msg.from.email.substring(0,_maxChar) + "..." : info_msg.from.email;
+    if(info_msg.from){
+        if (info_msg.from.name)
+        {
+                var spanName = document.createElement("SPAN");
+                        spanName.innerHTML = info_msg.from.name;
+                _name = spanName.innerHTML.length > _maxChar ? spanName.innerHTML.substring(0,_maxChar) + "..." : spanName.innerHTML;
+        }
+        else
+                _name = info_msg.from.email.length > _maxChar ? info_msg.from.email.substring(0,_maxChar) + "..." : info_msg.from.email;
+    }
 
         td.innerHTML = _name.bold() + ', ' + info_msg.smalldate;
@@ -2516 +2706 @@
         var option_mark_as_unseen = document.createElement("SPAN");
                 option_mark_as_unseen.className = "reply_options";
-        option_mark_as_unseen.onclick = function () {changeLinkState(this,'seen');
-                proxy_mensagens.proxy_set_message_flag(folder_id,'unseen');
+            option_mark_as_unseen.onclick = function () {changeLinkState(this,'seen');
+                proxy_mensagens.proxy_set_message_flag(folder_id,'unseen',null,ID.split("_r_")[0]);
                 write_msg(get_lang('Message marked as ')+get_lang("Unseen"));
         };
@@ -2532 +2722 @@
                 option_mark_important.onclick = function() {
                         var _this = this;
-                        proxy_mensagens.proxy_set_message_flag(folder_id,'unflagged', function(success){
-                                if (success) {
-                                        changeLinkState(_this, 'important');
-                                        write_msg(get_lang('Message marked as ') + get_lang("Normal"));
-                                }
-                        } );
-
+            changeLinkState(_this, 'important');
+                        proxy_mensagens.proxy_set_message_flag(folder_id,'unflagged',null,ID.split("_r_")[0]);
+            write_msg(get_lang('Message marked as ')+get_lang("Normal"));
                 };
-                option_mark_important.innerHTML = get_lang("Normal");
+        option_mark_important.innerHTML = get_lang("Normal");
         }
         else{
-                option_mark_important.onclick = function() {changeLinkState(this,'normal');
-                        proxy_mensagens.proxy_set_message_flag(folder_id,'flagged');
+                option_mark_important.onclick = function() {changeLinkState(this,'normal',null,ID.substr(0, ID.length-2));
+                        proxy_mensagens.proxy_set_message_flag(folder_id,'flagged',null,ID.split("_r_")[0]);
                         write_msg(get_lang('Message marked as ')+get_lang("Important"));
                 };
@@ -2994 +3180 @@
         var tr1 = document.createElement("TR");
         tr1.className = "tr_message_header";
-        var td1 = document.createElement("TD");
-        td1.innerHTML = get_lang("From: ");
-        td1.appendChild(deny_email(info_msg.from.email));
-        td1.width = "7%";
+    if(info_msg.from){
+        var td1 = document.createElement("TD");
+        td1.innerHTML = get_lang("From: ");
+        td1.appendChild(deny_email(info_msg.from.email));
+        td1.width = "7%";
+    }
 
         if (info_msg.sender){
@@ -3022 +3210 @@
         var from = document.createElement("TD");
         from.id = "from_"+ID;
-        from.innerHTML = info_msg.from.full;
+    if(info_msg.from){
+           from.innerHTML = info_msg.from.full;
+    }
         if (info_msg.Draft != "X"){
                 from.innerHTML += draw_plugin_cc(ID, info_msg.from);
@@ -3031 +3221 @@
         from_values.id = "from_values_"+ID;
         from_values.type = "HIDDEN";
-        from_values.value = info_msg.from.full; //Veio do IMAP, sem images nem links.
+    if(info_msg.from){
+        from_values.value = info_msg.from.full; //Veio do IMAP, sem images nem links.
+    }
 
         var local_message = document.createElement("INPUT");
@@ -3039 +3231 @@
         local_message.value = (info_msg.local_message)?"1":"0";
 
-        tr1.appendChild(td1);
+    if(info_msg.from){
+           tr1.appendChild(td1);
+    }
         tr1.appendChild(from);
         tr1.appendChild(from_values);
@@ -5126 +5320 @@
 
 function build_quota(data){
+    //MAILARCHIVE
+    // se for a pasta de mensagens locais
+    if(proxy_mensagens.is_local_folder(current_folder)) {
+        return;        
+    }
+
         id = "content_quota";
         q_limit = data['quota_limit'];
@@ -5466 +5666 @@
                 ((expresso_offline)?" ":'<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>') +
                 ((expresso_offline)?" ":'<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 && !expresso_offline)
-                if(proxy_mensagens.is_local_folder(current_folder))
-                        span_options.innerHTML += '&nbsp; <span id="localOption" ' + change_font_color + ' 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 id="localOption" ' + change_font_color + ' title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null)">'+get_lang("Archive")+'</span>';
+
+    //Link arquivar e desarquivar com ação
+    //MAILARCHIVER
+    if(preferences.use_local_messages==1){
+        if(expresso_mail_archive.enabled){
+           if(proxy_mensagens.is_local_folder(current_folder))//Unarchive link
+             span_options.innerHTML += '&nbsp; <span title="'+get_lang("Unarchive")+'" class="message_options" onclick="expresso_mail_archive.unarchieve(\''+folder+'\', null, null);">'+get_lang("Unarchive")+'</span>';
+           else//Archive link                 
+             span_options.innerHTML += '&nbsp; <span title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null,null)">'+get_lang("Archive")+'</span>';
+        }
+    }
+
         if (use_spam_filter) {
                 if ( current_folder == 'INBOX'+cyrus_delimiter+'Spam' ) {
@@ -5487 +5694 @@
                 span_R.appendChild(span_D);
         }
+    
+    var answer = '<span ' + change_font_color + ' id="span_flag_ANSWERED" class="'+(search_box_type == 'ANSWERED' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("title_answered")+'" onclick="if(\'ANSWERED\' == \''+search_box_type+'\') return false;sort_box(\'ANSWERED\',\''+sort_box_type+'\')">'+get_lang("l_answered")+'</span>, ';
+
         span_D.innerHTML =
                  get_lang("List")+': '+
@@ -5492 +5702 @@
         '<span ' + change_font_color + ' id="span_flag_UNSEEN" class="'+(search_box_type == 'UNSEEN' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_unseen")+'" onclick="if(\'UNSEEN\' == \''+search_box_type+'\') return false;sort_box(\'UNSEEN\',\''+sort_box_type+'\')">'+get_lang("l_unseen")+'</span>, '+
         '<span ' + change_font_color + ' id="span_flag_SEEN" class="'+(search_box_type == 'SEEN' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_seen")+'" onclick="if(\'SEEN\' == \''+search_box_type+'\') return false;sort_box(\'SEEN\',\''+sort_box_type+'\')">'+get_lang("l_seen")+'</span>, '+
-        '<span ' + change_font_color + ' id="span_flag_ANSWERED" class="'+(search_box_type == 'ANSWERED' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("title_answered")+'" onclick="if(\'ANSWERED\' == \''+search_box_type+'\') return false;sort_box(\'ANSWERED\',\''+sort_box_type+'\')">'+get_lang("l_answered")+'</span>, '+
+        answer+
         '<span ' + change_font_color + ' id="span_flag_FLAGGED" class="'+(search_box_type == 'FLAGGED' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_important")+'" onclick="if(\'FLAGGED\' == \''+search_box_type+'\') return false;sort_box(\'FLAGGED\',\''+sort_box_type+'\')">'+get_lang("l_important")+'</span>&nbsp;&nbsp;';
         draw_paging(num_msgs);

trunk/expressoMail1_2/js/local_messages.js

@@ -157 +157 @@
 
 local_messages.prototype.init_local_messages = function(){ //starts only database operations
-                
+                return 'retorno local_messages.prototype.init_local_messages';
+}
+
+local_messages.prototype.init_local_messages_old = function(){
     if(this.dbGears==null || this.localServer==null || this.store == null)
         this.create_objects();
@@ -835 +838 @@
 
 local_messages.prototype.get_local_range_msgs = function(folder,msg_range_begin,emails_per_page,sort,sort_reverse,search,preview_msg_subject,preview_msg_tip) {
-
+        this.init_local_messages();
+}
+local_messages.prototype.get_local_range_msgs_old = function(folder,msg_range_begin,emails_per_page,sort,sort_reverse,search,preview_msg_subject,preview_msg_tip) {
     this.init_local_messages();
     var retorno = new Array();

trunk/expressoMail1_2/js/main.js

@@ -1 +1 @@
 // Tempo do auto refresh (em milisegundos)
 var time_refresh = 300000;
+
+//MAILARCHIVER-01
+// Intervalo de tempo de verificacao de comunicacao com o MailArchiver (milisegundos)
+var check_services_interval = 2000;
+// Numero de tentativas de reconexao
+var check_services_tryouts = 1;
+// Limite de tentativas de reconexao
+var check_services_tryouts_limit = 5;
+
 
 // tempo do auto save (em milisegundos)
@@ -6 +15 @@
 var autosave_time = 40000;
 var results_search_messages = ""; 
-var cabecalho = '<h4>ExpressoLivre - ExpressoMail</h4>'; 
-
+var cabecalho = '<h4>ExpressoLivre - ExpressoMail</h4>';
 var auxNotificationCriteriaVetor = [];
 var auxNotification;
@@ -107 +115 @@
                 Element('tableDivAppbox').width = '100%';
 
+    //MailArchiver save offset to gmt user preference data to list correctly date/time from messages list
+    var save_gmtoffset = function(data){
+        gmtoffset = data;
+    }
+
         var save_preferences = function(data){
 
@@ -124 +137 @@
                 current_folder="INBOX";
                 
-                if( (window.google && google.gears) && !google.gears.factory.getPermission())
+                /*if( (window.google && google.gears) && !google.gears.factory.getPermission())
                     preferences.use_local_messages=0;
                 
@@ -141 +154 @@
                         setTimeout('auto_archiving()', 30000);
                         
-                }
+                }*/
                 $.ajax({                        
                         url: "controller.php?" + $.param( {action: "$this.imap_functions.getMessagesIds",
@@ -168 +181 @@
                         }
                 });
+                /*Carrega a lista de mensagens*/
+
+        //MAILARCHIVER-02
+        //Try to get ArchiveServices object directly
+        if(ArchiveServices)
+            expresso_mail_archive.Startup();
+        //ArchiveServices not runnnig: catch the user preferences to set up message at header
+        else{
+            if(preferences.use_local_messages=="1")
+                write_msg(get_lang('Sorry, but Mail Archiver does not seems to be running or installed at this workstation. By now, we are turning off local messages!'));
+        }
+
+                var  handler_populateSelectedMsgs = function(data){
+                        populateSelectedMsgs(data);
+                }
+                cExecute ("$this.imap_functions.get_msgs&folder=INBOX&sort_box_type=SORTARRIVAL&search_box_type=ALL&sort_box_reverse=1&msg_range_begin=1", handler_populateSelectedMsgs);
                 //Substituido por padrão Jquery
                 cExecute ("$this.imap_functions.get_range_msgs2&folder=INBOX&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type=SORTARRIVAL&search_box_type=ALL&sort_box_reverse=1", handler_draw_box);
@@ -182 +211 @@
                 //Troca da forma de construção de menu para o plugin jquery.contextMenu
                 //ConstructMenuTools();
-                
-                if ( (preferences.use_local_messages==1) && (expresso_local_messages.is_offline_installed()) )  //Precisa ser feito após a renderização da caixa de emails
-                        check_mail_in_queue();
+                //MAILARCHIVER-00
+                //if ( (preferences.use_local_messages==1) && (expresso_local_messages.is_offline_installed()) )  //Precisa ser feito após a renderização da caixa de emails
+                        //check_mail_in_queue();
                 
                 // Insere a applet de criptografia
@@ -619 +648 @@
                                 
                 }
+
                 //Change msg class to read.
                 if (!msg_is_read(ID))
                 {
-                        set_msg_as_read(ID, true);
+            //MAILARCHIVER-01 TAG MESSAGE AS SEEN
+            if (proxy_mensagens.is_local_folder(get_current_folder())){
+                expresso_mail_archive.drawdata = null //no draw action
+                var tl = expresso_mail_archive.pattern.tagConfig('unseen', ID, 1);
+                expresso_mail_archive.taglist = tl;
+                expresso_mail_archive.progressbar = window.setTimeout("expresso_mail_archive.tagMessage()",1);                            
+            }
+            set_msg_as_read(ID, true);
                         if (msg_info.cacheHit || (!proxy_mensagens.is_local_folder(get_current_folder()) && msg_info.original_ID))
                         {
-                                set_message_flag(ID, "seen"); // avoid caducous (lazy) data
+                set_message_flag(ID, "seen"); // avoid caducous (lazy) data
                         }
                 }
@@ -731 +768 @@
                                 {
                                         selectedPagingMsgs[data[i].msg_number] = false;
+                                        totalFolderMsgs++;
                                         updateSelectedMsgs(false,data[i].msg_number);
                                         var new_msg = this.make_tr_message(data[i], current_folder, data.offsetToGMT);
@@ -866 +904 @@
                 }
                 connector.purgeCache();
-                update_menu();
+                cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
                 resizeMailList();
 
@@ -950 +988 @@
                          
                         if (!archive && (parseInt(preferences.save_deleted_msg)) && (folder != userTrashFolder)){ 
-                    if(currentTab == 0)
-                                                msgs_number = get_selected_messages();
                             move_msgs2(folder, ""+msgs_number, border_ID, userTrashFolder,special_folders['Trash'],show_success_msg ); 
-                                return;
-        }
+                                        return;
+                                }
 
         var handler_delete_msgs = function(data){
@@ -1038 +1074 @@
         }
         
-        if(currentTab == 0 )
-                msgs_number = get_selected_messages();
-
         if (msgs_number.length > 0 || parseInt(msgs_number) > 0)
                 cExecute ("$this.imap_functions.delete_msgs&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse, handler_delete_msgs);
@@ -1056 +1089 @@
         var remove_currente_folder = "";
         var id_border = currentTab.replace(/[a-zA-Z_]+/, "");
-        
+
+        //Validação para não poder manipular mensagens locais na busca
+        if (currentTab.indexOf('search_local') != -1 || proxy_mensagens.is_local_folder(new_folder))
+        {
+                alert(get_lang("You cant manipulate local messages on search"));
+                return;
+        }
+
         var delete_msg = false;
         
@@ -1065 +1105 @@
         
         if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( selected_messages, folder ) ){
-          alert( "Impossivel mover mensagens que estão ainda estão sendo arquivadas." );
+          alert( "Impossivel mover mensagens que ainda estão sendo arquivadas." );
           return;
         }
@@ -1233 +1273 @@
                                 return false;
                         }else{
-                                data = data.split("/").reverse(); //Recupera o nome da pasta do array
-                                write_msg(get_lang('Error moving message.')+" "+get_lang('Permission denied to folder "%1".', data[0]));
+                                write_msg(get_lang('Error moving message.')+" "+get_lang('Permission denied to folder "%1".', new_folder_name));
+                                /*Verifica se a pasta destino é a "Trash" e se a pasta origem e destino são do mesma estrutura compartilhada*/
+                                if(new_folder_name == "Trash" && folder.split("/")[1] == new_folder.split("/")[1]){
+                                        alert(get_lang("You can not remove the message with the preference 'Send to Trash' enabled. There is no permission to move messages to the trash folder."));
+                                }
                                 return false;
                         }
@@ -1360 +1403 @@
                         draw_paging(n_total_msg);
                         Element('tot_m').innerHTML = n_total_msg;
+                        totalFolderMsgs -= data.msgs_number.length;
                 }
                 refresh();
@@ -1375 +1419 @@
                 }
         } catch (e) {} 
-
-        if(currentTab == 0)
+    //Validação para recuperar o id caso não seja aba de listagem
+        if (currentTab == 0 && msgs_number == "selected")
                 msgs_number = get_selected_messages();
+        else if (currentTab != 0 && msgs_number == "selected")
+                msgs_number = currentTab.substr(0,currentTab.indexOf('_r'));
 
         if(openTab.type[currentTab] == 1){
@@ -1384 +1430 @@
 
         // se a aba estiver aberta e selecionada, apenas a msg da aba é movida
-        if(currentTab.toString().indexOf("_r") != -1)
+        if(currentTab.toString().indexOf("_r") != -1 && currentTab == border_ID)
         {
                 //se a aba for aberta atraves de uma pesquisa
@@ -1393 +1439 @@
         }
         refresh();
-        if (parseInt(msgs_number) > 0 || msgs_number.length > 0){
-                // remove a flag $FilteredMessage da mensagem, depois move
-                var handler_removeFlag = function(){
-                        $.ajax({
-                                url: 'controller.php?' + $.param( {action: '$this.imap_functions.move_messages',
-                                                                    folder: folder,
-                                                                    msgs_number: ""+msgs_number,
-                                                                    border_ID: border_ID,
-                                                                    sort_box_type: sort_box_type,
-                                                                    search_box_type: search_box_type,
-                                                                    sort_box_reverse: sort_box_reverse,
-                                                                    reuse_border: border_ID,
-                                                                    new_folder: new_folder,
-                                                                    new_folder_name: new_folder_name,
-                                                                    get_previous_msg: ( !not_opem_previus ? preferences.delete_and_show_previous_message : false ),
-                                                                    decoded: true } ),
-
-                                success: function( data ){
-                                    data = connector.unserialize( data );
-                                    $.each(msgs_number.split(","), function(index, value){
-                                        delete selectedPagingMsgs[value];
-                                        msgFolder =  Base64.encode(get_current_folder());
-                                        tabToRemove = value + "_r_" + msgFolder.replace(/=/g,"");
-                                        if ($("#"+tabToRemove)){
-                                                delete_border(tabToRemove,'false');
-                                        }
+
+        if (proxy_mensagens.is_local_folder(folder)){
+        
+                expresso_mail_archive.update_counters = true;
+        //Folder de onde sai a mensagem é local (armazenamento local)
+
+        if(msgs_number=='selected'){
+            msgs_number = get_selected_messages();
+        }
+
+        if (new_folder == 'local_root'){
+            alert(get_lang("Select a folder!"));
+        }
+                    
+        if (parseInt(msgs_number) > 0 || msgs_number.length > 0) {
+            if (proxy_mensagens.is_local_folder(new_folder)){
+                //esta tirando de um folder local para outro folder local
+                //expresso_mail_archive.moveMessages(new_folder.substr(6), msgs_number);
+                expresso_mail_archive.moveMessages(new_folder.replace('local_messages_', ''), msgs_number);
+            }
+            else{
+                //esta tirando de um folder local para um folder IMAP (desarquivamento)
+                if(!new_folder){
+                    new_folder = 'INBOX';
+                }
+                if(currentTab.toString().indexOf("_r") != -1){
+                    msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
+                }                      
+                expresso_mail_archive.unarchieve(folder, new_folder, msgs_number);
+            }
+        }
+        else{
+            write_msg(get_lang('No selected message.'));
+        }
+        }
+        else{
+        if (proxy_mensagens.is_local_folder(new_folder)){
+            //esta tirando de um folder não local para um folder local (arquivamento)
+            if(msgs_number=='selected'){
+                archive_msgs(folder, new_folder);
+            }
+            else{
+                archive_msgs(folder, new_folder, msgs_number);
+            }
+        }
+        else{
+            //esta tirando de um folder não local para outro folder não local (move)
+            //move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name);
+                        if (parseInt(msgs_number) > 0 || msgs_number.length > 0){
+                                // remove a flag $FilteredMessage da mensagem, depois move
+                                var handler_removeFlag = function(){
+                                        $.ajax({
+                                                url: 'controller.php?' + $.param( {action: '$this.imap_functions.move_messages',
+                                                                                    folder: folder,
+                                                                                    msgs_number: ""+msgs_number,
+                                                                                    border_ID: border_ID,
+                                                                                    sort_box_type: sort_box_type,
+                                                                                    search_box_type: search_box_type,
+                                                                                    sort_box_reverse: sort_box_reverse,
+                                                                                    reuse_border: border_ID,
+                                                                                    new_folder: new_folder,
+                                                                                    new_folder_name: new_folder_name,
+                                                                                    get_previous_msg: ( !not_opem_previus ? preferences.delete_and_show_previous_message : false ),
+                                                                                    decoded: true } ),
+
+                                                success: function( data ){
+                                                    data = connector.unserialize( data );
+                                                    $.each(msgs_number.split(","), function(index, value){
+                                                        delete selectedPagingMsgs[value];
+                                                        msgFolder =  Base64.encode(get_current_folder());
+                                                        tabToRemove = value + "_r_" + msgFolder.replace(/=/g,"");
+                                                        if ($("#"+tabToRemove)){
+                                                                delete_border(tabToRemove,'false');
+                                                        }
+                                                    });
+                                                    totalFolderMsgs -= msgs_number.split(",").length;
+
+                                                    //TESTE
+                                                    selectAllFolderMsgs();
+                                                $('.select-link').unbind('click');
+
+                                                    if( data )
+                                                        handler_move_msgs( data );
+                                                },
+                                                beforeSend: function( jqXHR, settings ){
+                                                        connector.showProgressBar();
+                                            },
+                                            complete: function( jqXHR, settings ){
+                                                        connector.hideProgressBar();
+                                          }
+
                                     });
-                                    totalFolderMsgs -= msgs_number.split(",").length;
-
-                                    //TESTE
-                                    selectAllFolderMsgs();
-                                $('.select-link').unbind('click');
-
-                                    if( data )
-                                        handler_move_msgs( data );
-                                },
-                                beforeSend: function( jqXHR, settings ){
-                                        connector.showProgressBar();
-                            },
-                            complete: function( jqXHR, settings ){
-                                        connector.hideProgressBar();
-                          }
-
-                    });
-                }
-                var hasFolder = false;
-                $.each(fromRules, function(index, value) {
-                        if(value == folder){
-                                hasFolder = true;
-                                cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&msg_number="+msgs_number, handler_removeFlag); 
-                                return false;
-                        }
-                });
-                if(!hasFolder){
-                        handler_removeFlag();
-                }
-                
-        }else
-                write_msg(get_lang('No selected message.'));
+                                }
+                                var hasFolder = false;
+                                $.each(fromRules, function(index, value) {
+                                        if(value == folder){
+                                                hasFolder = true;
+                                                cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&msg_number="+msgs_number, handler_removeFlag); 
+                                                return false;
+                                        }
+                                });
+                                if(!hasFolder){
+                                        handler_removeFlag();
+                                }
+                                
+                        }else
+                                write_msg(get_lang('No selected message.'));
+        }
+    }   
+
+    //Código adicionado para o correto funcionamento da seleção independente de paginação.
+    $.each(msgs_number.split(","), function(index, value){
+        delete selectedPagingMsgs[value];
+    });
+    totalFolderMsgs = totalFolderMsgs - msgs_number.split(",").length;
+    selectAllFolderMsgs(false);
+    updateSelectedMsgs();
+        
 }
 
@@ -1550 +1655 @@
 
 
-function archive_msgs(folder,folder_dest,id_msgs) {
+ function archive_msgs(folder,folder_dest,id_msgs) {
+    write_msg(get_lang('Starting to archive messages'));
+
+    if(currentTab.toString().indexOf("_r") != -1){
+        id_msgs = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
+    }
+
+    if(!id_msgs)
+        id_msgs = get_selected_messages();
+
+    if(folder_dest=='local_root' || folder_dest==null)//Default archive destiny = local_inbox folder
+        folder_dest = 'local_inbox';
+    
+    if (parseInt(id_msgs) > 0 || id_msgs.length > 0){       
+        //expresso_mail_archive.Archive(folder,folder_dest,id_msgs);
+        window.setTimeout("expresso_mail_archive.Archive('" + folder + "','" + folder_dest + "','" + id_msgs + "')", 1);
+        selectAllFolderMsgs(false);
+    }
+    else
+        write_msg(get_lang('No selected message.'));
+
+
+        /*
         if(proxy_mensagens.is_local_folder(folder)) {
                 write_msg(get_lang("You cant archive local mails"));
@@ -1587 +1714 @@
         var handler_arquivar_mensagens = function(data) {
           
-            var msgs_info = [];
+            //var msgs_info = [];
           
-            for( var i = 0; i < data.length; i++ )
-                msgs_info[i] = connector.unserialize( data[i] );
+            //for( var i = 0; i < data.length; i++ )
+                //msgs_info[i] = connector.unserialize( data[i] );
 
             //vejo se já tinha mensagens locais
-            var h = expresso_local_messages.has_local_mails();
+            //var h = expresso_local_messages.has_local_mails();
             
-            expresso_local_messages.insert_mails( msgs_info, folder_dest, function( s, f ){complete_archiving( s, f, h )} );
-
+            //expresso_local_messages.insert_mails( msgs_info, folder_dest, function( s, f ){complete_archiving( s, f, h )} );
+
+            expresso_mail_archive.Archive(folder,folder_dest,id_msgs);
             document.getElementById("overlay").style.visibility = "hidden";
         }
@@ -1619 +1747 @@
 
         });
+        */
+        
 }
 
@@ -2307 +2437 @@
 {   
         if (Element("attachments_" + old_id_border))
-        {
-                var fileUploadMSG = $('#fileupload_msg'+new_border_ID);         
-                var attachments = document.getElementById("attachments_" + old_id_border).getElementsByTagName("a");    
-                var imagens = block_quoted_body.match(/<img[^>]*>/g);
+    {
+        var fileUploadMSG = $('#fileupload_msg'+new_border_ID);         
+        var attachments = $("#attachments_" + old_id_border).find("a"); 
+                if(openTab.imapBox[new_border_ID].split("local").length > 1 && attachments.length > 0){
+                        alert("Não é possivel utilizar os anexos das mensagens locais, favor desarquivar para ter acesso aos anexos");
+                        return false;
+                }
+                
+        var imagens = block_quoted_body.match(/<img[^>]*>/g);
                 var arrayAttachments = [];
                 var arrayAttachmentsA = [];
@@ -2318 +2453 @@
                             if((attachments[i].tagName=="SPAN") || (attachments[i].tagName=="IMG") || ((attachments[i].href.indexOf("javascript:download_local_attachment")==-1)&&(attachments[i].href.indexOf("javascript:download_attachments")==-1)))
                                     continue;
-
-                                var arrayAtt = attachments[i].href.replace("javascript:download_attachments(", "").replace(")", "").split(',');                                 
+                                if(attachments[i].href.split("local") > 1){
+                                        var arrayAtt = attachments[i].href.replace("javascript:download_local_attachment(", "").replace(")", "").split(',');                                 
+                                }else{
+                                        var arrayAtt = attachments[i].href.replace("javascript:download_attachments(", "").replace(")", "").split(',');                                 
+                                }
+                                
                                 var att = new Object();
                                 var regex = new RegExp( "'", "g" );
@@ -2408 +2547 @@
                                     arrayAttachmentsA.push(attachments[i]);
                                 }
-                    }
+        }
                 //-------------------
                 
@@ -2505 +2644 @@
     var fileUploadMSG = $('#fileupload_msg'+new_border_ID);
     var attachments = $("#attachments_" + old_id_border).find("a");                     
+
+        if(openTab.imapBox[new_border_ID].split("local").length > 1 && attachments.length > 0){
+                alert("Não é possivel utilizar os anexos das mensagens locais, favor desarquivar para ter acesso aos anexos");
+                return false;
+        }
+
     for (var i = 0; i < attachments.length; i++){
             if((attachments[i].tagName=="SPAN") || (attachments[i].tagName=="IMG") || ((attachments[i].href.indexOf("javascript:download_local_attachment")==-1)&&(attachments[i].href.indexOf("javascript:download_attachments")==-1)))
                     continue;
                 fileUploadMSG.find(' .attachments-list').show();
-                var arrayAtt = attachments[i].href.replace("javascript:download_attachments(", "").replace(")", "").split(',');                                 
+                if(attachments[i].href.split("local").length > 1){
+                        var arrayAtt = attachments[i].href.replace("javascript:download_local_attachment(", "").replace(")", "").split(',');                                    
+                }else{
+                        var arrayAtt = attachments[i].href.replace("javascript:download_attachments(", "").replace(")", "").split(',');                                         
+                }
                 var att = new Object();
                 var regex = new RegExp( "'", "g" );
@@ -3115 +3264 @@
 
 function set_messages_flag_search_local(flag){
-        var msgs_flag = this.get_selected_messages_search();
-        if(local_messages.prototype.set_messages_flag(msgs_flag, flag, true)){
-                var id_border = currentTab.replace(/[a-zA-Z_]+/, "");
-                var msgs = msgs_flag.split(',');
-                for(var i = 0; i < msgs.length; i++){
-                        Element("search_local_msg"+id_border+"_check_box_message_"+msgs[i]).checked = false;
-                }
-                draw_tree_folders();
-                Element('chk_box_select_all_messages_search_local').checked = false;
-                refresh();
-                write_msg(get_lang('The messages were marked with success!'));          
-        }else{
-                write_msg(get_lang('Error marking messages.'));
-        }
+        // var msgs_flag = this.get_selected_messages_search();
+        // if(local_messages.prototype.set_messages_flag(msgs_flag, flag, true)){
+        //      var id_border = currentTab.replace(/[a-zA-Z_]+/, "");
+        //      var msgs = msgs_flag.split(',');
+        //      for(var i = 0; i < msgs.length; i++){
+        //              Element("search_local_msg"+id_border+"_check_box_message_"+msgs[i]).checked = false;
+        //      }
+        //      draw_tree_folders();
+        //      Element('chk_box_select_all_messages_search_local').checked = false;
+        //      refresh();
+        //      write_msg(get_lang('The messages were marked with success!'));          
+        // }else{
+        //      write_msg(get_lang('Error marking messages.'));
+        // }
 }
 
@@ -3637 +3786 @@
 }
 
-function empty_trash_imap(shared, button){
+function empty_trash_imap(shared, button, type){
         if(shared){
                 var folder_part = $(button).parents("li:first").attr("id").split(cyrus_delimiter);
@@ -3677 +3826 @@
                 'overlay_opacity' : 0.5,
                 'onClose':  function(caption) {
+
                         if(caption == get_lang("Yes")){
-                                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultTrashFolder"+(shared ? "&shared="+folder : ""), handler_empty_trash);
+                if(type.id == "local_messages_trash"){
+                    expresso_mail_archive.deleteAllMessages(type.id);
+                    cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                } else {
+                    cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultTrashFolder"+(shared ? "&shared="+folder : ""), handler_empty_trash);
+                } 
                         }
                 }
@@ -3684 +3839 @@
 }
 
-function empty_spam_imap(shared, button){
+function empty_spam_imap(shared, button, type){
         if(shared){
                 var folder_part = $(button).parents("li:first").attr("id").split(cyrus_delimiter);
@@ -3725 +3880 @@
                 'onClose':  function(caption) {
                         if(caption == get_lang("Yes")){
-                                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder"+(shared ? "&shared="+folder : ""), handler_empty_spam);
+                if(type.id == "local_messages_spam"){ 
+                    expresso_mail_archive.deleteAllMessages(type.id);
+                    cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                } else {
+                    cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder"+(shared ? "&shared="+folder : ""), handler_empty_spam);
+                } 
                         }
                 }
@@ -3731 +3891 @@
 }
 
+function buildExportArchiver(msgsArchive, name_box){
+
+    var hand_export = function(data){
+        if(!data){
+            write_msg(get_lang('Error compressing messages (ZIP). Contact the administrator.'))
+        }else if(data["empty_folder"] || data == "empty_folder"){
+            write_msg(get_lang("The selected folder is empty."));
+        }else
+          download_attachments(null, null, data, null,null, get_current_folder().split("_")[2] +'.zip');
+    }
+
+    var array = new Array();
+
+    for(var i =0; i < msgsArchive.length; i++){
+        eachMsg = {
+                'ContentType' : msgsArchive[i].ContentType,
+                'from' : { 'email' : msgsArchive[i].from.email, 'full' : msgsArchive[i].from.full, 'name' : msgsArchive[i].from.name},
+                'msg_sample' : msgsArchive[i].msg_sample,
+                'subject' : msgsArchive[i].subject,
+                'to' : { 'email' : msgsArchive[i].to.email, 'full' : msgsArchive[i].to.full, 'name' : msgsArchive[i].to.name},
+                'toaddress2' : msgsArchive[i].toaddress2,
+                'msg_number' : msgsArchive[i].msg_number,
+                'date' : new Date(msgsArchive[i].timestamp).toString()  
+        };
+        array.push(eachMsg);
+    }
+
+    $.ajax({
+        type: "POST",
+        url: "controller.php?action=$this.exporteml.export_all_byLocalFolder",
+        data: { folder: name_box, type: "msg_local", messages : array}
+    }).done(function(msg) {
+        hand_export(msg.split('"')[1]);
+    });
+}
 
 function export_all_selected_msgs(){
-        if (openTab.type[currentTab] > 1){          
+        if(get_current_folder().split("_")[0] == "local"){
+
+        if(get_selected_messages().indexOf(",") != -1){
+            expresso_mail_archive.getSomeMsgs(get_selected_messages().split(","));
+        } else {
+            expresso_mail_archive.getSomeMsgs([get_selected_messages()]);
+        }
+        
+        buildExportArchiver(expresso_mail_archive.getSomeMsg, get_current_folder().split("_")[2]);
+
+    } else {
+
+    if (openTab.type[currentTab] > 1){      
                 source_msg(currentTab,openTab.imapBox[currentTab]);
                 return;
@@ -3779 +3986 @@
         else
                 write_msg(get_lang('No selected message.'));
+    }
 }
 
@@ -3826 +4034 @@
                 var _params = _target.id.split(";;");
                 download_attachments(Base64.encode(_params[0]),_params[1],_params[2],_params[3],_params[4],file_type);
-        }
-}
+                if($(_target).parent().attr("href").split("http").length > 1){
+                        var part_find = thumb.toString().split("#");
+                        var part2_find = part_find[1].split("/temp");
+                        var part_id_dwl = part2_find[0] + '/temp/download' + part2_find[1]; 
+                        download_local_attachment(part_id_dwl);
+                        return;
+                }else{
+                        var _params = _target.id.split(";;");   
+                        download_attachments(_params[0],_params[1],_params[2],_params[3],_params[4],file_type);
+                }
+        }
+}
+
 function save_image2(info){ 
         var obj = jQuery.parseJSON(unescape(info)); 
@@ -4555 +4774 @@
 }
 
+function create_new_local_folder(parentFolderId, name){
+
+    if(typeof(parentFolderId) == "string"){
+        parentFolderId = parentFolderId.split("_");
+        var parentName = parentFolderId[2];
+    }
+    
+
+    expresso_mail_archive.createFolder(parentName, name);
+
+}
+
 function create_new_folder(name_folder, base_path){
         //Limit reached folders
@@ -4744 +4975 @@
 DataLayer.poll('message',30);
 
-
+//MAILARCHIVER-04
+function services_retry(){
+    try{
+        connector.purgeCache(); 
+        //window.alert('expresso var dump:\nenabled = ' + expresso_mail_archive.enabled + '\ntimer = ' + expresso_mail_archive.timer +'\ncounter = ' + expresso_mail_archive.counter);
+
+        if ((expresso_mail_archive.enabled == null) && (expresso_mail_archive.timer == null) && (expresso_mail_archive.counter > 0)){
+            connector.hideProgressBar();
+            //connector.resetProgressBarText();
+            write_msg(get_lang('Sorry, but you need to reload this web page. Click at reload page at web browsing top navigation.'));
+            return;
+        }
+
+        if (arguments.length == 0){
+           write_msg(get_lang('Trying to communicate with Mail Archiver...'));
+        }
+
+        connector.showProgressBar();
+        var head = document.getElementById('send_queue');
+        
+        var script_xdr= document.createElement('script');
+        var script_xdr_tag_id = 'mail_archiver_retry_xdr';    
+        
+        var script_request= document.createElement('script');
+        var script_request_tag_id = 'mail_archiver_retry_request';                
+        
+        var script_cors= document.createElement('script');
+        var script_cors_tag_id = 'mail_archiver_retry_cors';
+        
+        var script_utils= document.createElement('script');
+        var script_utils_tag_id = 'mail_archiver_retry_utils';
+
+        if(document.getElementById(script_xdr_tag_id)){
+            document.getElementById(script_xdr_tag_id).parentNode.removeChild(document.getElementById(script_xdr_tag_id));
+        }
+
+        if(document.getElementById(script_request_tag_id)){
+            document.getElementById(script_request_tag_id).parentNode.removeChild(document.getElementById(script_request_tag_id));
+        }
+
+        if(document.getElementById(script_cors_tag_id)){
+            document.getElementById(script_cors_tag_id).parentNode.removeChild(document.getElementById(script_cors_tag_id));
+        }
+        
+        if(document.getElementById(script_utils_tag_id)){
+            document.getElementById(script_utils_tag_id).parentNode.removeChild(document.getElementById(script_utils_tag_id));
+        }        
+
+        //IE XDR ADAPTER
+        script_xdr.type= 'text/javascript';
+        script_xdr.src=  mail_archive_protocol + '://' + mail_archive_host + ':' + mail_archive_port  + '/arcservutil/cxf-addon-xdr-adapter.js';
+        script_xdr.id= script_xdr_tag_id;
+        head.appendChild(script_xdr);
+
+        //CXF TRANSPORT OBJECT
+        script_request.type= 'text/javascript';
+        script_request.src= mail_archive_protocol + '://' + mail_archive_host + ':' + mail_archive_port  + '/arcservutil/cxf-addon-cors-request-object.js';
+        script_request.id= script_request_tag_id;
+        head.appendChild(script_request);
+
+        //CXF CORS OBJECT
+        script_cors.type= 'text/javascript';
+        script_cors.src= mail_archive_protocol + '://' + mail_archive_host + ':' + mail_archive_port  + '/arcservutil/cxf-addon-cors-utils.js';
+        script_cors.id= script_cors_tag_id;
+        head.appendChild(script_cors);
+
+        //CXF CORE
+        script_utils.type= 'text/javascript';
+        script_utils.src= mail_archive_protocol + '://' + mail_archive_host + ':' + mail_archive_port  + '/arcserv/ArchiveServices?js&nojsutils';
+        script_utils.id= script_utils_tag_id;
+        head.appendChild(script_utils);
+
+        ttintval = window.setTimeout('check_services_restart()', 1000);
+    }
+    catch (e){
+        write_msg(get_lang('Sorry, but Mail Archiver still seems to be sleeping. Check out your system services!'));
+        connector.hideProgressBar();
+        //connector.resetProgressBarText();
+        check_services_tryouts = 1;
+    }
+}
+
+//MAILARCHIVER-05
+function check_services_restart(){
+    try{
+                write_msg(get_lang('Wait: attempt %1 from %2...', check_services_tryouts, check_services_tryouts_limit));
+        if(check_services_tryouts <= 5){
+            try{
+                ArchiveServices = new web_service_mailarchiver_serpro__ArchiveServices();
+                ArchiveServices.url = mail_archive_protocol + "://" + mail_archive_host + ":" + mail_archive_port + "/arcserv/ArchiveServices";
+                window.clearInterval(ttintval);
+                expresso_mail_archive.Restart(expresso_mail_archive);
+            }
+            catch (e){
+                check_services_tryouts++;
+                window.clearInterval(ttintval);
+                ttintval = window.setTimeout('services_retry(true)',1);
+            }
+        }
+        else{
+            write_msg(get_lang('Sorry, but Mail Archiver still seems to be sleeping. Check out your system services!'));
+            connector.hideProgressBar();
+            //connector.resetProgressBarText();
+            check_services_tryouts = 1;
+        }
+    }
+    catch (e){
+        write_msg(get_lang('Sorry, but Mail Archiver still seems to be sleeping. Check out your system services!'));
+        connector.hideProgressBar();
+        //connector.resetProgressBarText();
+        check_services_tryouts = 1;
+    }
+}
+

trunk/expressoMail1_2/js/messages_controller.js

@@ -9 +9 @@
  * Retorna os cabeçalhos das mensagens a serem desenhadas na caixa de email.
  */
-        messages_proxy.prototype.messages_list = function(folder,msg_range_begin,emails_per_page,sort_box_type,search_box_type,sort_box_reverse,preview_msg_subject,preview_msg_tip,call_back) {
+    messages_proxy.prototype.messages_list = function(folder,msg_range_begin,emails_per_page,sort_box_type,search_box_type,sort_box_reverse,preview_msg_subject,preview_msg_tip,call_back) {
+        if(this.is_local_folder(folder)) {
+
+            //MAILARCHIVER-01
+            
+            //var baseFolder = folder.substr(6);
+            var baseFolder = folder.replace('local_messages_', '');
+            var tree_name;
+            //var drawinginfo = {treeObject: tree_name, treeName: tree_name, folderName: baseFolder};
+            var drawinginfo = {};
+            expresso_mail_archive.update_counters = false;
+            expresso_mail_archive.currentfolder = baseFolder;
+            expresso_mail_archive.getFolderInfo(expresso_mail_archive.currentfolder);
+            expresso_mail_archive.drawdata = drawinginfo;
+
+            if(tree_name == 'tree_folders'){ //only the 'tree_folders' must show messages. 'folders_tree' are just for managment operation
+                var exp_dfs = new Array(baseFolder,msg_range_begin,emails_per_page,sort_box_type,search_box_type, sort_box_reverse,preview_msg_subject,preview_msg_tip);
+                expresso_mail_archive.queryconfig.setExpressoDefaults(exp_dfs);
+                expresso_mail_archive.listMessages();
+            }
+            else{
+                if (!tree_name){
+                    //window.alert('sem arvore para atualizar, com sort_box_type =' + sort_box_type + ' e search_box_type= ' + search_box_type + ' reverse -- ' + sort_box_reverse);
+                    var exp_dfs = new Array(baseFolder,msg_range_begin,emails_per_page,sort_box_type,search_box_type,sort_box_reverse,preview_msg_subject,preview_msg_tip);
+                    expresso_mail_archive.queryconfig.setExpressoDefaults(exp_dfs);
+                    expresso_mail_archive.listMessages();
+                }
+                if(tree_name == 'folders_tree'){
+                    /*var div_export_local = document.createElement('div');
+                    div.style.width
+                    var lbl_check = document.createElement('label');
+                    var check_export_local_recursive = document.createElement('input');
+                    var lbl_combo = document.createElement('label');
+                    var combo_export_local_format = document.createElement('select');*/
+                    //window.alert('alert td content = ' + Element('div_buttons').getElementsByTagName('table')[0].tbody[0].tr[4].td[0].innerHTML);
+                    //Element('div_buttons').appendChild(div_export_local);
+                }
+            }
+
+        }else {
+            $.ajax({
+                url: "controller.php?" + $.param( {action: "$this.imap_functions.get_range_msgs3", 
+                                    folder: folder, 
+                                    msg_range_begin: msg_range_begin, 
+                                    msg_range_end: emails_per_page, 
+                                    sort_box_type: sort_box_type, 
+                                    search_box_type: search_box_type, 
+                                    sort_box_reverse: sort_box_reverse } ),
+
+                  success: function( data ){
+                    data = connector.unserialize(data);
+                    
+                    if( data )
+                        call_back( data );
+                  },
+                  beforeSend: function( jqXHR, settings ){
+                    connector.showProgressBar();
+                  },
+                  complete: function( jqXHR, settings ){
+                    connector.hideProgressBar();
+                  }
+              
+            });
+        }
+    }
+        messages_proxy.prototype.messages_list_old = function(folder,msg_range_begin,emails_per_page,sort_box_type,search_box_type,sort_box_reverse,preview_msg_subject,preview_msg_tip,call_back) {
                 if(this.is_local_folder(folder)) {
                         var real_folder = folder.substr(6);             
@@ -53 +118 @@
         messages_proxy.prototype.get_msg = function(msg_number,msg_folder,set_flag,call_back) {
                 if(this.is_local_folder(msg_folder)) {
-                        if(set_flag)
-                                expresso_local_messages.set_messages_flag(msg_number,"seen");
-                        var data = expresso_local_messages.get_local_mail(msg_number);  
-
-                        eval("call_back(data)");
+                        
+
+            //if(set_flag)
+                        //      expresso_local_messages.set_messages_flag(msg_number,"seen");
+                        // var data = expresso_local_messages.get_local_mail(msg_number);       
+            //MAILARCHIVER-02
+            expresso_mail_archive.getMessage(msg_number);
+
+                        //eval("call_back(data)");
                 }else{
                     $.ajax({
@@ -86 +155 @@
                 if (folder == 'null')
                         folder = get_current_folder();
-                if (msgs_number == 'selected')
-                        msgs_number = get_selected_messages();
-                
+
+        //Validação para recuperar o id caso não seja aba de listagem
+                if (msgs_number == 'selected' && currentTab != 0) //Recupera apenas o id da mensagem aberta
+                        msgs_number = currentTab.substr(0,currentTab.indexOf('_r'));
+        else if (msgs_number == 'selected' && currentTab == 0)
+            msgs_number = get_selected_messages();
+
                 if(currentTab != 0 && currentTab.indexOf("search_")  >= 0){
                         var content_search = document.getElementById('content_id_'+currentTab);
@@ -100 +173 @@
                 if (!this.is_local_folder(folder)){
                         delete_msgs(folder, msgs_number, border_ID);
-                }else {
-                        if((folder != 'local_Trash') && (expresso_local_messages.as_trash())){
-                                expresso_local_messages.move_messages('Trash', msgs_number);
-                                this.aux_interface_remove_mails(msgs_number, 'local_Trash', border_ID);
-                                draw_tree_local_folders();
-                                update_local_box(); 
-                                refresh(); 
-                        }else{
-                        expresso_local_messages.delete_msgs(msgs_number, border_ID);
-                        draw_tree_local_folders();
-                                update_local_box(); 
-                                refresh();
-                        }
-                }
+                }else {    
+            //MAILARCHIVER-03
+            var msg_to_delete = Element(msgs_number);
+            //user has preference to show previous message on deleting one
+            if (isNaN(currentTab) && parseInt(preferences.delete_and_show_previous_message) && msg_to_delete) {
+                    if (msg_to_delete.previousSibling){ 
+                            var previous_msg = msg_to_delete.previousSibling.id;
+                            
+                            //user has preference to maintain default folder structure at local folders, so we have trash folder
+                            if(preferences.auto_create_local == 1){
+                                //user has preference to "save" delete messasge on trash folder, so move it to there
+                                if (((preferences.save_deleted_msg == true)) && (folder != expresso_mail_archive.specialfolders.trash)){
+                                    expresso_mail_archive.folder_destination = 'trash';
+                                    expresso_mail_archive.moveMessages(expresso_mail_archive.folder_destination, msgs_number);
+                                    delete_border(currentTab,'false'); 
+                                    expresso_mail_archive.getMessage(previous_msg);
+                                }
+                                //user does not want to save messages deleted on trash. purge them imediatly
+                                else{
+                                    expresso_mail_archive.deleteMessages(msgs_number);
+                                    delete_border(currentTab,'false'); 
+                                    expresso_mail_archive.getMessage(previous_msg)
+                                }                                                                                
+                            }
+                            //maybe, we do not have trash.
+                            else{
+                                //user has preference to "save" delete messasge on trash folder, so move it to there
+                                if (((preferences.save_deleted_msg == true)) && (folder != expresso_mail_archive.specialfolders.trash)){
+                                    expresso_mail_archive.createFolder("","Trash");
+                                    expresso_mail_archive.folder_destination = 'trash';
+                                    expresso_mail_archive.moveMessages(expresso_mail_archive.folder_destination, msgs_number);
+                                    delete_border(currentTab,'false');
+                                    expresso_mail_archive.getMessage(previous_msg);
+                                }
+                                //user does not want to save messages deleted on trash. purge them imediatly
+                                else{
+                                    expresso_mail_archive.deleteMessages(msgs_number);
+                                    delete_border(currentTab,'false'); 
+                                    expresso_mail_archive.getMessage(previous_msg)
+                                }                                          
+                            }
+                    } 
+                    //there is no previous message existing to show. Just delete de view context
+                    else{ 
+                           //user has preference to maintain default folder structure at local folders, so we have trash folder
+                           if(preferences.auto_create_local == 1){
+                                if (((preferences.save_deleted_msg == true)) && (folder != expresso_mail_archive.specialfolders.trash)){
+                                    expresso_mail_archive.folder_destination = 'trash';
+                                    expresso_mail_archive.moveMessages(expresso_mail_archive.folder_destination, msgs_number);
+                                    delete_border(currentTab,'false'); 
+                                }
+                                //user does not want to save messages deleted on trash. purge them imediatly
+                                else{
+                                    expresso_mail_archive.deleteMessages(msgs_number);
+                                    delete_border(currentTab,'false'); 
+                                }                                       
+                           }
+                            //maybe, we do not have trash. Purge message so.
+                            else{
+                                //user has preference to "save" delete messasge on trash folder, so move it to there
+                                if (((preferences.save_deleted_msg == true)) && (folder != expresso_mail_archive.specialfolders.trash)){
+                                    expresso_mail_archive.createFolder("","Trash");
+                                    expresso_mail_archive.folder_destination = 'trash';
+                                    expresso_mail_archive.moveMessages(expresso_mail_archive.folder_destination, msgs_number);
+                                    expresso_mail_archive.getMessage(previous_msg);
+                                }
+                                //user does not want to save messages deleted on trash. purge them imediatly
+                                else{
+                                    expresso_mail_archive.deleteMessages(msgs_number);
+                                }                                    
+                            }
+                    } 
+            } 
+            //user has no preferece to show previous message on deleting
+            else{ 
+                if(preferences.auto_create_local == 1){
+                    //user has preference to "save" delete messasge on trash folder, so move it to there
+                    if (((preferences.save_deleted_msg == true)) && (folder.replace('messages_','') != expresso_mail_archive.specialfolders.trash)){
+                        expresso_mail_archive.folder_destination = 'trash';
+                        expresso_mail_archive.moveMessages(expresso_mail_archive.folder_destination, msgs_number);
+                        delete_border(currentTab,'false');
+                    }
+                    //user does not want to save messages deleted on trash (or is cleaning it). purge them imediatly
+                    else{
+                        expresso_mail_archive.deleteMessages(msgs_number);
+                        delete_border(currentTab,'false');
+                    }                            
+                }
+                //maybe, we do not have trash. Purge message so.
+                else{
+                    //user has preference to "save" delete messasge on trash folder, so move it to there
+                    if (((preferences.save_deleted_msg == true)) && (folder.replace('messages_','') != expresso_mail_archive.specialfolders.trash)){
+                        expresso_mail_archive.createFolder("","Trash");
+                        expresso_mail_archive.folder_destination = 'trash';
+                        expresso_mail_archive.moveMessages(expresso_mail_archive.folder_destination, msgs_number);
+                    }
+                    //user does not want to save messages deleted on trash. purge them imediatly
+                    else{
+                        expresso_mail_archive.deleteMessages(msgs_number);
+                    }     
+                }
+            }
+                }
+
+        //Código adicionado para o correto funcionamento da seleção independente de paginação.
+        $.each(msgs_number.split(","), function(index, value){
+            delete selectedPagingMsgs[value];
+        });
+        totalFolderMsgs = totalFolderMsgs - msgs_number.split(",").length;
+        selectAllFolderMsgs(false);
+        updateSelectedMsgs();
         }
         
@@ -119 +289 @@
 
                 if(info_msg.local_message==true) {
-                        return "javascript:download_local_attachment('"+
-                                        expresso_local_messages.get_url_anexo(info_msg.msg_number,info_msg.attachments[numero_ordem_anexo].pid)+
-                                        "')";
+            //ma serpro
+                        // return "javascript:download_local_attachment('"+
+                        //              expresso_local_messages.get_url_anexo(info_msg.msg_number,info_msg.attachments[numero_ordem_anexo].pid)+
+                        //              "')";
+            //MAILARCHIVER-04
+            return "javascript:download_local_attachment('"+ mail_archive_protocol+'://'+mail_archive_host+':'+mail_archive_port+'/temp/download/' +info_msg.attachments[numero_ordem_anexo].pid + "')";
                 }
                 else {
@@ -139 +312 @@
         
         messages_proxy.prototype.proxy_set_messages_flag = function (flag,msg_number){
-                if(this.is_local_folder(get_current_folder())) {
-                        expresso_local_messages.set_messages_flag(msg_number,flag);
-                }
-                else {
-                        set_messages_flag(flag,msg_number);
-                                // Verifica se a pasta que esta selecionada contem a opção "Não lidas" ativada
-                                // caso exista, ele chama novamente a opção "Não lidas" para atualizar a pasta.
-                                if('UNSEEN' == search_box_type)
-                                        return sort_box('UNSEEN','SORTARRIVAL');
-                }
-        }
-        
-        messages_proxy.prototype.proxy_set_message_flag = function (msg_number,flag,func_after_flag_change){
-                var msg_number_folder = Element("new_input_folder_"+msg_number+"_r"); //Mensagens respondidas/encaminhadas
+        //MAILARCHIVER
+        if(this.is_local_folder(get_current_folder())) {           
+            var msglist = get_selected_messages();    
+            var arrlist = msglist.split(",");
+            var operation;
+            var strtag;
+            
+            for(var i in arrlist){
+                switch(flag.toLowerCase()){
+                    case 'unseen':
+                        strtag = "unseen";
+                        operation = 0;
+                        set_msg_as_unread(arrlist[i]);
+                        break;
+                    case 'seen':
+                        strtag = "unseen";
+                        operation = 1;
+                        set_msg_as_read(arrlist[i]);
+                        break;
+                    case 'flagged':
+                        strtag = "flagged, importance_high";
+                        operation = 0;
+                        set_msg_as_flagged(arrlist[i]);
+                        break;
+                    case 'unflagged':
+                        strtag = "flagged, importance_high";
+                        operation = 1;
+                        set_msg_as_unflagged(arrlist[i]);
+                        break;
+                }
+                expresso_mail_archive.currenttag = flag;
+                var tl = expresso_mail_archive.pattern.tagConfig(strtag, arrlist[i], operation);
+                expresso_mail_archive.taglist = tl;                             
+                expresso_mail_archive.progressbar = window.setTimeout("expresso_mail_archive.tagMessage()",1);
+            }
+        }
+        else {
+            set_messages_flag(flag,msg_number);
+            // Verifica se a pasta que esta selecionada contem a opção "Não lidas" ativada
+            // caso exista, ele chama novamente a opção "Não lidas" para atualizar a pasta.
+            if('UNSEEN' == search_box_type)
+                return sort_box('UNSEEN','SORTARRIVAL');
+        }
+        }
+        
+        messages_proxy.prototype.proxy_set_message_flag = function (msg_number,flag,func_after_flag_change,msgid){
+        var msg_number_folder = Element("new_input_folder_"+msg_number+"_r"); //Mensagens respondidas/encaminhadas
                 if(!msg_number_folder)
                         var msg_number_folder = Element("input_folder_"+msg_number+"_r"); //Mensagens abertas
                 var folder = msg_number_folder ?  msg_number_folder.value : get_current_folder();
-                if(this.is_local_folder(folder)) {
-                        expresso_local_messages.set_message_flag(msg_number,flag, func_after_flag_change);
-                }
-                else {
-                        set_message_flag(msg_number,flag, func_after_flag_change);
-                }
+
+        //MAILARCHIVER
+        if(this.is_local_folder(folder)) {
+            if(!msgid)
+                msgid = msg_number;
+            var taglist = flag;
+            var operation;
+    
+            switch(flag.toLowerCase()){
+                case 'unseen':
+                    strtag = "unseen";
+                    operation = 0;
+                    set_msg_as_unread(msgid);
+                    break;
+                case 'seen':
+                    strtag = "unseen";
+                    operation = 1;
+                    set_msg_as_read(msgid);
+                    break;
+                case 'flagged':
+                    strtag = 'flagged, importance_high';
+                    operation = 0;
+                    set_msg_as_flagged(msgid);
+                    break;
+                case 'unflagged':
+                    strtag = "flagged, importance_high";
+                    operation = 1;
+                    set_msg_as_unflagged(msgid);
+                    break;
+                case 'forwarded':
+                    strtag = "forwarded";
+                    operation = 0;
+                    set_msg_as_flagged(msgid);
+                case 'answered':
+                    strtag = "answered";
+                    operation = 0;
+                    set_msg_as_flagged(msgid);                                  
+                    
+            }                
+            
+            expresso_mail_archive.drawdata = null;
+            var tl = expresso_mail_archive.pattern.tagConfig(strtag, msgid, operation);
+            expresso_mail_archive.currenttag = flag;
+            expresso_mail_archive.taglist = tl;
+            expresso_mail_archive.progressbar = window.setTimeout("expresso_mail_archive.tagMessage()",1);
+        }
+        else {
+            set_message_flag(msg_number,flag, func_after_flag_change);
+        }
         }
         
@@ -290 +539 @@
                 if (! folder || folder == 'null')
                         folder = Element("input_folder_"+msgs_number+"_r") ? Element("input_folder_"+msgs_number+"_r").value : (openTab.imapBox[currentTab] ? openTab.imapBox[currentTab]:get_current_folder());
-                if ((this.is_local_folder(folder)) && (this.is_local_folder(new_folder))) { //Move entre pastas não locais...
-                        if (folder == new_folder){
-                                write_msg(get_lang('The origin folder and the destination folder are the same.'));
+
+        //MAILARCHIVER-08
+        if (this.is_local_folder(folder)){
+            expresso_mail_archive.update_counters = true;
+            //Folder de onde sai a mensagem é local (armazenamento local)
+            if (folder == new_folder){
+                write_msg(get_lang('The origin folder and the destination folder are the same.'));
                                 return;
-                        }
-                        if(msgs_number=='selected')
-                                msgs_number = get_selected_messages();
-                        if (new_folder == 'local_root')
-                                alert(get_lang("Select a folder!"));
-                        if (parseInt(msgs_number) > 0 || msgs_number.length > 0) {
-                                expresso_local_messages.move_messages(new_folder.substr(6), msgs_number);
-                                this.aux_interface_remove_mails(msgs_number, new_folder_name, border_ID);
-                                draw_tree_local_folders();
-                                update_local_box();
-                        }
-                        else 
-                                write_msg(get_lang('No selected message.'));
-                }
-                else 
-                        if ((!this.is_local_folder(folder)) && (!this.is_local_folder(new_folder))) { //Move entre pastas locais...
-                                move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name);
-                        }else if ((!this.is_local_folder(folder)) && (this.is_local_folder(new_folder))) {
-                                if(msgs_number=='selected')
-                                        archive_msgs(folder,new_folder);
-                                else
-                                        archive_msgs(folder,new_folder,msgs_number);
-
-                                
-                                draw_tree_local_folders();
-                                refresh();
-                        }
-                        else {
-                //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"));
-                        }
-                
-                
+            }                    
+
+            //Validação para recuperar o id caso não seja aba de listagem
+            if (msgs_number == 'selected' && currentTab != 0) //Recupera apenas o id da mensagem aberta
+                msgs_number = currentTab.substr(0,currentTab.indexOf('_r'));
+            else
+                msgs_number = get_selected_messages();
+
+            if (new_folder == 'local_root'){
+                alert(get_lang("Select a folder!"));
+            }
+                        
+            if (parseInt(msgs_number) > 0 || msgs_number.length > 0) {
+                if (this.is_local_folder(new_folder)){
+                    //esta tirando de um folder local para outro folder local
+                    expresso_mail_archive.moveMessages(new_folder.replace("local_messages_",""), msgs_number);
+                    if(currentTab != 0)
+                        delete_border(currentTab,'false'); 
+                }
+                else{
+                    //esta tirando de um folder local para um folder IMAP (desarquivamento)
+                    if(!new_folder){
+                        new_folder = 'INBOX';
+                    }
+                    if(currentTab.toString().indexOf("_r") != -1){
+                        msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
+                    }                      
+                    expresso_mail_archive.unarchieve(folder, new_folder, msgs_number);
+                }
+            }
+            else{
+                write_msg(get_lang('No selected message.'));
+            }
+        }else{
+            if (this.is_local_folder(new_folder)){
+                //esta tirando de um folder não local para um folder local (arquivamento)
+                if(msgs_number=='selected'){
+                    archive_msgs(folder, new_folder);
+                }
+                else{
+                    archive_msgs(folder, new_folder, msgs_number);
+                }
+            }
+            else{
+                //esta tirando de um folder não local para outro folder não local (move)
+                move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name);
+            }
+        }       
+
+        //Adicionado código para o correto funcionamento da seleção independente de paginação.
+        $.each(msgs_number.split(","), function(index, value){
+            delete selectedPagingMsgs[value];
+        });
+        totalFolderMsgs = totalFolderMsgs - msgs_number.split(",").length;
+        selectAllFolderMsgs(false);
+        updateSelectedMsgs();
         }
         
@@ -462 +736 @@
 
     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();
-                }
-        }
+        if (!folder) {
+            folder = get_current_folder();
+        }
+
+        if(!this.is_local_folder(folder) || folder.split("_")[0] == "local"){
+            export_all_selected_msgs();
+        }else{
+            local_messages.prototype.local_messages_to_export();
+        }
+        }
+        
+
+
+        /* Airton
+        * Método que vai chamar efetivamente o método Archive.
+        * TO-DO: Tirar desse arquivo o método e passar pra outro arquivo
+        */
+        messages_proxy.prototype.archive_message = function(folder, msgs_number) {
+                if(msgs_number == 'get_selected_messages')
+                        msgs_number = get_selected_messages();
+                        
+                expresso_mail_archive.Archive("INBOX", "inbox", msgs_number);
+        }
+        
+        
+        
         /*
         messages_proxy.prototype.proxy_export_all_msg=function(){

trunk/expressoMail1_2/js/search.js

@@ -1 +1 @@
         xhr = false;
+
+        var folder              = {};
         
         function searchE()
@@ -144 +146 @@
         }
         
+        //draws folder list
         searchE.prototype.foldersTree = function()
         {
-                var treeFoldersSearch = new dFTree({name : 'treeFoldersSearch'});
-                
-                var root        = new dNode({id : 'root', caption: get_lang('My Folders'), onClick: "ttree.setFolder('root')"});
-                
-                treeFoldersSearch.add(root, 'root');
-
-                for(var i = 0; i < folders.length ; i++ )
-                {
-                        var nn = new dNode({id:folders[i].folder_id, caption: lang_folder(folders[i].folder_name), plusSign:folders[i].folder_hasChildren, onClick: "ttree.setFolder('"+folders[i].folder_id+"')"});
+                /*Insere a árvore de diretórios*/
+
+                var foldersTree = jQuery("#divFoldersSearch")
+                .removeClass('empty-container')
+                .html(DataLayer.render(BASE_PATH + 'api/templates/foldertree.ejs', {folders: [cp_tree1, cp_tree2, cp_tree3 ]}))
+                .find("#foldertree").treeview()
+                .click(function(event)
+                {
+                        //request new selected folder messages
+                        var target = $(event.target);
+
+                        if( target.is('.collapsable-hitarea, .expandable-hitarea, .lastCollapsable, .lastExpandable, .treeview') )
+                            return;
+
+                        if( !target.attr('id') )
+                            target = target.parent();
+
+                if (target.attr('id') == "foldertree") return;
                         
-                        if ( folders[i].folder_parent == '' )
-                        {
-                                folders[i].folder_parent = 'root';
-                        }
-            else if ( folders[i].folder_parent.indexOf('user') != -1 )
-            {
-                //if ( treeFoldersSearch.getNodeById('user') )
-                {
-                        var n_root_shared_folders = new dNode({id:'user', caption:get_lang("Shared Folders"), plusSign:true});
-                    treeFoldersSearch.add( n_root_shared_folders,'root');
-                }
-            }
-
-                        // Ver Ticket #1548
-                        if( folders[i].folder_parent != 'root')
-                        {
-                var node_parent = treeFoldersSearch.getNodeById(folders[i].folder_parent);
-                
-                if( typeof node_parent != 'undefined')
-                {
-                        node_parent.plusSign = true;
-                        treeFoldersSearch.alter(node_parent);
-                }
-            }
+                        folder                  = {};
+                        folder.id               = target.attr('id');
+                        folder.child    = target.find('.folder');
+                        folder.caption  = target.find('span').attr('title');                    
                         
-                        treeFoldersSearch.add( nn, folders[i].folder_parent );
-                }
-
-                treeFoldersSearch.draw( $("#divFoldersSearch")[0] );
-                treeFoldersSearch.getNodeById("root")._select();
-                root.changeState();
+                        $('.filetree span.folder.selected').removeClass('selected');
+                        if(!target.is('#foldertree > .expandable, #foldertree > .collapsable'))
+                                $(target).children('.folder').addClass('selected');
+
+                        selectedFolder = {
+                            id: folder.id, 
+                            name: folder.child.attr('title'),
+                            'class': folder.child.attr('class')
+                        };
+                });
+
         }
         
@@ -413 +410 @@
         searchE.prototype.viewLocalMessage = function()
         {
+                /*
                 var data                        = [2];
                 var gears                       = [];
@@ -449 +447 @@
                                                 
                         EsearchE.mount_result( data, 'SORTDATE' );
+                }
+                */
+
+                var data                        = [2];
+                var gears                       = [];
+                var local_folders       = [];
+         
+        //MailArchiver - local data
+        if ( preferences.use_local_messages == 1 )
+                {
+                data['data_gears']      = expresso_mail_archive.search_queryresult;
+            data['num_msgs']    = expresso_mail_archive.search_queryresult.length;
+                write_msg( data['num_msgs'] + " " + get_lang("results found"));
+                        EsearchE.mount_result(data , 'SORTDATE');
                 }
         }
@@ -545 +557 @@
                         if (j == 4)
                         {
-                                td.setAttribute("width", colSizes[1][4]);
-                                td.id = "td_message_followup_search_"+uid_msg;
-                                td.setAttribute("class","search-result-item");
-                                td1 = '<div class="flag-edited" style="width:8px;height:6px;"><img src="../prototype/modules/mail/img/flagEditor.png"></div>';
+                                if(border_id.split("local").length == 1){
+                                        td.setAttribute("width", colSizes[1][4]);
+                                        td.id = "td_message_followup_search_"+uid_msg;
+                                        td.setAttribute("class","search-result-item");
+                                        td1 = '<div class="flag-edited" style="width:8px;height:6px;"><img src="../prototype/modules/mail/img/flagEditor.png"></div>';
+                                                        
+                                        $(td).click(function(event, ui){        
+                                                var messageClickedId = $(this).attr('id').match(/td_message_followup_search_([\d]+)/)[1];
                                                 
-                                $(td).click(function(event, ui){        
-                                        var messageClickedId = $(this).attr('id').match(/td_message_followup_search_([\d]+)/)[1];
+                                                var followupColor = $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css('backgroundColor');
+                                                
+                                                $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")
+                                                .html('<img alt="Carregando" title="Carregando" style="margin-left:-3px; margin-top:-4px; width:13px; height:13px;" src="../prototype/modules/mail/img/ajax-loader.gif" />');   
+                                                        
+                                                $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", "transparent");
+                        
+                                                /**TODO Alterar após melhorias no filtro da camada javascript*/
+                                                DataLayer.remove('followupflagged', false);
+                                                var flagged = DataLayer.get('followupflagged', {filter: [
+                                                        'AND', 
+                                                        ['=', 'messageNumber', messageClickedId], 
+                                                        ['=', 'folderName', mailbox]
+                                                ]});
+                                                if(flagged == '' || flagged == [] || flagged == 'undefined'){
+                                                        /**
+                                                        * Aplica followupflag de Acompanhamento
+                                                        */
+                                                        aux.followupflagged = {
+                                                                uid : User.me.id,
+                                                                folderName : mailbox, 
+                                                                messageNumber : messageClickedId, 
+                                                                alarmTime : false, 
+                                                                backgroundColor : '#FF2016',
+                                                                followupflagId: '1'
+                                                        };
                                         
-                                        var followupColor = $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css('backgroundColor');
-                                        
-                                        $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")
-                                        .html('<img alt="Carregando" title="Carregando" style="margin-left:-3px; margin-top:-4px; width:13px; height:13px;" src="../prototype/modules/mail/img/ajax-loader.gif" />');   
-                                                
-                                        $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", "transparent");
-                
-                                        /**TODO Alterar após melhorias no filtro da camada javascript*/
-                                        DataLayer.remove('followupflagged', false);
-                                        var flagged = DataLayer.get('followupflagged', {filter: [
-                                                'AND', 
-                                                ['=', 'messageNumber', messageClickedId], 
-                                                ['=', 'folderName', mailbox]
-                                        ]});
-                                        if(flagged == '' || flagged == [] || flagged == 'undefined'){
-                                                /**
-                                                * Aplica followupflag de Acompanhamento
-                                                */
-                                                aux.followupflagged = {
-                                                        uid : User.me.id,
-                                                        folderName : mailbox, 
-                                                        messageNumber : messageClickedId, 
-                                                        alarmTime : false, 
-                                                        backgroundColor : '#FF2016',
-                                                        followupflagId: '1'
-                                                };
-                                
-                                                aux.followupflagged.id = DataLayer.put('followupflagged', aux.followupflagged);
-                                                DataLayer.commit(false, false, function(data){
-                                                        var fail = false;
-                                                        $.each(data, function(index, value) {
-                                                                fail = false;
-                                                                if(typeof value === 'string'){
-                                                                        fail = value;
+                                                        aux.followupflagged.id = DataLayer.put('followupflagged', aux.followupflagged);
+                                                        DataLayer.commit(false, false, function(data){
+                                                                var fail = false;
+                                                                $.each(data, function(index, value) {
+                                                                        fail = false;
+                                                                        if(typeof value === 'string'){
+                                                                                fail = value;
+                                                                        }
+                                                                });
+                                                                
+                                                                $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")
+                                                                .html('<img src="../prototype/modules/mail/img/flagEditor.png">');
+                                                                
+                                                                if (fail) {
+                                                                    
+                                                                    var isCurrentFolder = current_folder == mailbox ? '#td_message_followup_' + messageClickedId + ', ' : '';   
+                                                                    $(isCurrentFolder + 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", "#CCCCCC");
+                                                                    MsgsCallbackFollowupflag[fail]();
+                                                                    return false;
+                                                                }
+                                                                
+                                                                if(current_folder == mailbox){
+                                                                        $('#td_message_followup_' + messageClickedId + ', ' + 
+                                                                        'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).attr('title', get_lang('Follow up')).find(".flag-edited").css("background", aux.followupflagged.backgroundColor);        
+                                                                }else{                                                          
+                                                                        $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).attr('title', get_lang('Follow up')).find(".flag-edited").css("background", aux.followupflagged.backgroundColor);              
+                                                                }                                                               
+                                                                updateCacheFollowupflag(messageClickedId, mailbox, true);
+                                                        });
+
+                                                        
+                                                }else if(onceOpenedHeadersMessages[mailbox][messageClickedId]['followupflagged'].followupflag.name == 'Follow up'){
+                                                        /**
+                                                        * Remover followupflag de Acompanhamento (DFD0078:RI25)
+                                                        */
+                                                        $(this).find(".flag-edited").css("background", "#cccccc");
+                                                        DataLayer.remove('followupflagged', flagged[0].id );
+                                                        DataLayer.commit(false, false, function(){
+                                                                $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")
+                                                                .html('<img src="../prototype/modules/mail/img/flagEditor.png">');
+                                                                if(current_folder == mailbox){
+                                                                        updateCacheFollowupflag(messageClickedId, mailbox, false);
+                                                                
+                                                                        $('#td_message_followup_' + messageClickedId + ', ' + 
+                                                                          'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).attr('title', '').find(".flag-edited").css("background", '#CCC');
+                                                                        
+                                                                        $('#td_message_followup_' + messageClickedId + ', ' + 
+                                                                                'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")
+                                                                                .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");                        
+                                                                }else{
+                                                                        updateCacheFollowupflag(messageClickedId, mailbox, false);
+                                                                        
+                                                                        $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).attr('title', '').find(".flag-edited").css("background", '#CCC');
+                                                                        
+                                                                        $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")
+                                                                                .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
                                                                 }
                                                         });
-                                                        
+
+                                                } else {
                                                         $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")
                                                         .html('<img src="../prototype/modules/mail/img/flagEditor.png">');
-                                                        
-                                                        if (fail) {
-                                                            
-                                                            var isCurrentFolder = current_folder == mailbox ? '#td_message_followup_' + messageClickedId + ', ' : '';   
-                                                            $(isCurrentFolder + 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", "#CCCCCC");
-                                                            MsgsCallbackFollowupflag[fail]();
-                                                            return false;
-                                                        }
-                                                        
-                                                        if(current_folder == mailbox){
-                                                                $('#td_message_followup_' + messageClickedId + ', ' + 
-                                                                'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).attr('title', get_lang('Follow up')).find(".flag-edited").css("background", aux.followupflagged.backgroundColor);        
-                                                        }else{                                                          
-                                                                $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).attr('title', get_lang('Follow up')).find(".flag-edited").css("background", aux.followupflagged.backgroundColor);              
-                                                        }                                                               
-                                                        updateCacheFollowupflag(messageClickedId, mailbox, true);
-                                                });
-
-                                                
-                                        }else if(onceOpenedHeadersMessages[mailbox][messageClickedId]['followupflagged'].followupflag.name == 'Follow up'){
-                                                /**
-                                                * Remover followupflag de Acompanhamento (DFD0078:RI25)
-                                                */
-                                                $(this).find(".flag-edited").css("background", "#cccccc");
-                                                DataLayer.remove('followupflagged', flagged[0].id );
-                                                DataLayer.commit(false, false, function(){
-                                                        $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")
-                                                        .html('<img src="../prototype/modules/mail/img/flagEditor.png">');
-                                                        if(current_folder == mailbox){
-                                                                updateCacheFollowupflag(messageClickedId, mailbox, false);
-                                                        
-                                                                $('#td_message_followup_' + messageClickedId + ', ' + 
-                                                                  'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).attr('title', '').find(".flag-edited").css("background", '#CCC');
-                                                                
-                                                                $('#td_message_followup_' + messageClickedId + ', ' + 
-                                                                        'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")
-                                                                        .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");                        
-                                                        }else{
-                                                                updateCacheFollowupflag(messageClickedId, mailbox, false);
-                                                                
-                                                                $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).attr('title', '').find(".flag-edited").css("background", '#CCC');
-                                                                
-                                                                $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")
-                                                                        .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
-                                                        }
-                                                });
-
+                                                        $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", followupColor);
+                                                        $(this).parents('[role="'+messageClickedId+'_'+mailbox+'"]').attr('class', 'selected_msg').find(':checkbox').trigger('click');
+                                                        configureFollowupflag();
+                                                }
+                                                //if(!){}
+
+                                        });             
+                                }               
+                        }
+                        if (j == 5)
+                        {
+                                if(border_id.split("local").length == 1){
+                                        td.setAttribute("width", colSizes[1][5]);
+                                        td.id = "td_message_labels_search_"+uid_msg;
+                                        td.setAttribute("class","td-label-search");                             
+                                        
+                                        if (aux.labels) {
+                                                td1 = '<img src="../prototype/modules/mail/img/tag.png">';
+                                                updateLabelsColumn(aux)         
                                         } else {
-                                                $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited")
-                                                .html('<img src="../prototype/modules/mail/img/flagEditor.png">');
-                                                $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", followupColor);
-                                                $(this).parents('[role="'+messageClickedId+'_'+mailbox+'"]').attr('class', 'selected_msg').find(':checkbox').trigger('click');
-                                                configureFollowupflag();
+                                                td1 = '';
                                         }
-                                        //if(!){}
-
-                                });                             
-                        }
-                        if (j == 5)
-                        {
-                                td.setAttribute("width", colSizes[1][5]);
-                                td.id = "td_message_labels_search_"+uid_msg;
-                                td.setAttribute("class","td-label-search");                             
-                                
-                                if (aux.labels) {
-                                        td1 = '<img src="../prototype/modules/mail/img/tag.png">';
-                                        updateLabelsColumn(aux)         
-                                } else {
-                                        td1 = '';
                                 }
                         }
@@ -735 +751 @@
                                 td.onclick              = _onclick;
 
-                                if( validate_date( aux.udate ) )
-                                {
+                                if(validate_date(new String(aux.udate))){
                                         var td1 = aux.udate;
                                 }
@@ -1256 +1271 @@
                 if(typeof(Data.data_gears)=="undefined")
                         EsearchE.show_paging( Data['num_msgs'] );
+
+                Data = null;
+                data = null;
         }
 
@@ -1275 +1293 @@
         {
                 var sel = Element("sel_search_nm_box1");
+                this.name_box_search = folder.id;
                 
                 if (!proxy_mensagens.is_local_folder(this.name_box_search))
@@ -1298 +1317 @@
                                 name_box_def = this.name_box_search.substr(final_pos+1);
                         }
-                        else
-                                name_box_def = this.name_box_search.substr(6);//Retira o 'local_'
+                        else {
+                                name_box_def = folder.caption + " (local)"; //this.name_box_search.substr(6);//Retira o 'local_'
+                        }
                 }
                 
@@ -1490 +1510 @@
                         if (preferences.use_local_messages == 1)
                         {
-                                temp = expresso_local_messages.list_local_folders();
-                                for (var x in temp)
-                                {
-                                        local_folders.push(temp[x][0]);
-                                }
+                                local_folders[0] = ""; //se local_folders[0] estiver vazio, busca em todas as pastas
                         }
                 }
@@ -1566 +1582 @@
                         {
                                 expresso_local_messages.setSortType('SORTDATE');
-                                tmp = expresso_local_messages.search( local_folders, fields );
+                                //tmp = expresso_local_messages.search( local_folders, fields );
+                                expresso_mail_archive.search(local_folders, fields);
+                                tmp = expresso_mail_archive.search_queryresult;
                         }
 
@@ -1575 +1593 @@
                         }
 
-                        if ( tmp.length > 0 )
-                        {
-                                allMsg['gears_num_msgs'] = tmp.length ;
+                        if (tmp) {
+                                if ( tmp.length > 0 )
+                                {
+                                        allMsg['gears_num_msgs'] = tmp.length ;
+                                }
+                        } else {
+                                allMsg['gears_num_msgs'] = 0;
                         }
 
@@ -1586 +1608 @@
                         else
                         {
-                                if( ( tmp.length > 0) && ( !data['num_msgs'] ) ) 
+                                if( ( tmp && tmp.length > 0) && ( !data['num_msgs'] ) ) 
                                 {
                                         EsearchE.viewLocalMessage();
@@ -1596 +1618 @@
                                                 EsearchE.func_clean();
                                         }
-                                        
                                         write_msg( count + " " + get_lang("results found") );
                                         
@@ -1646 +1667 @@
         searchE.prototype.quickSearchMail = function(value, page, sort, border_id)
         {
-                var local_folders = new Array();
+                var local_folders = new Array;
                 var temp;
                 var not_found_corrent_folder = true;
@@ -1657 +1678 @@
                 }
                 
+                //Inserido valor vazio no array para representar todas as pastas locais
                 if (preferences.use_local_messages == 1)
-                {
-                        temp = expresso_local_messages.list_local_folders();
-                        for (var x in temp)
-                        {
-                                local_folders.push(temp[x][0]);
-                        }
-                }
+                        local_folders.push("");
 
                 this.sort               = sort || this.sort || "SORTDATE";
@@ -1711 +1727 @@
                             write_msg( "pesquisando " + labels[0] + link, true );
                             var keepFilled = false;
-                            
+                            //Inserida variável de controle para correta manipulação das mensagens locais
+                            var local_messages_link = true;
 
                             var handler = function( data )
@@ -1723 +1740 @@
                                         };
 
-                                        // Gears - local
-                                        if ( local_folders.length > 0 ){
-                                                expresso_local_messages.setSortType('SORTDATE');
-                                                var tmp = expresso_local_messages.search( local_folders, "##ALL <=>" + url_encode(value) + "##" ); 
-
-                                                if( tmp.length > 0 )
-                                                        if( !allMsg['num_msgs'] ){
-                                                                clean_msg();
-                                                            not_found_corrent_folder = false;
-                                                                if(tmp.length)
-                                                                        allMsg['gears_num_msgs'] = tmp.length;
-                                                        }else
-                                                                allMsg['gears_num_msgs'] = tmp.length;
-        }
-
-                                        if( !allMsg['num_msgs'] && !url.length && not_found_corrent_folder){
-                                                clean_msg();
-                                                return EsearchE.viewLocalMessage();
-                                        }
+                                        //MAILARCHIVER
+                        if(local_messages_link){ //Código executado apenas na primeira vez.
+                                if ( local_folders.length > 0 ){
+                                    expresso_mail_archive.search_queryresult = null; //Limpa a variável global para não exibir resultados anteriores
+                                    expresso_mail_archive.search(local_folders, "##ALL <=>" + url_encode(value) + "##");
+                                    tmp = expresso_mail_archive.search_queryresult;
+                                    if(tmp == null){
+                                        tmp = new Object();
+                                        tmp.length = 0;
+                                    }
+                                }
+                                EsearchE.localResults = tmp.length;
+
+                                if( tmp.length > 0 )
+                                {
+                                    allMsg['gears_num_msgs'] = tmp.length ;
+                                }
+                        }
 
                                         if( allMsg['num_msgs'] )
@@ -1754 +1770 @@
                                                         async: true,
                                                         success: function(data){
+                                                                //Inserida variável de controle para correta manipulação das mensagens locais
+                                                                local_messages_link = false;
                                                                 handler(data);
                                                         },
@@ -1759 +1777 @@
                                                                 connector.showProgressBar();
                                                         },
-                                                          complete: function( jqXHR, settings ){
+                                                        complete: function( jqXHR, settings ){
                                                                 connector.hideProgressBar();
                                                         }
@@ -1769 +1787 @@
                                         
                             }
-                            
+
                             xhr = $.ajax({
                                 url: 'controller.php?action='+url.shift(),

trunk/expressoMail1_2/js/wfolders.js

@@ -97 +97 @@
                 winSaveFile.next().css("background-color", "#E0EEEE");
                         
+                /*Insere a árvore de diretórios*/
                 var foldersTree = jQuery("#foldertree-container-sendFileMessage")
                 .removeClass('empty-container')
-                .html(DataLayer.render(BASE_PATH + 'api/templates/foldertree.ejs', {folders: [cp_tree1, cp_tree2, [] ]}))
+                //Adicionado parametro cp_tree3 para mensagens locais (MailArchiver)
+                .html(DataLayer.render(BASE_PATH + 'api/templates/foldertree.ejs', {folders: [cp_tree1, cp_tree2, cp_tree3 ]}))
                 .find("#foldertree").treeview()
                 .click(function(event)

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -937 +937 @@
 One of his messages can not be marked as read, because it contains a read confirmation. expressoMail1_2 pt-br   Uma de suas mensagens não pode ser marcada como lida, pois contém uma confirmação de leitura.
  of its messages could not be marked as read, because it contains a read confirmation.  expressoMail1_2 pt-br    de suas mensagens não puderam ser marcadas como lida, pois contém uma confirmação de leitura.
-Cant share with yourself.       expressoMail1_2 pt-br   Não é possível compartilhar com você mesmo. 
+Cant share with yourself.       expressoMail1_2 pt-br   Não é possível compartilhar com você mesmo.
+You can not remove the message with the preference 'Send to Trash' enabled. There is no permission to move messages to the trash folder.        expressoMail1_2 pt-br   Não é possível remover a mensagem com a preferencia 'Enviar para lixeira' ativada. Não existe permissão para mover mensagens para a pasta lixeira.
+Moving message %1 of %2 expressoMail1_2 pt-br   Movendo mensagem %1 de %2
+All done. Message(s) moved successfully expressoMail1_2 pt-br   Concluído. Mensagem(ns) movida(s) com sucesso.
+Starting to move messages       expressoMail1_2 pt-br   Iniciando a movimentação de mensagens
+MailArchiver does not seems to be running or installed at this workstation, local messages are disabled. Check it out!  expressoMail1_2 pt-br   O MailArchiver não parece estar rodando ou instalado nesta estação de trabalho, as mensagens locais estão desativadas. Verifique!
+Starting to unarchive messages  expressoMail1_2 pt-br   Iniciando o desarquivamento de mensagens
+Messages successfully unarchived        expressoMail1_2 pt-br   Mensagens desarquivadas com sucesso
+All done. End of archive messages operation     expressoMail1_2 pt-br   Concluído. Operação de arquivamento encerrada
+No messages were unarchived     expressoMail1_2 pt-br   Nenhuma mensagem foi desarquivada
+Some messages weren't successfully unarchived   expressoMail1_2 pt-br   Algumas mensagens não puderam ser desarquivadas
+Coudn't unarchive message       expressoMail1_2 pt-br   Não foi possível desarquivar mensagem
+Message successfully unarchived expressoMail1_2 pt-br   Mensagem desarquivada com sucesso
+Unarchiving message %1 of %2    expressoMail1_2 pt-br   Desarquivando mensagem %1 de %2
+Message %1 of %2 successfully archived  expressoMail1_2 pt-br   Mensagem %1 de %2 arquivada com sucesso
+Sorry, but Mail Archiver does not seems to be running or installed at this workstation. By now, we are turning off local messages!      expressoMail1_2 pt-br   Desculpe, mas o Mail Archiver não parece estar rodando ou instalado nesta estação de trabalho. De momento, estamos desativando as mensagens locais!
+Sorry, but Mail Archiver still seems to be sleeping. Check out your system services!    expressoMail1_2 pt-br   Desculpe, mas o Mail Archiver parece continuar offline. Verifique os serviços do seu sistema!

trunk/expressoMail1_2/templates/default/main.css

@@ -130 +130 @@
 .context-menu-item.icon-delete-box{ background-image: url(images/user_delete.png); }
 .context-menu-item.icon-quick-search-contact{ background-image: url(images/zoom.png); }
+/* Airton. Adicionando o ícone da opção de arquivar do menu de contexto do expressoMail */
+.context-menu-item.icon-archive{ background-image: url(images/archive.png); }
 
 
@@ -1586 +1588 @@
         cursor: text;
 }
+
+/* Mail Archive */
+.local-folder {
+
+}
+
+.local-connect {
+        width: 16px;
+        height: 16px;
+        background: url("images/connect_delete.gif") no-repeat;
+        display: inline-block;
+        cursor: pointer;
+}
+
+.local-admin {
+        width: 16px;
+        height: 16px;
+        background: url("images/config.png") no-repeat;
+        display: inline-block;
+        cursor: pointer;
+}

trunk/prototype/modules/attach_message/attach_message.js

@@ -268 +268 @@
 
         success: function( data ){
-
-                data = adaptOffline( data );
-
                 var tree1 = new Array();
                 var tree2 = new Array();

trunk/prototype/modules/mail/js/foldertree.js

@@ -4 +4 @@
 var cp_tree1;
 var cp_tree2;
+//Marcosw início
+var cp_tree3;
+//Marcosw fim
+var mail_archive_url;
 function unorphanize(root, element) {
-        var ok = false;
-        var f = 0;
-        for (var i=0; i<root.length; i++) {
-                if (root[i].id == element.parentFolder) {
-                        element.children = new Array(); 
-                        root[i].children.push(element);
-                        return true;
-                } else if (ok = unorphanize(root[i].children, element)) {
-                        break;
-                }
-        }
-        return ok;
+    var ok = false;
+    var f = 0;
+    for (var i=0; i<root.length; i++) {
+        if (root[i].id == element.parentFolder) {
+            element.children = new Array(); 
+            root[i].children.push(element);
+            return true;
+        } else if (ok = unorphanize(root[i].children, element)) {
+            break;
+        }
+    }
+    return ok;
 }
 
+function mount_children_localfolders_list(folder){ 
+    folder.children = new Array();
+    folder.id_search = folder.id;
+    folder.id = 'local_messages_'+folder.id,
+    folder.commonName =  folder.name,
+    folder.parentId = folder.parentid,
+    folder.type = 'localFolder',
+    folder.name = folder.id,
+    folder.messageCount = {
+                             total: folder.messages,
+                             unseen: folder.unseen
+                          }
+
+    if(folder.haschild){
+        expresso_mail_archive.getFoldersList(folder.id_search);
+        folder.children = expresso_mail_archive.folders;
+
+        for(var i = 0; i < folder.children.length; i++){
+            mount_children_localfolders_list(folder.children[i]);
+        }
+
+    }
+}
+
 function count_unseen_children(folder){
-        if(folder.children.length){
-                for(var i=0; i< folder.children.length; i++){
-                        if(folder.children[i].children.length)
-                                folder.children[i]['children_unseen'] = (folder.children[i]['children_unseen'] ? folder.children[i]['children_unseen'] : 0) + count_unseen_children(folder.children[i]);
-                        
-                        folder['children_unseen'] = (folder['children_unseen'] ? folder['children_unseen'] : 0)+ (folder.children[i]['children_unseen'] ? folder.children[i]['children_unseen'] : 0) + parseInt(folder.children[i].messageCount.unseen);                        
-                }
-                return folder['children_unseen'];
-        }else{
-                return parseInt(folder.messageCount.unseen);
-        }
+
+    if(folder.children.length){
+        for(var i=0; i< folder.children.length; i++){
+            
+                if(folder.children[i].children.length)
+                folder.children[i]['children_unseen'] = (folder.children[i]['children_unseen'] ? folder.children[i]['children_unseen'] : 0) + count_unseen_children(folder.children[i]);    
+           
+            folder['children_unseen'] = (folder['children_unseen'] ? folder['children_unseen'] : 0)+ (folder.children[i]['children_unseen'] ? folder.children[i]['children_unseen'] : 0) + parseInt(folder.children[i].messageCount.unseen);            
+        }
+        return folder['children_unseen'];
+    } else {
+        return parseInt(folder.messageCount.unseen);
+    }
 }
 
 function valid_tabs(children_of_this_folder, folder_to_move){
-        var borders_open = $("#border_tr").children();
-
-        var error = false;
-        for(var i = 1; i <= borders_open.length -2; i ++){
-                //VERIFICA A CADA FILHO DA PASTA SE ESTA eventNSAGEM E DESTA PASTA
-                $.each(children_of_this_folder, function(index, value){
-                        if($(children_of_this_folder[index]).attr('id') == openTab.imapBox[$(borders_open[i]).find("input[type=hidden]").attr("name")]){
-                                error = true;
-                                write_msg(get_lang("One or more messages from any sub-folder are open"));
-                                return error;
-                                
-                        }
-                });
-                if(error){
-                        return error;
-                }
-                //VERIFICA SE EXISTE NA PASTA A SER MOVIDA
-                if(openTab.imapBox[$(borders_open[i]).find("input[type=hidden]").attr("name")] == folder_to_move){
-                        error = true;
-                        write_msg(get_lang("One or more messages from this folder are open"));
-                        return error;
-                }
-        }
+    var borders_open = $("#border_tr").children();
+
+    var error = false;
+    for(var i = 1; i <= borders_open.length -2; i ++){
+        //VERIFICA A CADA FILHO DA PASTA SE ESTA eventNSAGEM E DESTA PASTA
+        $.each(children_of_this_folder, function(index, value){
+            if($(children_of_this_folder[index]).attr('id') == openTab.imapBox[$(borders_open[i]).find("input[type=hidden]").attr("name")]){
+                error = true;
+                write_msg(get_lang("One or more messages from any sub-folder are open"));
+                return error;
+                
+            }
+        });
+        if(error){
+            return error;
+        }
+        //VERIFICA SE EXISTE NA PASTA A SER MOVIDA
+        if(openTab.imapBox[$(borders_open[i]).find("input[type=hidden]").attr("name")] == folder_to_move){
+            error = true;
+            write_msg(get_lang("One or more messages from this folder are open"));
+            return error;
+        }
+    }
 }
 
 function draw_new_tree_folder(callback){
-        
-        var folders = DataLayer.get("folder", true);
-        
-        if(!selected){
-                selected = "INBOX";
-        }
-        /*
-        if( folders )
-        {
-            folders = $.map( folders, function( folder ){
-                  return {
-                    id: folder.folder_id,
-                    commonName: folder.folder_name,
-                    parentFolder: folder.folder_parent === "root" ? "" : folder.folder_parent,
-                    messageCount: { total : '', unseen : '0' }
-                  };
-            });
-        }
-        else
-            folders = DataLayer.get("folder", true);
-        */
-        var tree1 = new Array();
-        var tree2 = new Array();
-        var tree3 = new Array();
-        for (var i=0; i<folders.length; i++) {
-                if (/^INBOX/.test(folders[i].id)) {
-                        if (!unorphanize(tree1, folders[i])) {
-                                folders[i].children = new Array();
-                                tree1.push(folders[i]);
-                        }
-                }
-                else if (/^user/.test(folders[i].id)) {
-                        if (!unorphanize(tree2, folders[i])) {
-                                folders[i].children = new Array();
-                                tree2.push(folders[i]);
-                        }
-                }
-                else if (/^local_messages/.test(folders[i].id)) {
-                        if (!unorphanize(tree3, folders[i])) {
-                                folders[i].children = new Array();
-                                tree3.push(folders[i]);
-                        }
-                }
-        }
-        
-        for(var i =0; i<tree1.length; i++){
-                count_unseen_children(tree1[i]);
-        }
-        for(var i =0; i<tree2.length; i++){
-                count_unseen_children(tree2[i]);
-        }
-        for(var i =0; i<tree3.length; i++){
-                count_unseen_children(tree3[i]);
-        }
-        cp_tree1 = tree1;
-        cp_tree2 = tree2;
-        var shared_acls = {};
-
-        $.each(cp_tree2, function(index, value){
-                shared_acls[value.id] = value.acl_share;
-        });
-
-        $("#content_folders").removeClass("menu-degrade").parent().removeClass("image-menu");
-        var html = DataLayer.render('../prototype/modules/mail/templates/detailedfoldertree.ejs', {folders: [tree1, tree2, tree3]});
-        var folders_html = $("#content_folders").html(html).find(".mainfoldertree").treeview({
-                        persist: "cookie",
-                        animated: "fast"
-        }).find(".folder").unbind("click").click(function(event){
-                
-                // MUDANÇA DE PASTAS!
-                var target = $(this);   
-                
-                if($(".folders-loading").length)
-                        return;
-                
-                if($(event.target).parent().is(".float-menu"))
-                        return;
-                        
-                if( target.is('.collapsable-hitarea, .expandable-hitarea, .lastCollapsable-hitarea, .lastExpandable-hitarea, .treeview ,.folder_unseen,.ui-icon, .float-menu, .new_folder, .folders-loading, .head_folder, .shared-folders') )
-                        return;
-                
-                if( target.parent().find(".new_folder").length)
-                        return;
-                        
-                if( !target.attr('id') )
-                        target = target.parent();
-                if (target[0] == $(".mainfoldertree")[0]) return;
-                var uiId = target.attr('id');
-                var child = target.find('.folder');
-                  
-                if(!target.is('.mainfoldertree > .expandable-hitarea, .mainfoldertree > .collapsable-hitarea')){
-                        $('.filetree span.folder.selected').removeClass('selected');
-                        $(target).children('.folder').addClass('selected');
-                }
-                $(this).addClass("folders-loading");
-                selected = target.attr('id');
-                change_folder(target.attr('id'), child.attr('title'));  
-
-                $.ajax({
-                          url : "controller.php?"+ $.param( { action: "$this.imap_functions.get_folders_list", folder: target.attr('id') } ),
-                          success : function(data){
-                                  data = connector.unserialize(data);
-
-                                  if(data)
-                                    build_quota(data);
-                          }
-                });
-
-        }).filter('.followup-messages').click(function(event, ui){
-                search_emails("UNDELETED KEYWORD \"$Followupflagged\"");
-        }).end().end();
-        
-        folders_html.find('[id="'+selected+'"]').children().addClass("selected");
-        $(".folder").not(".head_folder").not(".shared-folders").parent().find(".folder").not(".head_folder,.inbox,.drafts,.sent,.spam,.trash").draggable({
-                // DRAG DE PASTAS
-                start : function(){
-                        $(this).css("color", "gray");
-                },
-                stop : function(){
-                        $(this).css("color", "");
-                },
-                revert: "invalid",
-                helper: function(event){
-                        if($.trim(($(this).text().split("["))[0]).length > 18)
-                                return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($(this).text().split("["))[0]).substring(0,18) + "...", type: "folder"}));
-                        return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($(this).text().split("["))[0]), type: "folder"}));
-                },
-                delay: 150,
-                refreshPositions: true,
-                zIndex : 2700,
-                //scroll: true, 
-                //scrollSensitivity: 100,
-                //scrollSpeed: 100,
-                containment: "#divAppbox" 
-        }).end().droppable({
-                //DROP DE PASTAS
-                over : function(a, b){
-                        //INICIO : SE A PASTA CONTER FILHAS EXPANDE 
-                        over = $(this);
-                        $(this).addClass("folder-over");
-                        if(($(this)[0] != $(this).parent().find(".head_folder")[0]))
-                                if($(this).prev()[0])
-                                        if($(this).parent().find(".expandable-hitarea")[0] == $(this).prev()[0]){
-                                                setTimeout(function(){
-                                                        if(over.hasClass("folder-over"))
-                                                                over.prev().trigger("click");
-                                                }, 500);
-                                                
-                                        }
-                        //FIM : SE A PASTA CONTER FILHAS EXPANDE
-                        
-                        //SETA BORDA EM VOLTA DA PASTA
-                },
-                out : function(){
-                        //RETIRA BORDA EM VOLTA DA PASTA
-                        $(this).removeClass("folder-over");
-                },
-                drop : function(event, ui){
-                        $(this).removeClass("folder-over");
-                        if($(this).parent().attr('id') == undefined){
-                                var folder_to = 'INBOX';
-                                var to_folder_title = get_lang("Inbox");
-                        }else{
-                                var folder_to = $(this).parent().attr('id');
-                                var to_folder_title = $(this).attr('title');
-                        }               
-                        var folder_to_move = ui.draggable.parent().attr('id');
-                        var border_id = ui.draggable.find("input[type=hidden]").attr("name");
-                        // eventnsagens : SE O DROP VIER DA LISTA DE eventNSAGENS :
-                        if(folder_to_move == "tbody_box"){
-                                move_msgs2(get_current_folder(), 'selected', 0, folder_to, to_folder_title,true);
-                                return refresh();
-                        }
-                        //SE FOR DE UMA PESQUISA RAPIDA
-                        else if(ui.draggable.parents('[id^="content_id_"]')[0]){
-                                move_search_msgs("content_id_"+border_id, folder_to, to_folder_title);
-                                return refresh();
-                        }
-                        // eventnsagens : SE O DROP VIER DE UMA ABA ABERTA
-                        else if(folder_to_move == "border_tr"){
-                                var id_msg = border_id.split("_")[0];
-                                folder = $("#input_folder_"+border_id+"_r")[0] ? $("#input_folder_"+border_id+"_r").val() : (openTab.imapBox[border_id] ? openTab.imapBox[border_id]:get_current_folder());
-                                alternate_border(border_id);
-                                move_msgs2(folder, id_msg, border_id, folder_to, to_folder_title,true);
-                                return refresh();
-                        }
-                        // SE O DROP VIER DA LISTA DE PASTAS
-                        else{
-                                var folder_to_exist = folder_to_move.split(cyrus_delimiter);    
-                                folder_to_exist = folder_to+cyrus_delimiter+folder_to_exist[folder_to_exist.length-1];
-                                
-                                //VERIFICA SE EXISTE UMA eventNSAGENS ABERTA NESTA PASTA E NAS SUAS FILHAS
-
-                                if(valid_tabs(ui.draggable.parent().find("li"), folder_to_move)){
-                                        return;
-                                }
-                                //FIM : VERIFICA SE EXISTE UMA eventNSAGENS ABERTA NESTA PASTA E NAS SUAS FILHAS;
-                                
-                                // VALIDA SE O USUARIO ESTA TENTANDO MOVER A PASTA PARA O eventSMO LOCAL
-                                if(folder_to_exist == folder_to_move){
-                                        return write_msg(get_lang("Thie folder is already in this place"));
-                                }
-                                
-                                // VALIDA SE O USUARIO ESTA TENTANDO MOVER A PASTA ABERTA NO momentO
-                                if(folder_to_move == get_current_folder()){
-                                        return write_msg(get_lang("It's not possible move this folder, because it is being used in the moment!"));
-                                }
-                                
-                                // VALIDA SE O USUARIO ESTA TENTANDO MOVER UMA PASTA FILHA DA PASTA ABERTA NO momentO
-                                if(ui.draggable.parent().find(".selected")[0]){
-                                        return write_msg(get_lang("It's not possible move this folder, because its subfolder is being used in the moment!"));
-                                }
-                                
-                                // VALIDA SE O USUARIO ESTA TENTANDO MOVER UMA PASTA PAI PARA DENTRO DE UMA FILHA
-                                if(ui.draggable.parent().find('[id="'+folder_to+'"]')[0]){
-                                        return write_msg(get_lang("It's not possible to move this folder to its subfolders!"));
-                                }                                       
-                                
-                                if($('[id="'+folder_to_exist+'"]').length){
-                                        return write_msg(get_lang("Can not move this folder to this location, because the target has already a folder with this name"));
-                                }
-                                
-                                $(this).addClass("folders-loading");
-                                
-                                $.ajax({
-                                        url : "controller.php?"+ $.param( { action: "$this.imap_functions.move_folder", folder_to_move: folder_to_move, folder_to: folder_to } ),
-                                        success : function(data){
-                                                cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
-                                                data = connector.unserialize(data);
-                                                if(data == "Permission denied"){
-                                                        write_msg(get_lang("Permission denied"));
-                                                }else if(data){
-                                                        write_msg(get_lang("The folder was successfully moved"));
-                                                }
-                                                else{
-                                                        write_msg(get_lang("ERROR moving your folder."));
-                                                }
-                                        }
-                                });
-                        }
-                }
-        });
-        $(".folder").not(".shared-folders").parent().find(".folder").hover(
-                function(){
-                        //CASO A LI NÃO TENHA UM eventNU FLUTUANTE AINDA, O eventNU É ADICIONADO!
-                        if(!$(this).children(":last").hasClass("float-menu") && !$(this).children(":last").hasClass("new_folder")){
-                                var folder_ = $(this);
-                                var folder_name;
-                                var shared = {
-                                        head : false,
-                                        valid : false
-                                };
-                                if(folder_.parent().attr('id')){
-                                        folder_name = folder_.parent().attr('id').split(cyrus_delimiter);
-                                        folder_name = folder_name[folder_name.length -1];
-                                        shared.valid = folder_.parent().attr('id').search("user/") == 0 ? true : false;
-                                }else
-                                        folder_name = "Root";
-                                
-                                if(shared.valid){
-                                        shared.head = folder_.parent().attr('id').split(cyrus_delimiter).length == 2 ?  true : false;
-                                        var folder_name_parts = folder_.parent().attr('id').split(cyrus_delimiter);
-                                        var acls = shared_acls[folder_name_parts[0]+cyrus_delimiter+folder_name_parts[1]];
-
-                                }
-
-                                html = DataLayer.render("../prototype/modules/mail/templates/float_folder_menu.ejs", {name_folder : folder_name, flag : shared, acl : acls});                                   
-                                        //FUNÇÃO DO eventNU FLUTUANTE EDITAR < BEGIN
-                                var esc = false;
-                                $(folder_).append(html).find(".float-menu-edit").click(function(){
-                                        var folder_id = $(this).parents(".closed:first").attr('id');
-                                        var name = $.trim($(this).parents(".closed:first").find("span:first").text().split("[")[0]);
-                                        if($(this).parents(".closed:first").find("span:first").hasClass("selected"))
-                                                return write_msg(get_lang("It's not possible rename this folder, because it is being used in the moment!"));
-                                        if($(this).parents(".closed:first").find(".selected").length)
-                                                return write_msg(get_lang("It's not possible rename this folder, because its subfolder is being used in the moment!")); 
-                                        if(valid_tabs($(this).parents("li:first").find("li"), folder_id))
-                                                return;
-                                        $(this).parents(".closed:first").find("span:first").empty().append("<input class='new_folder folder' type='text' maxlength='100'></input>");
-                                        $(".new_folder").focus().keydown(function(event){
-                                                event.stopPropagation();
-                                                if(event.keyCode == 13){
-                                                        if($(this).val() != ""){
-                                                                if($(this).val().match(/[\/\`\~\^\<\>\|\\\"\!\@\#\$\%\&\*\+\(\)\[\]\{\}\?;:]/gi)){
-                                                                        return write_msg(get_lang("cannot create folder. try other folder name"));
-                                                                }
-                                                                var new_name = folder_id.replace(/[a-zA-Z0-9á-úÁ-Ú^\s_-]+$/, $(this).val());
-                                                                if($('[id="'+new_name+'"]').length){
-                                                                        $(".folders-loading").removeClass("folders-loading");
-                                                                        write_msg(get_lang("Mailbox already exists"));
-                                                                        return draw_new_tree_folder();
-                                                                }
-                                                                $(".new_folder").parent().addClass("folders-loading");
-                                                                $.ajax({
-                                                                        url : "controller.php?action=$this.imap_functions.ren_mailbox",
-                                                                        type : "POST",
-                                                                        data : "current="+folder_id+"&rename="+new_name,
-                                                                        success : function(data){
-                                                                                data = connector.unserialize(data);
-                                                                                if(data == "Permission denied"){
-                                                                                        $(".folders-loading").removeClass("folders-loading");
-                                                                                        cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
-                                                                                        return write_msg(get_lang("Permission denied"));
-                                                                                }
-                                                                                write_msg(get_lang("The folder was successfully rename"));
-                                                                                cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
-                                                                        }
-                                                                });
-                                                        }else{
-                                                                $(".new_folder").focusout();
-                                                        }
-                                                }else if( event.keyCode == 27){
-                                                        draw_new_tree_folder();
-                                                }
-                                        }).focusout(function(){
-                                                draw_new_tree_folder();
-                                        }).val(name);
-                                })
-                                //FUNÇÃO DO eventNU FLUTUANTE EDITAR < END
-                                //FUNÇÃO DO eventNU FLUTUANTE EXCLUIR < BEGIN
-                                .end().find(".float-menu-remove").click(function(){
-                                        
-                                        var folder_id = $(this).parents(".closed:first").attr('id');
-                                        var folder_name = "<strong>"+$.trim($(this).parents(".closed:first").find(".folder").text().split("[")[0])+"</strong>";
-                                        
-                                        if(valid_tabs($(this).parents("li:first").find("li"), folder_id))
-                                                return;
-                                        $(this).parents(".closed:first").find(".folder").addClass("folders-loading"); 
-                                        
-                                        if($(this).parents(".closed:first").find("ul").length){
-                                                $(this).parents(".closed:first").find(".folder").removeClass("folders-loading");
-                                                return write_msg(get_lang("Delete/move subfolders first"));
-                                        }
-                                        if($(this).parents(".closed:first").find(".selected").length){
-                                                $(this).parents(".closed:first").find(".folder").removeClass("folders-loading");
-                                                return write_msg(get_lang("It's not possible delete this folder, because it is being used in the moment!")); 
-                                        }
-                                        var folder_span = $(this);
-                                        var confirm_text = get_lang("Do you wish to exclude the folder ");
-                                        $.Zebra_Dialog(confirm_text+folder_name, {
-                                                'type':     'question',
-                                                'overlay_opacity': '0.5',
-                                                'buttons':  [get_lang('Yes'), get_lang('No')],
-                                                'onClose':  function(caption) {
-                                                        if(caption == get_lang('Yes')){
-                                                                $.ajax({
-                                                                        url : "controller.php?action=$this.imap_functions.delete_mailbox",
-                                                                        type: "POST",
-                                                                        data : "del_past="+folder_id,
-                                                                        success : function(data){
-                                                                                data = connector.unserialize(data);
-                                                                                if(data == "Mailbox does not exist"){
-                                                                                        $(".folders-loading").removeClass("folders-loading");
-                                                                                        return write_msg(get_lang("Mailbox does not exist"));
-                                                                                }else if(data == "Permission denied"){
-                                                                                        $(".folders-loading").removeClass("folders-loading");
-                                                                                        cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
-                                                                                        return write_msg(get_lang("Permission denied"));
-                                                                                }
-                                                                                write_msg(get_lang("The folder %1 was successfully removed", folder_name));
-                                                                                cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
-                                                                        }
-                                                                });
-                                                        }else{
-                                                                folder_span.parents(".closed:first").find(".folder").removeClass("folders-loading");
-                                                                return;
-                                                        }
-                                                }
-                                        });
-                                        /* if(!confirm(confirm_text + folder_name)){
-                                                $(this).parents(".closed:first").find(".folder").removeClass("folders-loading");
-                                                return;
-                                        } */
-                                })
-                                //FUNÇÃO DO eventNU FLUTUANTE EXCLUIR < END
-                                //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < BEGIN
-                                .end().find(".float-menu-new").click(function(){
-                                        $(this).parents(".float-menu").hide();
-                                        var selected_li = $(this).parents(".closed:first");
-                                        if(selected_li.find("ul:first").length){
-                                                var new_folder = $("<li><input class='new_folder folder' type='text' maxlength='100'></input></li>").appendTo(selected_li.find("ul:first"));                                                            
-                                                if(selected_li.find(".expandable-hitarea").length){
-                                                        selected_li.find(".expandable-hitarea").trigger('click');
-                                                }
-                                                selected_li.find("ul:first").treeview({
-                                                        add: new_folder
-                                                });
-                                        }else if(selected_li.length){
-                                                var new_folder = $("<ul><li><input class='new_folder folder' type='text' maxlength='100'></input></li></ul>").appendTo(selected_li);                                                            
-                                                selected_li.treeview({
-                                                        add: new_folder
-                                                });
-                                        }else{
-                                                selected_li = $(this).parents(".head_folder").parent();
-                                                if($(this).parents(".head_folder").parent().find(".expandable-hitarea").length){
-                                                        $(this).parents(".head_folder").parent().find(".expandable-hitarea").trigger('click');
-                                                }
-                                                var new_folder = $("<ul><li><input class='new_folder folder' type='text' maxlength='100'></input></li></ul>").appendTo(selected_li);                                                            
-                                                selected_li.treeview({
-                                                        add: new_folder
-                                                });
-                                        }
-                                        
-                                        selected_li.find(".new_folder").Watermark("Nova Pasta").focus().keydown(function(event){
-                                                event.stopPropagation();
-                                                if(event.keyCode == 13){
-                                                        if($(this).val().match(/[\`\~\^\<\>\|\\\"\!\@\#\$\%\&\*\+\(\)\[\]\{\}\?;:]/gi)){
-                                                                return write_msg(get_lang("cannot create folder. try other folder name"));
-                                                        }
-                                                        if($('[id="'+ (selected_li.attr('id')? selected_li.attr('id') : "INBOX") + cyrus_delimiter + $(this).val()+'"]').length){
-                                                                $(".folders-loading").removeClass("folders-loading");
-                                                                write_msg(get_lang("Mailbox already exists"));
-                                                                return draw_new_tree_folder();
-                                                        }
-                                                        $(".new_folder").parent().addClass("folders-loading");
-                                                        create_new_folder(($(this).val() != "" ? $(this).val() : get_lang("New Folder")), (selected_li.attr('id')? selected_li.attr('id') : "INBOX"));
-                                                }else if( event.keyCode == 27){
-                                                        draw_new_tree_folder();
-                                                }
-                                        }).focusout(function(){
-                                                draw_new_tree_folder();
-                                        });
-                                }).end().find(".float-menu-export").click(function(){
-                                        //proxy_mensagens.export_all_messages($(this).parents("li:first").attr("id"))
-
-                                        var name_box = $(this).parents("li:first").attr("id");
-                                        var name_folder = name_box.split(cyrus_delimiter)[name_box.split(cyrus_delimiter).length-1];
-
-                                        var hand_export = function(data){
-                                                if(!data){
-                                                        write_msg(get_lang('Error compressing messages (ZIP). Contact the administrator.'))
-                                                }else if(data["empty_folder"]){
-                                                        write_msg(get_lang("The selected folder is empty."));
-                                                }else
-                                                  download_attachments(null, null, data, null,null, name_folder +'.zip');
-                                        }
-                                        cExecute("$this.exporteml.export_all",hand_export,"folder="+name_box);  
-                                        write_msg(get_lang('You must wait while the messages will be exported...'));            
-                                });
-                                //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < END
-                        }
-                        if(!$(".new_folder").length){
-                                $(this).find(".float-menu:first").css("display", "");
-                        }
-                },
-                function(){
-                        $(this).find(".float-menu:first").hide();
-                }
-        );
-        $("#new_m").html($('.selected').find(".folder_unseen").html() ? $('.selected').find(".folder_unseen").html() : "0").css("color", "red");
+    var folders = DataLayer.get("folder", true);    
+
+if(preferences.use_local_messages != 0){
+
+    if(expresso_mail_archive.folders && !expresso_offline && expresso_mail_archive.enabled == true) { //MailArchive
+        //pega pastas locais do mailarchiver e insere no array de pastas
+            expresso_mail_archive.getFoldersList("home");
+            treeFolders = expresso_mail_archive.folders;
+
+            for(var i=0; i<treeFolders.length; i++ ){
+                mount_children_localfolders_list(treeFolders[i]);
+            }
+            
+            for(var i = 0; i < treeFolders.length; i++){
+                folders.push(treeFolders[i]);
+            }
+ 
+    }
 }
+
+    if(!selected){
+        selected = "INBOX";
+    }
+
+    var tree1 = new Array();
+    var tree2 = new Array();
+    var tree3 = new Array();
+    for (var i=0; i<folders.length; i++) {
+        if (/^INBOX/.test(folders[i].id)) {
+            if (!unorphanize(tree1, folders[i])) {
+                folders[i].children = new Array();
+
+                tree1.push(folders[i]);
+            }
+        }
+        else if (/^user/.test(folders[i].id)) {
+            if (!unorphanize(tree2, folders[i])) {
+                folders[i].children = new Array();
+                tree2.push(folders[i]);
+            }
+        }
+        else if (/^local_messages/.test(folders[i].id)) {
+           
+                tree3.push(folders[i]);
+            
+        }
+    }
+    
+    for(var i =0; i<tree1.length; i++){
+        count_unseen_children(tree1[i]);
+    }
+    for(var i =0; i<tree2.length; i++){
+        count_unseen_children(tree2[i]);
+    }
+    for(var i =0; i<tree3.length; i++){
+        count_unseen_children(tree3[i]);
+    }
+    cp_tree1 = tree1;
+    cp_tree2 = tree2;
+    //Marcosw inicio
+    cp_tree3 = tree3;
+    //Marcosw fim
+    var shared_acls = {};
+
+    $.each(cp_tree2, function(index, value){
+        shared_acls[value.id] = value.acl_share;
+    });
+
+    $("#content_folders").removeClass("menu-degrade").parent().removeClass("image-menu");
+    mail_archive_url = mail_archive_protocol + "://" + mail_archive_host + ":" + mail_archive_port + "/admin";
+    var html = DataLayer.render('../prototype/modules/mail/templates/detailedfoldertree.ejs', {folders: [tree1, tree2, tree3]});
+    var folders_html = $("#content_folders").html(html).find(".mainfoldertree").treeview({
+            persist: "cookie",
+            animated: "fast"
+    }).find(".folder").unbind("click").click(function(event){
+
+        if ($(this).next().hasClass("local-connect")) {
+            return;
+        }
+
+        if ($(this).hasClass("local-folder")) {
+            return;
+        }
+        
+        // MUDANÇA DE PASTAS!
+        var target = $(this);   
+        
+        if($(".folders-loading").length)
+            return;
+        
+        if($(event.target).parent().is(".float-menu"))
+            return;
+            
+        if( target.is('.collapsable-hitarea, .expandable-hitarea, .lastCollapsable-hitarea, .lastExpandable-hitarea, .treeview ,.folder_unseen,.ui-icon, .float-menu, .new_folder, .folders-loading, .head_folder, .shared-folders') )
+            return;
+        
+        if( target.parent().find(".new_folder").length)
+            return;
+            
+        if( !target.attr('id') )
+            target = target.parent();
+        if (target[0] == $(".mainfoldertree")[0]) return;
+        var uiId = target.attr('id');
+        var child = target.find('.folder');
+          
+        if(!target.is('.mainfoldertree > .expandable-hitarea, .mainfoldertree > .collapsable-hitarea')){
+            $('.filetree span.folder.selected').removeClass('selected');
+            $(target).children('.folder').addClass('selected');
+        }
+        $(this).addClass("folders-loading");
+        selected = target.attr('id');
+        change_folder(target.attr('id'), child.attr('title'));  
+
+        $.ajax({
+              url : "controller.php?"+ $.param( { action: "$this.imap_functions.get_folders_list", folder: target.attr('id') } ),
+              success : function(data){
+                  data = connector.unserialize(data);
+
+                  if(data)
+                    build_quota(data);
+              }
+        });
+
+    }).filter('.followup-messages').click(function(event, ui){
+        search_emails("UNDELETED KEYWORD \"$Followupflagged\"");
+    }).end().end();
+    
+    folders_html.find('[id="'+selected+'"]').children().addClass("selected");
+    $(".folder").not(".head_folder").not(".shared-folders").parent().find(".folder").not(".head_folder,.inbox,.drafts,.sent,.spam,.trash").draggable({
+        // DRAG DE PASTAS
+        start : function(){
+            $(this).css("color", "gray");
+        },
+        stop : function(){
+            $(this).css("color", "");
+        },
+        revert: "invalid",
+        helper: function(event){
+            if($.trim(($(this).text().split("["))[0]).length > 18)
+                return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($(this).text().split("["))[0]).substring(0,18) + "...", type: "folder"}));
+            return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($(this).text().split("["))[0]), type: "folder"}));
+        },
+        delay: 150,
+        refreshPositions: true,
+        zIndex : 2700,
+        //scroll: true, 
+        //scrollSensitivity: 100,
+        //scrollSpeed: 100,
+        containment: "#divAppbox" 
+    }).end().droppable({
+        //DROP DE PASTAS
+        over : function(a, b){
+            //INICIO : SE A PASTA CONTER FILHAS EXPANDE 
+            over = $(this);
+            $(this).addClass("folder-over");
+            if(($(this)[0] != $(this).parent().find(".head_folder")[0]))
+                if($(this).prev()[0])
+                    if($(this).parent().find(".expandable-hitarea")[0] == $(this).prev()[0]){
+                        setTimeout(function(){
+                            if(over.hasClass("folder-over"))
+                                over.prev().trigger("click");
+                        }, 500);
+                        
+                    }
+            //FIM : SE A PASTA CONTER FILHAS EXPANDE
+            
+            //SETA BORDA EM VOLTA DA PASTA
+        },
+        out : function(){
+            //RETIRA BORDA EM VOLTA DA PASTA
+            $(this).removeClass("folder-over");
+        },
+        drop : function(event, ui){
+            $(this).removeClass("folder-over");
+            if($(this).parent().attr('id') == undefined){
+                var folder_to = 'INBOX';
+                var to_folder_title = get_lang("Inbox");
+            }else{
+                var folder_to = $(this).parent().attr('id');
+                var to_folder_title = $(this).attr('title');
+            }       
+            var folder_to_move = ui.draggable.parent().attr('id');
+            var border_id = ui.draggable.find("input[type=hidden]").attr("name");
+            // eventnsagens : SE O DROP VIER DA LISTA DE eventNSAGENS :
+            if(folder_to_move == "tbody_box"){
+                move_msgs2(get_current_folder(), 'selected', 0, folder_to, to_folder_title,true);
+                return refresh();
+            }
+            //SE FOR DE UMA PESQUISA RAPIDA
+            else if(ui.draggable.parents('[id^="content_id_"]')[0]){
+                move_search_msgs("content_id_"+border_id, folder_to, to_folder_title);
+                return refresh();
+            }
+            // eventnsagens : SE O DROP VIER DE UMA ABA ABERTA
+            else if(folder_to_move == "border_tr"){
+                var id_msg = border_id.split("_")[0];
+                folder = $("#input_folder_"+border_id+"_r")[0] ? $("#input_folder_"+border_id+"_r").val() : (openTab.imapBox[border_id] ? openTab.imapBox[border_id]:get_current_folder());
+                alternate_border(border_id);
+                move_msgs2(folder, id_msg, border_id, folder_to, to_folder_title,true);
+                return refresh();
+            }
+            // SE O DROP VIER DA LISTA DE PASTAS
+            else{
+                var folder_to_exist = folder_to_move.split(cyrus_delimiter);    
+                folder_to_exist = folder_to+cyrus_delimiter+folder_to_exist[folder_to_exist.length-1];
+                
+                //VERIFICA SE EXISTE UMA eventNSAGENS ABERTA NESTA PASTA E NAS SUAS FILHAS
+
+                if(valid_tabs(ui.draggable.parent().find("li"), folder_to_move)){
+                    return;
+                }
+                //FIM : VERIFICA SE EXISTE UMA eventNSAGENS ABERTA NESTA PASTA E NAS SUAS FILHAS;
+                
+                // VALIDA SE O USUARIO ESTA TENTANDO MOVER A PASTA PARA O eventSMO LOCAL
+                if(folder_to_exist == folder_to_move){
+                    return write_msg(get_lang("Thie folder is already in this place"));
+                }
+                
+                // VALIDA SE O USUARIO ESTA TENTANDO MOVER A PASTA ABERTA NO momentO
+                if(folder_to_move == get_current_folder()){
+                    return write_msg(get_lang("It's not possible move this folder, because it is being used in the moment!"));
+                }
+                
+                // VALIDA SE O USUARIO ESTA TENTANDO MOVER UMA PASTA FILHA DA PASTA ABERTA NO momentO
+                if(ui.draggable.parent().find(".selected")[0]){
+                    return write_msg(get_lang("It's not possible move this folder, because its subfolder is being used in the moment!"));
+                }
+                
+                // VALIDA SE O USUARIO ESTA TENTANDO MOVER UMA PASTA PAI PARA DENTRO DE UMA FILHA
+                if(ui.draggable.parent().find('[id="'+folder_to+'"]')[0]){
+                    return write_msg(get_lang("It's not possible to move this folder to its subfolders!"));
+                }                   
+                
+                if($('[id="'+folder_to_exist+'"]').length){
+                    return write_msg(get_lang("Can not move this folder to this location, because the target has already a folder with this name"));
+                }
+                
+                $(this).addClass("folders-loading");
+
+
+                if($(this).parent().parent().parent().find("input").val() == "localFolder"){
+                    var idFolder = $(this).parent().attr("id").split("_")[2];
+
+                    expresso_mail_archive.moveFolder(idFolder, folder_to_move.split("_")[2]);
+                     cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                } else {
+                    $.ajax({
+                        url : "controller.php?"+ $.param( { action: "$this.imap_functions.move_folder", folder_to_move: folder_to_move, folder_to: folder_to } ),
+                        success : function(data){
+                            cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                            data = connector.unserialize(data);
+                            if(data == "Permission denied"){
+                                write_msg(get_lang("Permission denied"));
+                            }else if(data){
+                                write_msg(get_lang("The folder was successfully moved"));
+                            } else {
+                                write_msg(get_lang("ERROR moving your folder."));
+                            }
+                        }
+                    });
+                }
+            }
+        }
+    });
+    $(".folder").not(".shared-folders").parent().find(".folder").hover(
+        function(){
+            //CASO A LI NÃO TENHA UM eventNU FLUTUANTE AINDA, O eventNU É ADICIONADO!
+            if(!$(this).children(":last").hasClass("float-menu") && !$(this).children(":last").hasClass("new_folder") && !($(this).next().hasClass("local-connect"))){ /*se houver a classe local-connect, não adiciona o botão de conectar*/
+                var folder_ = $(this);
+                var folder_name;
+                var shared = {
+                    head : false,
+                    valid : false
+                };
+                if(folder_.parent().attr('id')){
+                    folder_name = folder_.parent().attr('id').split(cyrus_delimiter);
+                    folder_name = folder_name[folder_name.length -1];
+                    shared.valid = folder_.parent().attr('id').search("user/") == 0 ? true : false;
+                }else
+                    folder_name = "Root";
+                
+                if(shared.valid){
+                    shared.head = folder_.parent().attr('id').split(cyrus_delimiter).length == 2 ?  true : false;
+                    var folder_name_parts = folder_.parent().attr('id').split(cyrus_delimiter);
+                    var acls = shared_acls[folder_name_parts[0]+cyrus_delimiter+folder_name_parts[1]];
+
+                }
+
+                html = DataLayer.render("../prototype/modules/mail/templates/float_folder_menu.ejs", {name_folder : folder_name, flag : shared, acl : acls});                   
+                    //FUNÇÃO DO eventNU FLUTUANTE EDITAR < BEGIN
+                var esc = false;
+                $(folder_).append(html).find(".float-menu-edit").click(function(){
+                    var folder_id = $(this).parents(".closed:first").attr('id');
+                    var name = $.trim($(this).parents(".closed:first").find("span:first").text().split("[")[0]);
+                    if($(this).parents(".closed:first").find("span:first").hasClass("selected"))
+                        return write_msg(get_lang("It's not possible rename this folder, because it is being used in the moment!"));
+                    if($(this).parents(".closed:first").find(".selected").length)
+                        return write_msg(get_lang("It's not possible rename this folder, because its subfolder is being used in the moment!")); 
+                    if(valid_tabs($(this).parents("li:first").find("li"), folder_id))
+                        return;
+                    $(this).parents(".closed:first").find("span:first").empty().append("<input class='new_folder folder' type='text' maxlength='100'></input>");
+                    $(".new_folder").focus().keydown(function(event){
+                        event.stopPropagation();
+                        
+                        if(event.keyCode == 13){
+                            if($(this).val() != ""){
+
+                                if($(this).val().match(/[\/\`\~\^\<\>\|\\\"\!\@\#\$\%\&\*\+\(\)\[\]\{\}\?;:]/gi)){
+                                    return write_msg(get_lang("cannot create folder. try other folder name"));
+                                }
+                                var new_name = folder_id.replace(/[a-zA-Z0-9á-úÁ-Ú^\s_-]+$/, $(this).val());
+                                if($('[id="'+new_name+'"]').length){
+                                    $(".folders-loading").removeClass("folders-loading");
+                                    write_msg(get_lang("Mailbox already exists"));
+                                    return draw_new_tree_folder();
+                                }
+                                $(".new_folder").parent().addClass("folders-loading");
+
+                                if($(this).parent().parent().parent().find("input").val() == "localFolder"){
+                                    var idFolder = $(this).parent().parent().attr("id").split("_")[2];
+                                    expresso_mail_archive.renameFolder(idFolder, new_name);
+                                     cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                } else {
+
+                                $.ajax({
+                                    url : "controller.php?action=$this.imap_functions.ren_mailbox",
+                                    type : "POST",
+                                    data : "current="+folder_id+"&rename="+new_name,
+                                    success : function(data){
+                                        data = connector.unserialize(data);
+                                        if(data == "Permission denied"){
+                                            $(".folders-loading").removeClass("folders-loading");
+                                            cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                            return write_msg(get_lang("Permission denied"));
+                                        }
+                                        write_msg(get_lang("The folder was successfully rename"));
+                                        cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                    }
+                                });
+
+                                }
+                            }else{
+                                $(".new_folder").focusout();
+                            }
+                        }else if( event.keyCode == 27){
+                            draw_new_tree_folder();
+                        }
+                    }).focusout(function(){
+                        draw_new_tree_folder();
+                    }).val(name);
+                })
+                //FUNÇÃO DO eventNU FLUTUANTE EDITAR < END
+                //FUNÇÃO DO eventNU FLUTUANTE EXCLUIR < BEGIN
+                .end().find(".float-menu-remove").click(function(){
+                    
+                    var folder_id = $(this).parents(".closed:first").attr('id');
+                    var folder_name = "<strong>"+$.trim($(this).parents(".closed:first").find(".folder").text().split("[")[0])+"</strong>";
+                    
+                    if(valid_tabs($(this).parents("li:first").find("li"), folder_id))
+                        return;
+                    $(this).parents(".closed:first").find(".folder").addClass("folders-loading"); 
+                    
+                    if($(this).parents(".closed:first").find("ul").length){
+                        $(this).parents(".closed:first").find(".folder").removeClass("folders-loading");
+                        return write_msg(get_lang("Delete/move subfolders first"));
+                    }
+                    if($(this).parents(".closed:first").find(".selected").length){
+                        $(this).parents(".closed:first").find(".folder").removeClass("folders-loading");
+                        return write_msg(get_lang("It's not possible delete this folder, because it is being used in the moment!")); 
+                    }
+                    var folder_span = $(this);
+                    var confirm_text = get_lang("Do you wish to exclude the folder ");
+
+                    $.Zebra_Dialog(confirm_text+folder_name, {
+                        'type':     'question',
+                        'overlay_opacity': '0.5',
+                        'buttons':  [get_lang('Yes'), get_lang('No')],
+                        'onClose':  function(caption) {
+
+                            if(caption == get_lang('Yes')){
+                                if(folder_span.parent().parent().parent().find("input").val() == "localFolder"){
+                                    var idFolder = folder_span.parent().parent().parent("li").attr("id").split("_")[2];
+                                    expresso_mail_archive.deleteFolder(idFolder);
+                                     cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                } else {
+                                $.ajax({
+                                    url : "controller.php?action=$this.imap_functions.delete_mailbox",
+                                    type: "POST",
+                                    data : "del_past="+folder_id,
+                                    success : function(data){
+                                        data = connector.unserialize(data);
+                                        if(data == "Mailbox does not exist"){
+                                            $(".folders-loading").removeClass("folders-loading");
+                                            return write_msg(get_lang("Mailbox does not exist"));
+                                        }else if(data == "Permission denied"){
+                                            $(".folders-loading").removeClass("folders-loading");
+                                            cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                            return write_msg(get_lang("Permission denied"));
+                                        }
+                                        write_msg(get_lang("The folder %1 was successfully removed", folder_name));
+                                        cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                    }
+                                });
+                                }
+                            }else{
+                                folder_span.parents(".closed:first").find(".folder").removeClass("folders-loading");
+                                return;
+                            }
+                        }
+                    });
+                    /* if(!confirm(confirm_text + folder_name)){
+                        $(this).parents(".closed:first").find(".folder").removeClass("folders-loading");
+                        return;
+                    } */
+                })
+                //FUNÇÃO DO eventNU FLUTUANTE EXCLUIR < END
+                //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < BEGIN
+                .end().find(".float-menu-new").click(function(){
+                    $(this).parents(".float-menu").hide();
+                    var selected_li = $(this).parents(".closed:first");
+                    if(selected_li.find("ul:first").length){
+                        var new_folder = $("<li><input class='new_folder folder' type='text' maxlength='100'></input></li>").appendTo(selected_li.find("ul:first"));                                
+                        if(selected_li.find(".expandable-hitarea").length){
+                            selected_li.find(".expandable-hitarea").trigger('click');
+                        }
+                        selected_li.find("ul:first").treeview({
+                            add: new_folder
+                        });
+                    }else if(selected_li.length){
+                        var new_folder = $("<ul><li><input class='new_folder folder' type='text' maxlength='100'></input></li></ul>").appendTo(selected_li);                                
+                        selected_li.treeview({
+                            add: new_folder
+                        });
+                    }else{
+                        selected_li = $(this).parents(".head_folder").parent();
+                        if($(this).parents(".head_folder").parent().find(".expandable-hitarea").length){
+                            $(this).parents(".head_folder").parent().find(".expandable-hitarea").trigger('click');
+                        }
+                        var new_folder = $("<ul><li><input class='new_folder folder' type='text' maxlength='100'></input></li></ul>").appendTo(selected_li);                                
+                        selected_li.treeview({
+                            add: new_folder
+                        });
+                    }
+                    
+                    selected_li.find(".new_folder").Watermark("Nova Pasta").focus().keydown(function(event){
+                        event.stopPropagation();
+
+
+                        if(event.keyCode == 13){
+
+                            if($(this).parent().parent().parent().find("input[type=hidden]").val() == "localFolder"){
+
+                                 $(".new_folder").parent().addClass("folders-loading");
+
+                                 var folderName = $(this).val();
+                                 var folder = (folderName != "" ? folderName : get_lang("New Folder"));
+
+                                 create_new_local_folder((selected_li.attr('id') ? selected_li.attr('id') : "inbox") , folder);
+                                 cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                            } else {
+
+                                if($(this).val().match(/[\`\~\^\<\>\|\\\"\!\@\#\$\%\&\*\+\(\)\[\]\{\}\?;:]/gi)){
+                                    return write_msg(get_lang("cannot create folder. try other folder name"));
+                                }
+                                if($('[id="'+ (selected_li.attr('id')? selected_li.attr('id') : "INBOX") + cyrus_delimiter + $(this).val()+'"]').length){
+                                    $(".folders-loading").removeClass("folders-loading");
+                                    write_msg(get_lang("Mailbox already exists"));
+                                    return draw_new_tree_folder();
+                                }
+                                $(".new_folder").parent().addClass("folders-loading");
+                                create_new_folder(($(this).val() != "" ? $(this).val() : get_lang("New Folder")), (selected_li.attr('id')? selected_li.attr('id') : "INBOX"));
+                            }
+
+                        }else if( event.keyCode == 27){
+                            draw_new_tree_folder();
+                        }
+
+
+
+                    }).focusout(function(){
+                        draw_new_tree_folder();
+                    });
+                }).end().find(".float-menu-export").click(function(){
+                    //proxy_mensagens.export_all_messages($(this).parents("li:first").attr("id"))
+
+                    var name_box = $(this).parents("li:first").attr("id");
+
+                    var name_folder = name_box.split(cyrus_delimiter)[name_box.split(cyrus_delimiter).length-1];
+
+
+                    var hand_export = function(data){
+                        if(!data){
+                            write_msg(get_lang('Error compressing messages (ZIP). Contact the administrator.'))
+                        }else if(data["empty_folder"] || data == "empty_folder"){
+                            write_msg(get_lang("The selected folder is empty."));
+                        }else
+                          download_attachments(null, null, data, null,null, name_folder +'.zip');
+                    }
+                    if($(this).parents("li:first").find("input[type=hidden]:first").val() == "localFolder"){                        
+                          expresso_mail_archive.listMessages(name_box.split("_")[2]);
+                          var msgsArchive = expresso_mail_archive.messageslisted;
+                        
+                           buildExportArchiver(msgsArchive, name_box);
+
+                    } else {
+                          cExecute("$this.exporteml.export_all",hand_export,"folder="+name_box);  
+                    }
+                    write_msg(get_lang('You must wait while the messages will be exported...'));        
+                });
+                //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < END
+            }
+            if(!$(".new_folder").length){
+                $(this).find(".float-menu:first").css("display", "");
+            }
+        },
+        function(){
+            $(this).find(".float-menu:first").hide();
+        }
+    );
+    $("#new_m").html($('.selected').find(".folder_unseen").html() ? $('.selected').find(".folder_unseen").html() : "0").css("color", "red");
+}

trunk/prototype/modules/mail/templates/detailedfoldertree.ejs

@@ -30 +30 @@
                   <% }  %>
                   </span>
+                  <input type="hidden" value="<%= array_trees[i].type %>">
                   <%
                   if (array_trees[i].children.length>0)
@@ -50 +51 @@
   <%}%>
   <% if(preferences.use_local_messages == 1) { %>
-  <li><span class="folder head_folder">Pastas locais</span>
-      <% recursive_forest(data.folders[2]); %>
-  </li>
+     <% if(expresso_mail_archive.enabled && data.folders[2].length > 0) { /*MailArchive ativado*/ %>
+        <li>
+                <span class="folder local-folder head_folder" style="display: inline;">Pastas locais</span>
+                <% recursive_forest(data.folders[2]); %>
+        </li>
+    <%} else { /*MailArchive desativado*/ %>
+        <li>
+                <span class="folder local-folder head_folder" style="display: inline;" title="MailArchive Desconectado">Pastas locais</span>
+                <span class="local-connect" onclick="services_retry();" title="Conectar ao MailArchive"></span>
+                <a class="local-admin" href="<%= mail_archive_url %>" title="MailArchiver Admin" target="_blank"></a>
+        </li>
+        <%}%>
+
   <%}%>
   <li><span class="folder head_folder all_accomp followup-messages">Para acompanhamento</span>

trunk/prototype/modules/mail/templates/float_folder_menu.ejs

@@ -1 @@
-<%
+<% 
         var specialFolders = {
                         INBOX: {name:'Caixa de Entrada'}, 
@@ -5 +5 @@
                         Root : {name:'root'}
                 };
+    specialFolders["local_messages_trash"] = {name:'Lixeira', classe:'trash'};
+    specialFolders["local_messages_drafts"] = {name:'Rascunhos', classe:'drafts'};
+    specialFolders["local_messages_spam"] = {name:'Spam', classe:'spam'};
+    specialFolders["local_messages_sent"] = {name:'Enviados', classe:'sent'};
+    specialFolders["local_messages_outbox"] = {name:'Enviados', classe:'sent'};
+
         specialFolders[trashfolder] = {name:'Lixeira', classe:'trash'};
         specialFolders[draftsfolder] = {name:'Rascunhos', classe:'drafts'};
@@ -12 +18 @@
 
 <span class="float-menu">
+    <% if(data.name_folder != "local_messages_inbox"){ %>
         <%if(!data.flag.valid){ %>
+
                 <%if(data.name_folder != 'INBOX'){%>
                         <span class="ui-icon ui-icon-document float-menu-new floating-default" title="<%=get_lang("New Folder")%>"></span>  
                 <%}%>
-                <%if(!specialFolders[data.name_folder]){ %>
+                <%if(!specialFolders[data.name_folder] ){ %>
                         <span class="ui-icon ui-icon-pencil float-menu-edit floating-default" title="<%=get_lang("Edit folder")%>"></span>  
                         <span class="ui-icon ui-icon-close float-menu-remove floating-default" title="<%=get_lang("Delete folder")%>"></span>  
                 <%} 
-                else if(data.name_folder == trashfolder){%>
-                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_trash_imap();" title="<%=get_lang("Empty Trash")%>"></span>  
+                else if(data.name_folder == trashfolder || data.name_folder == "local_messages_trash"){%>
+         <% var type = false; if(data.name_folder == "local_messages_trash"){ type = data.name_folder; } else { type = false; } %>
+                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_trash_imap(false, false, <%= type %>);" title="<%=get_lang("Empty Trash")%>"></span>  
                 <%}
-                else if(data.name_folder == spamfolder){%>
-                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_spam_imap();" title="<%=get_lang("Empty Spam")%>"></span>  
+                else if(data.name_folder == spamfolder || data.name_folder == "local_messages_spam"){%>
+            <% var type = false; if(data.name_folder == "local_messages_spam"){ type = data.name_folder; } else { type = false; } %>
+                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_spam_imap(false, false, <%= type %>);" title="<%=get_lang("Empty Spam")%>"></span>  
                         
                 <%}%>
@@ -45 +55 @@
                 <%}%>
         <%}%>
+    <% } %>
         <span class="ui-icon ui-icon-arrowthickstop-1-n float-menu-export floating-default" title="<%=get_lang("Export folder messages")%>"></span>  
  </span>

trunk/prototype/services/ImapServiceAdapter.php

@@ -615 +615 @@
                                 $mailService->addHeaderField('Message-Id', UUID::generate( UUID::UUID_RANDOM, UUID::FMT_STRING ) . '@Draft');
                 $mailService->addHeaderField('Reply-To', mb_convert_encoding(($data['input_reply_to']), 'ISO-8859-1', 'UTF-8,ISO-8859-1'));
+                $mailService->addHeaderField('Date', date("d-M-Y H:i:s"));
                                 $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'));