Changeset 6930

Timestamp:

08/03/12 15:32:43 (12 years ago)

Author:

gustavo

Message:

Ticket #2954 - Merge de algumas novas funcionalidades da nova versão, #2953, #2971

Location:

trunk

Files:

• expressoMail1_2/inc/class.dynamic_contacts.inc.php (deleted)
• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (10 diffs)
• expressoMail1_2/js/TreeS.js (modified) (2 diffs)
• expressoMail1_2/js/TreeShow.js (deleted)
• expressoMail1_2/js/abas.js (modified) (2 diffs)
• expressoMail1_2/js/common_functions.js (modified) (6 diffs)
• expressoMail1_2/js/doiMenuData.js (modified) (5 diffs)
• expressoMail1_2/js/draw_api.js (modified) (23 diffs)
• expressoMail1_2/js/mail_sync.js (modified) (2 diffs)
• expressoMail1_2/js/main.js (modified) (34 diffs)
• expressoMail1_2/js/manifest (modified) (1 diff)
• expressoMail1_2/js/messages_controller.js (modified) (7 diffs)
• expressoMail1_2/js/preferences.js (modified) (1 diff)
• expressoMail1_2/js/shortcut.js (modified) (1 diff)
• expressoMail1_2/setup/phpgw_pt-br.lang (modified) (1 diff)
• expressoMail1_2/templates/default/folderExpresso.ejs (deleted)
• expressoMail1_2/templates/default/main.css (modified) (8 diffs)
• library/ckeditor/plugins/expresso/plugin.js (modified) (2 diffs)
• prototype/modules/mail/js/foldertree.js (modified) (8 diffs)
• prototype/modules/mail/templates/attachment.ejs (modified) (2 diffs)
• prototype/modules/mail/templates/attachment_add_itemlist.ejs (modified) (1 diff)
• prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs (copied) (copied from sandbox/2.4.2-expresso2/prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs)
• prototype/modules/mail/templates/float_folder_menu.ejs (modified) (1 diff)
• prototype/modules/mail/templates/new_message.ejs (modified) (1 diff)
• prototype/services/ImapServiceAdapter.php (modified) (1 diff)

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

@@ -128 +128 @@
                 $result = true;
                 if(!imap_renamemailbox($mbox, '{'.$this->imap_server.":".$this->imap_port.$this->imap_options.'}'.$old_folder, '{'.$this->imap_server.":".$this->imap_port.$this->imap_options.'}'.$to_folder.$this->imap_delimiter.$new_folder[count($new_folder)-1])){
-                        $result = false;
-                }
+                        $result = imap_last_error();
+                }
+
                 imap_close($mbox); 
                 return $result;
@@ -2395 +2396 @@
                         $decifrada = mb_convert_encoding('INBOX'.$this->imap_delimiter.'decifradas','UTF7-IMAP','ISO-8859-1'); //Ignorar esta pasta decifrada
                         $parent = ($nameCount > 1 && $nameArray[($nameCount - 2)] !== 'INBOX') ? implode($this->imap_delimiter, array_slice($nameArray, 0, ($nameCount - 1))): ''; //Pega folder pai
-                        if($nameArray[0] === 'user')
-                                $folders[$prefixShared.$this->imap_delimiter.$nameArray[1]][] = array('id' => $folderId , 'stream' => $v->name , 'attributes' => $v->attributes , 'name' => $nameArray[($nameCount-1)] , 'user' => $nameArray[1] ,'parent' => $parent);
-                        else if( $folderId !== $decifrada) //Escapa pasta decifrada
-                                $folders['INBOX'][strtolower($folderId)] =  array('id' => $folderId , 'stream' => $v->name , 'attributes' => $v->attributes ,'name' => $nameArray[($nameCount-1)] , 'parent' => $parent);
-                }
+
+                        if($nameArray[0] === 'user'){
+
+                                //variaveis utilizadas para definição das permissões das pastas compartilhadas
+                                $acl_share_create = 0;
+                                $acl_share_rename = 0;
+                                $acl_share_delete = 0;
+
+                                //recuperando as permissões (ACLs) aplicadas na pasta
+                                $imap_getacl = imap_getacl($mboxStream, $folderId);
+
+                                //Se existe ACLs aplicadas a respectiva pasta (para o usuario corrente)
+                                if(isset($imap_getacl[ $this->username ])){
+                                        $aclImap = $imap_getacl[ $this->username ];
+
+                                        //A partir dos atributos da ACL definir permissões para cada ação (create, delete e rename):
+                                        //http://www.ietf.org/rfc/rfc4314.txt
+                                        $acl_share_create = (stripos($aclImap,'w') !== false && stripos($aclImap,'i') !== false && stripos($aclImap,'k') !== false) ? 1 : 0;
+                                        $acl_share_delete = (stripos($aclImap,'x') !== false && stripos($aclImap,'t') !== false && stripos($aclImap,'e') !== false) ? 1 : 0;
+
+                                        $acl_share_rename = ($acl_share_create && $acl_share_delete) ? 1 : 0;
+                                }
+
+                                $folders[$prefixShared.$this->imap_delimiter.$nameArray[1]][] = array(
+                                        'id' => $folderId , 
+                                        'stream' => $v->name , 
+                                        'attributes' => $v->attributes , 
+                                        'name' => $nameArray[($nameCount-1)] , 
+                                        'user' => $nameArray[1] ,
+                                        'parent' => $parent ,
+
+                                        //Acrescentando ACLs configuradas a cada pasta compartilhada
+                                        'acl_share' => array(
+                                                'create' => $acl_share_create,
+                                                'rename' => $acl_share_rename,
+                                                'delete' => $acl_share_delete
+                                        )
+                                );
+
+                        }       
+                        else if( $folderId !== $decifrada){ //Escapa pasta decifrada
+                                $folders['INBOX'][strtolower($folderId)] = array(
+                                        'id' => $folderId , 
+                                        'stream' => $v->name , 
+                                        'attributes' => $v->attributes ,
+                                        'name' => $nameArray[($nameCount-1)] , 
+                                        'parent' => $parent 
+                                );
+                        }
+                }
+
                 unset($folders_list); //destroy array de objetos desnecessarios
                 
@@ -2417 +2464 @@
                                 $append['folder_hasChildren'] = (($vv['attributes'] == 32) && ($vv['name'] != 'INBOX')) ? 1 : 0;
                                 $append['folder_parent'] = $vv['parent'];
+
+                                //Preparando o array de retorno para conter as ACLs configuradas para cada pasta
+                                if(isset($vv['acl_share'])){
+                                        $append['acl_share'] = $vv['acl_share'];
+                                }
                                 $return[] = $append;
                         }
@@ -2423 +2475 @@
                 $quotaInfo =  (!isset($params['noQuotaInfo'])) ? $this->get_quota( array('folder_id' => $currentFolder)) : false; //VERIFICA SE O USUARIO TEM COTA
 
-                return ( ( is_array($quotaInfo) ) ?  array_merge($return, $quotaInfo) : $return );        
+                return ( ( is_array($quotaInfo) ) ?  array_merge($return, $quotaInfo) : $return );
         }
     
@@ -2443 +2495 @@
                         if(!imap_createmailbox($mbox_stream,"{".$imap_server."}".$namebox))
                         {
-                                $result = implode("<br />\n", imap_errors());
+                                $result = imap_last_error();
                         }
                 }else{
@@ -2454 +2506 @@
                                 if(!imap_createmailbox($mbox_stream,"{".$imap_server."}$namebox"))
                                 {
-                                        $result = implode("<br />\n", imap_errors());                                           
+                                        $result = imap_last_error();                                            
                                 }
                                 $child .=$this->imap_delimiter;
@@ -2496 +2548 @@
                 if(!imap_deletemailbox($mbox_stream,"{".$imap_server."}$namebox"))
                 {
-                        $result = implode("<br />\n", imap_errors());
+                        $result = imap_last_error();
                 }
                 /*
@@ -2519 +2571 @@
                 if(!imap_renamemailbox($mbox_stream,"{".$imap_server."}$namebox","{".$imap_server."}$new_box"))
                 {
-                        $result = imap_errors();
+                        $result = imap_last_error();
                 }
                 if($mbox_stream)
@@ -3706 +3758 @@
                         $this->mbox = $this->open_mbox($folder);
 
+                if($offsetEnd == 0 && $offsetBegin == 0){
+                        $offsetEnd = imap_num_msg($this->mbox);
+                        $offsetBegin = 1;
+                }
                 return $this->messages_sort($sort_box_type,$sort_box_reverse, $search_box_type,$offsetBegin,$offsetEnd,$folder);
         }
@@ -3853 +3909 @@
         function empty_folder($params)
         {
-                $folder = 'INBOX' . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server'][$params['clean_folder']];
+                $folder = (isset($params['shared']) ? $params['shared'] : 'INBOX') . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server'][$params['clean_folder']];
                 $mbox_stream = $this->open_mbox($folder);
                 $return = imap_delete($mbox_stream,'1:*');
+                $return = imap_errors();
                 if($mbox_stream)
                         imap_close($mbox_stream, CL_EXPUNGE);

trunk/expressoMail1_2/js/TreeS.js

@@ -4 +4 @@
         
         function foldersExpresso(){ }
-        
-        function load()
-        {
-                var div = document.createElement("div");
-                
-                var args = 
-                {
-                        "delete_folder"         : get_lang('Delete folder'),
-                        "export_messages"       : get_lang('Export messages'),
-                        "new_folder"            : get_lang('New folder'),
-                        "rename_folder"         : get_lang('Rename folder')
-                };
-                
-                $(div).html(DataLayer.render("./templates/default/folderExpresso.ejs", args ));
-                
-                $(div).dialog(
-                {
-                        resizable       : false,
-                        title           : get_lang("Manager your folders and export messages"),
-                        position        : 'center',
-                        width           : 600,
-                        height          : 300,
-                        modal           : false,
-                        buttons         : [
-                                                        {
-                                                                text: get_lang("Close"),
-                                                                click: function()
-                                                                {
-                                                                        $(this).dialog("close").dialog("destroy");
-                                                                        div.removeChild( div.firstChild );
-                                                                },
-                                                                style: "margin-top: -2.1em" 
-                                                        }
-                        ],
-                        beforeClose     : function()
-                        { 
-                if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 
-                                $(this).dialog("destroy");
-                                div.removeChild( div.firstChild );
-                        },
-                        open : function()
-                        {
-                                if( folders.length == 0 )
-                                {
-                                        write_msg( "ERRO : Sem dados" );
-                                        $(div).dialog("destroy");
-                                        div.removeChild(div.firstChild);
-                                        return false;
-                                }
-                                else
-                                {
-                                        if( Element('dftree_treeFolders') != null )
-                                        {
-                                                $(div).dialog("destroy");
-                                                div.removeChild( div.firstChild );
-                                                return;
-                                        }
-                                        else
-                                        {
-                                                make_tree(div.firstChild);
-                                        }
-                                }
-                 if(typeof(shortcut) != 'undefined') shortcut.disabled = true;
-                        }
-                });
-        }
-        
         
         function make_tree()
@@ -187 +120 @@
                 FOLDER = arguments[0];
         }
-        
-        foldersExpresso.prototype.load          = load;
+
         foldersExpresso.prototype.getFolder     = getFolder;
         foldersExpresso.prototype.setFolder     = setFolder;

trunk/expressoMail1_2/js/abas.js

@@ -146 +146 @@
             document.getElementById('to_'+ID).focus(); 
         }
+        if (ID == 0){ 
+                updateSelectedMsgs();
+        }
         RichTextEditor.setEditable(ID);
         resizeWindow();
@@ -153 +156 @@
 function create_border(borderTitle, id_value, search)
 {
-                        
         borderTitle = ( ( borderTitle && borderTitle.constructor == String && borderTitle.length > 0 ) ? borderTitle : ' ' );
     borderTitle = html_entities(borderTitle);    

trunk/expressoMail1_2/js/common_functions.js

@@ -628 +628 @@
 }
 
-function folderbox()
-{
-        connector.loadScript("TreeS");
-
-        if( typeof(window.ttree) == 'undefined')
-                setTimeout(function(){ folderbox(); }, 200 );
-        else
-                ttree.load();
-}
-
 function filterbox(){
         connector.loadScript("filter");
@@ -685 +675 @@
                 closeOnEscape:true,
                 close:function(event, ui) {
-                        select_all_search_messages(false, 'content_id_'+currentTab);
+                        //select_all_search_messages(false, 'content_id_'+currentTab);
                         event.stopPropagation();
             if(typeof(shortcut) != 'undefined') shortcut.disabled = false;
@@ -743 +733 @@
                 closeOnEscape:true,
                 close:function(event, ui) {
-                        select_all_search_messages(false, 'content_id_'+currentTab);
+                        //select_all_search_messages(false, 'content_id_'+currentTab);
                         event.stopPropagation();
             if(typeof(shortcut) != 'undefined') shortcut.disabled = false; 
@@ -1130 +1120 @@
         var main_list = main.childNodes;
         var len_main_list = main_list.length;
-
+        var folder = $('#content_folders .folder.selected').attr('title');
+        folder = folder ? folder : get_lang('INBOX');
+        folder = folder.length > 70 ? '"'+folder.substr(0,70) + "..." +'"': '"'+folder+'"' ;
+        var filterFlag = search_box_type != "ALL" ? '"'+get_lang(search_box_type) + "s" +'"': "";
+        var div = $('.select-all-messages');    
         if (select)
         {
@@ -1139 +1133 @@
                         if(!$("#"+main_list[i].id).hasClass("selected_shortcut_msg")){
                                 //add_className(Element(main_list[i].id), 'selected_msg selected_shortcut_msg current_selected');
-                                add_className(Element(main_list[i].id), 'selected_msg selected_shortcut_msg');
+                                add_className(Element(main_list[i].id), 'selected_msg');
                         } else {
                                 $("#"+main_list[i].id).addClass("selected_msg");
-                                $("#"+main_list[i].id).addClass("selected_shortcut_msg");
-                                $("#"+main_list[i].id).addClass("current_selected");            
-                        }
+                                //$("#"+main_list[i].id).addClass("selected_shortcut_msg");
+                                //$("#"+main_list[i].id).addClass("current_selected");          
+                        }                       
+                        selectedPagingMsgs[main_list[i].id] = true;
+                }               
+                if (totalSelected() == totalFolderMsgs && totalSelected() > 0){
+                        allMsgsSelected = true;
+                                if (total_pages > 1){
+                                        var link = "<a class='select-link' href='#'>Limpar seleção?</a>";
+                                        var info = "Todas as <b>"+totalFolderMsgs+"</b> mensagens "+filterFlag+" em "+folder+" foram selecionadas. "+link;
+                                        div.html("<span>"+info+"<span>");
+                                        div.show();
+                                        $('.select-link').bind('click',function(){
+                                                selectAllFolderMsgs();
+                                                //$('.select-link').unbind('click');
+                                        });
+                                }                       
+                }
+                else if (!allMsgsSelected && total_pages > 1){
+                        var link = "<a class='select-link' href='#'>Selecionar todas as <b>"+totalFolderMsgs+"</b> mensagens "+filterFlag+" em "+folder+"?</a>";
+                        var info = "Todas as <b>"+$('#table_box tr').length+"</b> mensagens desta página foram selecionadas. "+link;
+                        div.html("<span>"+info+"<span>");
+                        div.show();
+                        $('.select-link').bind('click',function(){
+                                selectAllFolderMsgs(true);
+                                //$('.select-link').unbind('click');
+                        });                                     
                 }
         }
@@ -1155 +1173 @@
                         $("#"+main_list[i].id).removeClass("selected_msg");
                         $("#"+main_list[i].id).removeClass("current_selected");
-                }
-        }
-        
+                        selectedPagingMsgs[main_list[i].id] = false;
+                }
+                if (allMsgsSelected){
+                        allMsgsSelected = false;
+                        updateSelectedMsgs();
+                }
+                else if (totalSelected() > 0 && total_pages > 1){
+                        var link = "<a class='select-link' href='#'>Limpar seleção?</a>";
+                        var info = "Foram selecionadas <b>"+totalSelected()+"</b> mensagens "+filterFlag+" em "+folder+". "+link;
+                        div.html("<span>"+info+"<span>");
+                        div.show();
+                        $('.select-link').bind('click',function(){
+                                selectAllFolderMsgs(false);
+                                //$('.select-link').unbind('click');
+                        });                     
+                }
+                else div.hide();
+                
+        }
+        resizeWindow();
 }
 

trunk/expressoMail1_2/js/doiMenuData.js

@@ -97 +97 @@
 
 /**
- *      Carrega o menu de opção de uma mensagem
+ *      Carrega o menu de opção de uma mensagem
  */
 function loadMenu(){
@@ -140 +140 @@
                 "i02": {"name": get_lang("Search"), "icon": "search-mail", callback: function(key, opt){ search_emails(""); }},
                 "103": {"name": get_lang("Edit filters"), "icon": "filter", callback: filterbox2 },
-                "i04": {"name": get_lang("Edit folders"), "icon": "edit-folder", callback: folderbox },
                 "i05": {"name": get_lang("Share mailbox"), "icon": "share-mailbox", callback: sharebox },
                 "i06": {"name": get_lang("Labels"), "icon": "tag", callback: configureLabels }, 
@@ -153 +152 @@
 } else {
         var menuToolsItems = {
-                "i01": {"name": get_lang("Search"), "icon": "search-mail", callback: function(key, opt){ search_emails(""); }},
-                "i02": {"name": get_lang("Edit folders"), "icon": "edit-folder", callback: folderbox }
+                "i01": {"name": get_lang("Search"), "icon": "search-mail", callback: function(key, opt){ search_emails(""); }}
         }
 }
@@ -210 +208 @@
 function updateLabelsColumn(messageInfo) {
         var msg_number = messageInfo.msg_number;
-        //uid é o numero da mensagem quando os dados são carregados na busca rapida.
+        //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;
@@ -268 +266 @@
             .appendTo(this);
                 $(this).find('span.removeLabeled').click(function(){
-                        //TODO Mudar quando API abstrair atualizações no cache
+                        //TODO Mudar quando API abstrair atualizações no cache
                         DataLayer.remove('labeled', false);
                         DataLayer.get('labeled');

trunk/expressoMail1_2/js/draw_api.js

@@ -12 +12 @@
 canMakeBox = true;
 fastSearch = false;
+selectedPagingMsgs = {};
+allMsgsSelected = false;
+totalFolderMsgs = 0;
+var jqXHR = new Array();
+var idattachbycontent = 0;
 
 onceOpenedHeadersMessages = {};
@@ -514 +519 @@
         if (openTab.imapBox[0] != folder)
         {
+                selectAllFolderMsgs(false);
                 current_folder = folder;
                 var handler_draw_box = function(data)
                 {
+
                         if(!verify_session(data))
                                 return;
@@ -531 +538 @@
                         return true;
                 }
+                $.ajax({                        
+                        url: "controller.php?" + $.param( {action: "$this.imap_functions.get_range_msgs3", 
+                                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);
         }
@@ -896 +933 @@
         var _mouse_out;
         var _cell;
-        var colGroupMain = document.getElementById("colgroup_main_"+numBox);
-        var colGroupHead = document.getElementById("colgroup_head_"+numBox);
         for (var r=0;r<trM.length;r++) {
                 for (var c=0;c<trM[r].cells.length;c++) {
@@ -904 +939 @@
                         if (is_mozilla && !is_webkit) {
                                 if (!emptyBody) {
-                                        colGroupMain.childNodes[c].setAttribute("width",colSizes[tbl][c]);
+                                        document.getElementById("colgroup_main_"+numBox).childNodes[c].setAttribute("width",colSizes[tbl][c]);
                                 }
-                                colGroupHead.childNodes[c].setAttribute("width",colSizes[tbl][c]);
+                                document.getElementById("colgroup_head_"+numBox).childNodes[c].setAttribute("width",colSizes[tbl][c]);
                                 if (tbH.rows[0].cells[c].className=="th_resizable") {
                                         // lots of stupid fixes for FF to redraw cell content
@@ -921 +956 @@
                                 }
                         }
-                        /*
                         else {
                                 tbH.rows[0].cells[c].setAttribute("width",_cell.offsetWidth);
-                        }*/
+                        }
                 }
         }
@@ -1043 +1077 @@
 }
 
+
+/*Cria a div que permite a seleção de todas as mensagens*/
+function drawSelectMsgsTable(){
+        var div = $('<div>');   
+        div.attr('class','select-all-messages'); 
+        $('#content_id_'+currentTab).first().prepend(div);
+        div.css('display','none');
+}
+
+function totalSelected(){
+        var total = 0;
+        for(var obj in selectedPagingMsgs)
+                if (selectedPagingMsgs[obj] == true)
+                        total++;
+        return total;
+};
+
+/*Atualiza o array de mensagens selecionadas*/
+function updateSelectedMsgs(selected,msg_number){       
+        var folder = $('#content_folders .folder.selected').attr('title');
+        folder = folder ? folder : get_lang('INBOX');
+        folder = folder.length > 70 ? '"'+folder.substr(0,70) + "..." +'"': '"'+folder+'"' ;
+        var div = $('.select-all-messages');
+        var filterFlag = search_box_type != "ALL" ? '"' + get_lang(search_box_type) + "s" + '"': "";
+        /*Seleciona as mensagens ao navegar pelas páginas*/
+        if (allMsgsSelected && msg_number == undefined){
+                $('.checkbox').each(function(){
+                        $(this).attr('checked', true);
+                        $(this).parent().parent().addClass('selected_msg');
+                });
+        }
+        else if (msg_number == undefined){      
+                for(var obj in selectedPagingMsgs){
+                        if (selectedPagingMsgs[obj] == true){
+                                $('#check_box_message_'+obj).attr('checked', true);
+                                $('#check_box_message_'+obj).parent().parent().addClass('selected_msg');
+                        }
+                }
+        }
+        if (selected && msg_number != undefined){
+                selectedPagingMsgs[msg_number] = true;
+                $(this).parent().parent().addClass('selected_msg');             
+        }
+        else if(!selected && msg_number != undefined){
+                selectedPagingMsgs[msg_number] = false;
+                $(this).parent().parent().removeClass('selected_msg');
+                allMsgsSelected = false;
+                $('#chk_box_select_all_messages').attr('checked',false);
+        }
+        var tSelected = totalSelected();
+        /*Todas as mensagens selecionadas uma a uma*/
+        if (tSelected > 0 && tSelected == totalFolderMsgs){
+                allMsgsSelected = true;
+                $('#chk_box_select_all_messages').attr('checked',true);
+                if (total_pages > 1){
+                        var link = "<a class='select-link' href='#'>Limpar seleção?</a>";
+                        var info = "Todas as <b>"+totalFolderMsgs+"</b> mensagens "+filterFlag+" em "+folder+" foram selecionadas. "+link;
+                        div.html("<span>"+info+"<span>");
+                        div.show();
+                        $('.select-link').bind('click',function(){selectAllFolderMsgs();$('.select-link').unbind('click');});
+                }
+        }
+        /*Se foram selecionadas algumas mensagens*/
+        else if (tSelected > 0 && !allMsgsSelected && total_pages > 1){
+                $('#chk_box_select_all_messages').attr('checked',false);
+                var link = "<a class='select-link' href='#'>Limpar seleção?</a>";
+                if (tSelected == 1){
+                        var info = "Foi selecionada <b>"+tSelected+"</b> mensagem "+filterFlag+" em "+folder+". "+link;
+                }
+                else{
+                        var info = "Foram selecionadas <b>"+tSelected+"</b> mensagens "+filterFlag+" em "+folder+". "+link;
+                }
+                div.html("<span>"+info+"<span>");
+                div.show();
+                $('.select-link').bind('click',function(){
+            selectAllFolderMsgs();
+            $('.select-link').unbind('click');
+        });             
+        }
+        else if (allMsgsSelected && total_pages > 1){
+                var link = "<a class='select-link' href='#'>Limpar seleção?</a>";
+                var info = "Todas as <b>"+totalFolderMsgs+"</b> mensagens "+filterFlag+" em "+folder+" foram selecionadas. "+link;
+                div.html("<span>"+info+"<span>");
+                div.show();
+                $('.select-link').bind('click',function(){
+            selectAllFolderMsgs();
+            $('.select-link').unbind('click');
+        });
+        }
+        else{
+                div.hide();
+        } 
+    resizeWindow();
+}
+
+/*Seleciona ou desseleciona todas as mensagens da pasta*/
+function selectAllFolderMsgs(select){
+        var folder = $('#content_folders .folder.selected').attr('title');
+        folder = folder ? folder : get_lang('INBOX');
+        folder = folder.length > 70 ? '"'+folder.substr(0,70) + "..." +'"': '"'+folder+'"' ;
+        var filterFlag = search_box_type != "ALL" ? get_lang(search_box_type) + "s": "";
+        var div = $('.select-all-messages');
+        if (select){
+                allMsgsSelected = true;
+                var link = "<a class='select-link' href='#'>Limpar seleção?</a>";
+                var info = "Todas as <b>"+totalFolderMsgs+"</b> mensagens "+filterFlag+" em "+folder+" foram selecionadas. "+link;
+                div.html("<span>"+info+"<span>");
+                div.show();
+                $('.select-link').bind('click',function(){
+            selectAllFolderMsgs();
+            $('.select-link').unbind('click');
+        });
+                for(var obj in selectedPagingMsgs){
+                        selectedPagingMsgs[obj] = true;
+                }
+        
+        }else{
+                allMsgsSelected = false;
+                for(var obj in selectedPagingMsgs){
+            $("#content_id_0").find('input[type="checkbox"]').removeAttr("checked");
+                        selectedPagingMsgs[obj] = false;
+                        $('#check_box_message_'+obj).parent().parent().removeClass('selected_msg selected_shortcut_msg');               
+                }
+                div.hide();
+        }
+    resizeWindow();
+}
+
+/*Carrega o array de mensagens da pasta*/
+function populateSelectedMsgs(data){
+        this.selectedPagingMsgs = {};
+        this.totalFolderMsgs = 0;
+        var total = 0;
+        $.each(data, function(index, value){
+                if(value != undefined){
+                        selectedPagingMsgs[value] = false;
+                        total++;
+                }
+        });
+        delete selectedPagingMsgs[undefined];
+        allMsgsSelected = false;
+        this.totalFolderMsgs = total;
+}
+
 // Draw the inbox and another folders
 function draw_box(headers_msgs, msg_folder, alternate){
@@ -1124 +1302 @@
                 chk_box_element.className = "checkbox";
                 chk_box_element.onclick = function(){select_all_messages(this.checked);};
-                chk_box_element.onmouseover = function () {this.title=get_lang('Select all messages from this page.')};
+                chk_box_element.onmouseover = function () {this.title=get_lang('Select all messages from this page.'); };
                 chk_box_element.onkeydown = function (e){
                         if (is_ie)
@@ -1279 +1457 @@
         _divScroll.appendChild(table_element);
         openTab.content_id[numBox].appendChild(_divScroll);
-
+        
         var f_unseen = 0;
 
         document.getElementById("table_message_header_box_"+numBox).emptyBody = false;
-
+        
         if (headers_msgs.num_msgs == 0)
                 showEmptyBoxMsg(tbody_element);
@@ -1344 +1522 @@
                                 //helper: 'clone',
                                 helper: function(event){
-                                        $(this).find("input:checkbox").attr("checked", true);
+                                        $(this).addClass("selected_msg").find("input:checkbox").attr("checked", true);
+                                        updateSelectedMsgs($(this).find("input:checkbox").is(':checked'),$(this).attr("id"));
                                         if ( $("#tbody_box .selected_shortcut_msg").length > 1) {
-                                                $("#tbody_box .selected_shortcut_msg").find('.checkbox').attr('checked',true);
+                                                $("#tbody_box .selected_shortcut_msg").addClass("selected_msg").find('.checkbox').attr('checked',true);
+                                                $.each( $(".selected_shortcut_msg"), function(index, value){
+                                        updateSelectedMsgs($(value).find(":checkbox").is(':checked'),$(value).attr("id"));
+                                        });
                                         }
-                                        if($("#table_box").find("tr input:checked").length > 1 )
-                                                return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($("#table_box").find("tr input:checked")).length+" mensagens selecionadas"), type: "messages"})+"</td></tr>");                           
+                                        
+                                        if(totalSelected() > 1 )
+                                                return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (totalSelected()+" mensagens selecionadas"), type: "messages"})+"</td></tr>");                             
                                         if(     $(this).find(".td_msg_subject").text().length > 18 )
                                                 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text().substring(0,18) + "...", type: "messages"})+"</td></tr>");
@@ -1361 +1544 @@
                                 containment: "#divAppbox"
                         }).bind('contextmenu',function(event){
-                                        if (!(($(event.target).find('img').length > 0) && ($(event.target).hasClass('td-label')))){
-                                                if($(this).find("input:checkbox").attr("checked") != "checked"){
-                                                        $(this).find("input:checkbox").trigger('click');
-                                                        $(this).addClass("selected_msg");
-                                                }
+                                if (!(($(event.target).find('img').length > 0) && ($(event.target).hasClass('td-label')))){
+                                        if($(this).find("input:checkbox").attr("checked") != "checked"){
+                                                $(this).find("input:checkbox").trigger('click');
+                                                $(this).addClass("selected_msg");
                                         }
+                                        updateSelectedMsgs($(this).find("input:checkbox").is(':checked'),$(this).attr("id"));
+                                }
                         });
         }
@@ -1373 +1557 @@
                 select_msg(headers_msgs[0].msg_number, 'null', true);
                 
-
+        
         var tdFolders  =  Element("folderscol");
         tdFolders.style.display = preferences.hide_folders == '1'  ? "none" : "";
@@ -1418 +1602 @@
                 Element('msg_number').value = '';
         }
-        var scripts = new Array("InfoContact",
-                                                        "TreeShow");
-        connector.loadAllScripts(scripts);
+        connector.loadScript("InfoContact");
         // Loading Quota View Folder Component (if exists...)
         if(Element("table_quota"))
@@ -1434 +1616 @@
                 document.getElementById("exmail_main_body").appendChild(ruler_element);
     }
-                                
+                drawSelectMsgsTable();
+                updateSelectedMsgs();
+        resizeWindow();
 }
 
@@ -1510 +1694 @@
                 
                 $(chk_box_element).click(function(e){
-                                changeBgColor(e,headers_msgs.msg_number);
+                        updateSelectedMsgs($(this).is(':checked'),headers_msgs.msg_number);
+                        $(".selected_shortcut_msg").removeClass("current_selected_shortcut_msg selected_shortcut_msg");
+                        $(".current_selected_shortcut_msg").removeClass("current_selected_shortcut_msg selected_shortcut_msg");
+                        if(preferences.use_shortcuts == '1')
+                                $(this).parents("tr:first").addClass("current_selected_shortcut_msg selected_shortcut_msg");
+                        changeBgColor(e,headers_msgs.msg_number);
+                        $(this).blur();
                 });
 
@@ -1896 +2086 @@
 
 function sort_box(search, sort){
+        selectAllFolderMsgs(false);
         if (cellResized)
                 return;
@@ -1921 +2112 @@
         sort_box_type = sort;
         search_box_type = search;
-
+                $.ajax({                        
+                        url: "controller.php?" + $.param( {action: "$this.imap_functions.get_range_msgs3", 
+                                folder: get_current_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,search,sort_box_reverse,preferences.preview_msg_subject,preferences.preview_msg_tip,handler_draw_box);
         current_page = 1;
@@ -4403 +4623 @@
         var maxAttachmentSize = (preferences.max_attachment_size !== "" && preferences.max_attachment_size != 0) ? (parseInt(preferences.max_attachment_size.replace('M', '')) * 1048576 ) : false;
         
+        content.find(".new-msg-head-data").scroll(function(){
+                $.each(fileUploadMSG.find(".attachments-list .att-box"), function(index, value){
+                        $(this).qtip("api").updatePosition();
+                        $(this).qtip("api").updateWidth();
+                });
+        });
+        $("#fileupload_msg"+ID+"_droopzone").click(function(){
+                $(this).removeClass('in hover');
+        $(this).hide();
+        $(this).prev().show();
+        });
         fileUploadMSG.find(".button").button().filter(".fileinput-button").find(".ui-button-text").css("margin-top", "2px").find("input:file").fileupload({
-                //singleFileUploads : true,
+                //singleFileUploads : true,fileUploadMSG
                 sequentialUploads: true, 
                 type: 'post',
@@ -4410 +4641 @@
                 url: "../prototype/post.php",
                 forceIframeTransport: false,
-                dropZone : fileUploadMSG,
+                dropZone : $("#fileupload_msg"+ID+"_droopzone"),
                 formData: function(form) {
                         return [
@@ -4428 +4659 @@
                 },      
                 add: function (e, data) {
+            var iterator = idattachbycontent;
                         if(!maxAttachmentSize || data.files[0].size < maxAttachmentSize || is_ie) {
                                 setTimeout(function() {
                     $('#attDisposition'+ID).val('attachment');
-                                        data.submit();
-                                }, 3000);
-                        }
+                                        jqXHR[iterator] = data.submit();
+                                }, 100);
+                        }
+                        fileUploadMSG.find(' .attachments-list').show();
                         $.each(data.files, function (index, file) {
                                 var attach = {};
                                 attach.fullFileName = file.name;
                                 attach.fileName = file.name;
-                                if(file.name.length > 50)
-                                        attach.fileName = file.name.substr(0, 32) + " ... " + file.name.substr(file.name.length-9, file.name.length);
+                                if(file.name.length > 20)
+                                        attach.fileName = file.name.substr(0, 17) + " ... " + file.name.substr(file.name.length-6, file.name.length);
                                 attach.fileSize = formatBytes(file.size);
                                 if(maxAttachmentSize && file.size > maxAttachmentSize)
-                                        attach.error = 'Tamanho de arquivo nao permitido!!'
-                                
-                                var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));                           
-                                upload.find('.button.close').button({
-                                        icons: {
-                                                primary: "ui-icon-close"
-                                        },
-                                        text: false
-                                }).click(function(){
+                                        attach.error = 'Tamanho de arquivo nao permitido'
+                                else
+                                        attach.error = true;
+                                var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));                           
+                                upload.find('.att-box-delete').click(function(){
                                         var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
                                         fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]').remove();
-                                        delAttachment(ID, idAttach)
+                    delAttachment(ID, idAttach);
+                    $(this).parent().qtip("destroy");
                                         $(this).parent().remove();
+                                        if(!fileUploadMSG.find(' .attachments-list').find(".att-box").length){
+                                                fileUploadMSG.find(' .attachments-list').hide();
+                                        }
+                    if(jqXHR){
+                        jqXHR[iterator].abort();
+                    }
                                 });
-                                
-                                fileUploadMSG.find('.attachments-list').append(upload);
+                   
+                fileUploadMSG.find('.attachments-list').append(upload);
+
+                fileUploadMSG.find('.attachments-list .att-box:last').qtip({
+                        content: DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs", {attach : attach}),
+                                        position: {
+                                                corner: {
+                                                        tooltip: 'bottomMiddle',
+                                                        target: 'topMiddle'
+                                                },
+                                                adjust: {
+                                       resize: true,
+                                       scroll: true,
+                                       screen: true
+                                    }
+                                        },
+                                        show: {
+                                                when: 'mouseover', // Don't specify a show event
+                                                ready: false // Show the tooltip when ready
+                                        },
+                                        hide: 'mouseout', // Don't specify a hide event
+                                        style: {
+                                                border: {
+                                                        width: 1,
+                                                        radius: 5
+                                                },
+                                                width: {
+                                                         min: 75,
+                                                         max : 1000
+                                                },
+                                                padding: 3, 
+                                                textAlign: 'left',
+                                                tip: true, // Give it a speech bubble tip with automatic corner detection
+                                                name: (typeof(attach.error) == 'boolean' ? 'light' : 'red') // Style it according to the preset 'cream' style
+                                        }
+                })/*.progressbar({
+                    value : 1
+                })*/;
+
+                fileUploadMSG.find('.attachments-list .att-box:last').css('width', fileUploadMSG.find('.attachments-list .att-box:last div:first').css('width'));
 
                                 if(!maxAttachmentSize || file.size < maxAttachmentSize){
@@ -4466 +4740 @@
                                 }else
                                         fileUploadMSG.find(' .fileinput-button.new').removeClass('new');
+
+                                idattachbycontent++
                         });
+                        
                 },
                 done: function(e, data){
+            var attach_box = fileUploadMSG.find('.att-box-loading:first').parents('.att-box');
+            var attach = {
+                fullFileName : attach_box.find(".att-box-fullfilename").text(),
+                fileSize : attach_box.find(".att-box-filesize").text(),
+                error : false
+            };
                         if(!!data.result && data.result != "[]" ){
                                 var newAttach = data.result;                             
-                                if(!newAttach.mailAttachment.error){
-                                        if(newAttach.rollback !== false)
-                                        {
-                                                fileUploadMSG.find('.in-progress:first').parents('p').append('<input type="hidden" name="fileId[]" value="'+newAttach['mailAttachment'][0][0].id+'"/>').find('.status-upload').addClass('ui-icon ui-icon-check');
-                                                addAttachment(ID,newAttach['mailAttachment'][0][0].id);
-                                        }
-                                        else                             
-                                                fileUploadMSG.find('.in-progress:first').parents('p').find('.status-upload').append('Erro ao fazer upload!').addClass('message-attach-error');   
-                                }else{
-                                        fileUploadMSG.find('.in-progress:first').parents('p').find('.status-upload').append(newAttach.mailAttachment.error).addClass('message-attach-error');   
-                                }
-                                
+                                if(!newAttach.mailAttachment.error || newAttach.rollback !== false){
+                                        attach_box.append('<input type="hidden" name="fileId[]" value="'+newAttach['mailAttachment'][0][0].id+'"/>');
+                                        addAttachment(ID,newAttach['mailAttachment'][0][0].id);
+                }else {
+                                    attach_box.addClass('invalid-email-box');
+                    attach.error = newAttach.mailAttachment.error ? newAttach.mailAttachment.error : 'Erro ao anexar...';//.append(newAttach.mailAttachment.error).addClass('message-attach-error');   
+                }
                         }else {
-                                fileUploadMSG.find(' .progress.on-complete:first').parents('p').find('.status-upload').append('Erro ao fazer upload!').addClass('message-attach-error');
-                        }
-            fileUploadMSG.find(' .in-progress:first').remove();
-                }
+                                attach_box.addClass('invalid-email-box');//.qtip("api").updateContent("oi", true);
+                attach.error = 'Erro ao anexar...';
+                        }
+            attach_box.qtip("destroy").qtip({
+                content: DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs", {attach : attach}),
+                position: {
+                    corner: {
+                        tooltip: 'bottomMiddle',
+                        target: 'topMiddle'
+                    },
+                    adjust: {
+                       resize: true,
+                       scroll: true,
+                       screen: true
+                    }
+                },
+                show: {
+                    when: 'mouseover', // Don't specify a show event
+                    ready: false // Show the tooltip when ready
+                },
+                hide: 'mouseout', // Don't specify a hide event
+                style: {
+                    border: {
+                        width: 1,
+                        radius: 5
+                    },
+                    width: {
+                                                 min: 75,
+                                                 max : 1000
+                                        },
+                    padding: 3, 
+                    textAlign: 'left',
+                    tip: true, // Give it a speech bubble tip with automatic corner detection
+                    name: (attach.error == false ? 'blue' : 'red')// Style it according to the preset 'cream' style
+                }
+            });/*
+            fileUploadMSG.find(".att-box-loading:first").parents(".att-box").removeAttr("style").progressbar("destroy").find("div:first").removeAttr("style");
+            */
+            fileUploadMSG.find('.att-box-loading:first').remove();
+                }/*,
+        progress : function(e, data){
+            var progress = parseInt(data.loaded / data.total * 100, 10);
+            fileUploadMSG.find('.att-box-loading:first').parents(".att-box:first").progressbar({
+                value : progress
+            });
+        }*/
         }).css({
                 "height" : "20px", 
@@ -4513 +4833 @@
             },
                         autoOpen:false
+        });
+        jQuery.getScript("../prototype/modules/attach_message/attach_message.js", function(){
+                jQuery('#message-attach-dialog').dialog('open');
+                jQuery('#message-attach-attach-btn').unbind('click');
+                jQuery('#message-attach-attach-btn').click(function(event){
+                        jQuery.each(selectedMessages, function(folder_name, messages) {
+                                jQuery.each(selectedMessages[folder_name], function(message_number, message) { 
+                                        if (message) {
+                                                fileUploadMSG.find(' .attachments-list').show();        
+                                                var att = new Object();
+                                                att.folder = folder_name;
+                                                att.uid = message_number;
+                                                att.type = 'imapMSG';
+                                                att.name = Base64.encode(onceOpenedMessages[folder_name][message_number].subject + '.eml');
+                                                var idATT = JSON.stringify(att);
+                                                addAttachment( ID , idATT);                        
+                                                var attach = {};
+                                                attach.fileName = onceOpenedMessages[folder_name][message_number].subject + '.eml';
+                                                attach.fullFileName = onceOpenedMessages[folder_name][message_number].subject + '.eml';
+                                                if(attach.fileName.length > 20)
+                                                        attach.fileName = attach.fileName.substr(0, 17) + "... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length);
+
+                                                attach.error = false;
+                        attach.OK = true;
+                                                attach.fileSize = formatBytes(onceOpenedMessages[folder_name][message_number].size);
+                                                var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));
+                                                upload.find('.att-box-loading').remove();
+                                                upload.append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>');
+                                                
+                                                upload.find('.att-box-delete').click(function(){
+                                                        var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
+                                                        fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]').remove();
+                                                        delAttachment(ID,idAttach); 
+                                                        $(this).parent().qtip("destroy");
+                                                        $(this).parent().remove();
+                                                        if(!fileUploadMSG.find(' .attachments-list').find(".att-box").length){
+                                                                fileUploadMSG.find(' .attachments-list').hide();
+                                                        }
+                                                });     
+                                                        
+                                                fileUploadMSG.find('.attachments-list').append(upload);
+
+                                                upload.find('.att-box-loading').remove();
+
+                                                fileUploadMSG.find('.attachments-list .att-box:last').qtip({
+                                        content: DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs", {attach : attach}),
+                                                        position: {
+                                                                corner: {
+                                                                        tooltip: 'bottomMiddle',
+                                                                        target: 'topMiddle'
+                                                                },
+                                                                adjust: {
+                                                       resize: true,
+                                                       scroll: true
+                                                    }
+                                                        },
+                                                        show: {
+                                                                when: 'mouseover', // Don't specify a show event
+                                                                ready: false // Show the tooltip when ready
+                                                        },
+                                                        hide: 'mouseout', // Don't specify a hide event
+                                                        style: {
+                                                                border: {
+                                                                        width: 1,
+                                                                        radius: 5
+                                                                },
+                                                                width: {
+                                                                         min: 75,
+                                                                         max : 1000
+                                                                },
+                                                                padding: 5, 
+                                                                textAlign: 'center',
+                                                                tip: true, // Give it a speech bubble tip with automatic corner detection
+                                                                name: 'blue' // Style it according to the preset 'cream' style
+                                                        }
+                                });
+                                        }
+                                });
+                        });
+                        jQuery('#message-attach-dialog').dialog('close');
                 });
-                
-                
-                jQuery.getScript("../prototype/modules/attach_message/attach_message.js", function(){
-                        jQuery('#message-attach-dialog').dialog('open');
-                        jQuery('#message-attach-attach-btn').unbind('click');
-                        jQuery('#message-attach-attach-btn').click(function(event){
-                                jQuery.each(selectedMessages, function(folder_name, messages) {
-                                        jQuery.each(selectedMessages[folder_name], function(message_number, message) { 
-                                                if (message) {
-                                                        var att = new Object();
-                                                        att.folder = folder_name;
-                                                        att.uid = message_number;
-                                                        att.type = 'imapMSG';
-                                                        att.name = Base64.encode(onceOpenedMessages[folder_name][message_number].subject + '.eml');
-                                                        var idATT = JSON.stringify(att);
-                                                        addAttachment( ID , idATT);                        
-                                                        var attach = {};
-                                                        attach.fileName = onceOpenedMessages[folder_name][message_number].subject + '.eml';
-                                                        if(attach.fileName.length > 45)
-                                                                        attach.fileName = attach.fileName.substr(0, 32) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length);
-
-                                                        attach.fileSize = formatBytes(onceOpenedMessages[folder_name][message_number].size);
-                                                        var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));
-                                                        upload.find('.status-upload').addClass('ui-icon ui-icon-check');
-                                                        upload.find('.in-progress').remove(); 
-                                                        upload.append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>');
-                                                        
-                                                        upload.find('.button.close').button({
-                                                                icons: {
-                                                                                                primary: "ui-icon-close"
-                                                                                },
-                                                                                text: false
-                                                                }).click(function(){
-                                                                                var idAttach = $(this).parents("li:first").find('input[name="fileId[]"]').val();
-                                                                                fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]');
-                                                                                delAttachment(ID,idAttach); 
-                                                                                $(this).parent().remove();
-                                                        });     
-                                                        
-                                                        fileUploadMSG.find('.attachments-list').append(upload);   
-                                                }
-                                        });
+                jQuery('#message-attach-cancel-btn').click(function(event){
+                        jQuery('#message-attach-dialog').dialog('close');
+                });                     
+        });
+        });
+        $(document).bind('drop dragover', function (e) {
+            e.preventDefault();
+        });
+        //DRAG and DROP DE ARQUIVOS NÃO FUNCIONA NO IE
+        if(!is_ie){
+                $("body").bind('dragenter', function (e) {
+                    var dropZone = $("#fileupload_msg"+ID+"_droopzone");
+                var timeout = window.dropZoneTimeout;
+                        dropZone.show();
+                        dropZone.prev().hide();
+                    if (!timeout) {
+                        dropZone.addClass('in');
+                    } else {
+                        clearTimeout(timeout);
+                    }
+                    if (e.target === dropZone[0]) {
+                        dropZone.addClass('hover');
+                    } else {
+                        dropZone.removeClass('hover');
+                    }
+                    $(window).unbind('dragleave');
+                    window.dropZoneTimeout = setTimeout(function () {
+                        $(window).bind('dragleave', function (e) {
+                                        window.dropZoneTimeout = null;
+                                dropZone.removeClass('in hover');
+                                dropZone.hide();
+                                dropZone.prev().show();
                                 });
-                                
-                                jQuery('#message-attach-dialog').dialog('close');
-                                
-                        });
-                        jQuery('#message-attach-cancel-btn').click(function(event){
-                                jQuery('#message-attach-dialog').dialog('close');
-                        });                     
+                    }, 1);
+                }).bind('dragleave', function (e) {
+                        var dropZone = $("#fileupload_msg"+ID+"_droopzone");
+                        window.dropZoneTimeout = setTimeout(function () {
+                        $(window).bind('dragleave', function (e) {
+                                        window.dropZoneTimeout = null;
+                                dropZone.removeClass('in hover');
+                                dropZone.hide();
+                                dropZone.prev().show();
+                                });
+                    }, 1);
+                }).bind('drop', function(e){
+                        var dropZone = $("#fileupload_msg"+ID+"_droopzone");
+                        window.dropZoneTimeout = null;
+                dropZone.removeClass('in hover');
+                dropZone.hide();
+                dropZone.prev().show();
                 });
-        });
+        }       
         return ID;
 }
@@ -4672 +5072 @@
                 add_className(all_messages[begin], 'selected_msg');
                 Element(_tab_prefix + "check_box_message_" + _msg_id).checked = true;
+                updateSelectedMsgs(true,_msg_id);
         }
 }

trunk/expressoMail1_2/js/mail_sync.js

@@ -49 +49 @@
         
         mail_sync.prototype.start_sync = function() {
-                if (is_ie)
-                                connector.loadScript('TreeShow');
                 if(this.working) {
                         //Já está sincronizando...
@@ -145 +143 @@
                         if((!preferences.hide_folders) || (preferences.hide_folders=="0")) {
                                 if (expresso_mail_sync.update_folder) {
-                                        ttreeBox.update_folder();
+                                        //ttreeBox.update_folder();
                                         expresso_mail_sync.update_folder = false;
                                 }

trunk/expressoMail1_2/js/main.js

@@ -20 +20 @@
         } 
 }
-        
-
         
 function mount_url_folder(folders){
@@ -102 +100 @@
                 if (preferences.use_local_messages==1) { //O I.E 7 estava se atrapalhando caso esses loads fossem feitos após as chamadas ajax. Antes não apresentou problemas...
                         connector.loadScript('mail_sync');
-                        if (is_ie)
-                                connector.loadScript('TreeShow');
                         setTimeout('auto_archiving()', 30000);
                         
                 }
+                /*Carrega a lista de mensagens*/
+                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);
@@ -639 +640 @@
                                 if (!existent)
                                 {
+                                        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);
                                         $(new_msg).draggable({
@@ -687 +691 @@
                                                 },
                                                 helper: function(event){
-                                                                if($(this).find("input:checkbox").attr("checked") != "checked"){
-                                                                        $(this).find("input:checkbox").trigger('click');
-                                                                        $(this).addClass("selected_msg");
-                                                                }
-                                                                if($("#table_box").find("tr input:checked").length > 1)
-                                                                        return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($("#table_box").find("tr input:checked")).length+" mensagens selecionadas"), type: "messages"})+"</td></tr>");
-                                                                if(     $(this).find(".td_msg_subject").text().length > 18 )
-                                                                        return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text().substring(0,18) + "...", type: "messages"})+"</td></tr>");
-                                                                else
-                                                                        return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text(), type: "messages"})+"</td></tr>");
+                                                        $(this).addClass("selected_msg").find("input:checkbox").attr("checked", true);
+                                                        updateSelectedMsgs($(this).find("input:checkbox").is(':checked'),$(this).attr("id"));
+                                                        if ( $("#tbody_box .selected_shortcut_msg").length > 1) {
+                                                                $("#tbody_box .selected_shortcut_msg").addClass("selected_msg").find('.checkbox').attr('checked',true);
+                                                                $.each( $(".selected_shortcut_msg"), function(index, value){
+                                                        updateSelectedMsgs($(value).find(":checkbox").is(':checked'),$(value).attr("id"));
+                                                        });
+                                                        }
+                                                        if(totalSelected() > 1)
+                                                                return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (totalSelected()+" mensagens selecionadas"), type: "messages"})+"</td></tr>");
+                                                        if(     $(this).find(".td_msg_subject").text().length > 18 )
+                                                                return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text().substring(0,18) + "...", type: "messages"})+"</td></tr>");
+                                                        else
+                                                                return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text(), type: "messages"})+"</td></tr>");
                                                 },
                                                 iframeFix: true,
@@ -704 +712 @@
                                                 containment: "#divAppbox"
                                         }).bind("contextmenu", function(){
-                                                if($(this).find("input:checkbox").attr("checked") != "checked"){
-                                                        $(this).find("input:checkbox").trigger('click');
-                                                        $(this).addClass("selected_msg");
+                                                if (!(($(event.target).find('img').length > 0) && ($(event.target).hasClass('td-label')))){
+                                                        if($(this).find("input:checkbox").attr("checked") != "checked"){
+                                                                $(this).find("input:checkbox").trigger('click');
+                                                                $(this).addClass("selected_msg");
+                                                        }
+                                                        updateSelectedMsgs($(this).find("input:checkbox").is(':checked'),$(this).attr("id"));
                                                 }
                                         });
@@ -829 +840 @@
                          
                         if (!archive && (parseInt(preferences.save_deleted_msg)) && (folder != userTrashFolder)){ 
-                                move_msgs2(folder, msgs_number, border_ID, userTrashFolder,special_folders['Trash'],show_success_msg ); 
+                    if(currentTab == 0)
+                                                msgs_number = get_selected_messages();
+                            move_msgs2(folder, ""+msgs_number, border_ID, userTrashFolder,special_folders['Trash'],show_success_msg ); 
                                 return;
         }
@@ -899 +912 @@
                 refresh();
         }
-
-        if (msgs_number == 'selected')
+        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);
@@ -1064 +1077 @@
                         params += "&new_folder="+url_encode(new_folder);
                         params += "&new_folder_name="+url_encode(new_folder_name);
-                cExecute ("$this.imap_functions.move_search_messages", handler_move_search_msgs, params);
-        }
+                        cExecute ("$this.imap_functions.move_search_messages", handler_move_search_msgs, params);
+                }
         }
         else
@@ -1090 +1103 @@
                                 var move_to_folder = data.match(/^(.*)Spam(.*)$/) ? "Spam" : special_folders['Trash'];
                                 alert(get_lang('There is not %1 folder, Expresso is creating it for you... Please, repeat your request later.', folder_error));
-                                connector.loadScript('TreeShow');
                                 ttree.FOLDER = 'root';
-                                ttreeBox.new_past(move_to_folder);
+                                create_new_folder(move_to_folder,"INBOX");
                                 return false;
                         }else{
@@ -1236 +1248 @@
         } catch (e) {} 
 
-        if (msgs_number == 'selected'){
+        if(currentTab == 0)
                 msgs_number = get_selected_messages();
-                }
 
         if(openTab.type[currentTab] == 1){
@@ -1260 +1271 @@
                                 url: 'controller.php?' + $.param( {action: '$this.imap_functions.move_messages',
                                                                     folder: folder,
-                                                                    msgs_number: msgs_number,
+                                                                    msgs_number: ""+msgs_number,
                                                                     border_ID: border_ID,
                                                                     sort_box_type: sort_box_type,
@@ -1273 +1284 @@
                                 success: function( data ){
                                     data = connector.unserialize( data );
-                                    
+                                    $.each(msgs_number, function(index, value){
+                                        delete selectedPagingMsgs[value];
+                                    });
+                                    totalFolderMsgs -= totalSelected();
+
+                                    //TESTE
+                                    selectAllFolderMsgs();
+                                $('.select-link').unbind('click');
+
                                     if( data )
                                         handler_move_msgs( data );
@@ -1621 +1640 @@
 }
 
-function get_selected_messages(){
+/*function get_selected_messages(){
         var main;
         try{
@@ -1665 +1684 @@
 
                          
-                        /* Verifica se está na tela de pesquisa. */ 
+                        /* Verifica se está na tela de pesquisa. */ /*
                         if(selected_messages.indexOf("_") != -1) 
                         { 
                                 results_search_messages = selected_messages; 
-                                /* Retira a informação da aba */ 
+                                /* Retira a informação da aba */ /*
                                 selected_messages = selected_messages.substring(0,selected_messages.indexOf("_"));
         }
@@ -1685 +1704 @@
                         return selected_messages_by_shortcuts;
                 }*/
-                /*Se houver mais de uma mensagem selecionada por atalho*/
+                /*Se houver mais de uma mensagem selecionada por atalho*//*
                 if (array_selected_messages_by_shortcuts.length > 1){
                         if (selected_messages == "")
@@ -1697 +1716 @@
         else
                 return selected_messages;
+}*/
+function get_selected_messages(){
+        var selected = new Array();
+        $.each(selectedPagingMsgs, function(index, value){
+                if(value)
+                        selected.push(index);
+        });
+        return ""+selected;
 }
 
@@ -2176 +2203 @@
                                     var attach = {};
                                     attach.fileName =  attachments[i].text.substring(0, attachments[i].text.lastIndexOf('('));
-
-                                    if(attach.fileName.length > 45)
-                                        attach.fileName = attach.fileName.substr(0, 32) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length);
+                    attach.fullFileName = attach.fileName;
+                                    if(attach.fileName.length > 20)
+                                        attach.fileName = attach.fileName.substr(0, 17) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length);
 
                                     attach.fileSize =  attachments[i].text.substring(( attachments[i].text.lastIndexOf('(')+1), attachments[i].text.lastIndexOf(')'));
 
+                    attach.error = false;
+                    fileUploadMSG.find(' .attachments-list').show();
                                     var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));
-                                    upload.find('.status-upload').remove();
-                                    upload.find('.in-progress').remove(); 
                                     upload.append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>');
-                                    upload.find('.button.close').button({
-                                            icons: {
-                                                    primary: "ui-icon-close"
-                                            },
-                                            text: false
-
-                                    }).click(function(){
+                    upload.find(".att-box-loading").remove();
+                                    upload.find('.att-box-delete').click(function(){
                                             var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
                                             var content_body = RichTextEditor.getData('body_'+new_border_ID);
@@ -2208 +2230 @@
                                             fileUploadMSG.find('.attachments-list').find('input[value="'+idAttach+'"]');
                                             delAttachment(new_border_ID,idAttach); 
-                                            $(this).parent().remove();
+                                            $(this).parent().qtip("destroy");
+                        $(this).parent().remove();
+                        if(!fileUploadMSG.find(' .attachments-list').find(".att-box").length){
+                            fileUploadMSG.find(' .attachments-list').hide();
+                        }
                                     });
 
                                     fileUploadMSG.find('.attachments-list').append(upload);
+                    fileUploadMSG.find('.attachments-list .att-box:last').qtip({
+                        content: DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs", {attach : attach}),
+                        position: {
+                            corner: {
+                                tooltip: 'bottomMiddle',
+                                target: 'topMiddle'
+                            },
+                            adjust: {
+                               resize: true,
+                               scroll: true,
+                               screen: show
+                            }
+                        },
+                        show: {
+                            when: 'mouseover', // Don't specify a show event
+                            ready: false // Show the tooltip when ready
+                        },
+                        hide: 'mouseout', // Don't specify a hide event
+                        style: {
+                            border: {
+                                width: 1,
+                                radius: 5
+                            },
+                            width: {
+                                                                 min: 75,
+                                                                 max : 1000
+                                                        },
+                            padding: 3, 
+                            textAlign: 'left',
+                            tip: true, // Give it a speech bubble tip with automatic corner detection
+                            name: 'blue' // Style it according to the preset 'cream' style
+                        }
+                    });
                                 }
                                 else
@@ -2234 +2293 @@
                                     var attach = {};
                                     attach.fileName =  arrayAttachmentsA[i].text.substring(0, arrayAttachmentsA[i].text.lastIndexOf('('));
-
-                                    if(attach.fileName.length > 45)
-                                        attach.fileName = attach.fileName.substr(0, 32) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length);
+                    attach.fullFileName = attach.fileName;
+                                    if(attach.fileName.length > 20)
+                                        attach.fileName = attach.fileName.substr(0, 17) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length);
 
                                     attach.fileSize =  arrayAttachmentsA[i].text.substring(( arrayAttachmentsA[i].text.lastIndexOf('(')+1), arrayAttachmentsA[i].text.lastIndexOf(')'));
-
+                    attach.error = false;
+                    fileUploadMSG.find(' .attachments-list').show();
                                     var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));
-                                    upload.find('.status-upload').remove();
-                                    upload.find('.in-progress').remove(); 
+                                    upload.find('.att-box-loading').remove(); 
                                     upload.append('<input type="hidden" name="fileId[]" value=\''+arrayAttachments[i]+'\'/>');
-                                    upload.find('.button.close').button({
-                                            icons: {
-                                                    primary: "ui-icon-close"
-                                            },
-                                            text: false
-
-                                    }).click(function(){
-                                            var idAttach = $(this).parent().parent().find('input[name="fileId[]"]').val();
+                                    upload.find('.att-box-delete').click(function(){
+                                            var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
                                             var content_body = RichTextEditor.getData('body_'+new_border_ID);
                                             var imagens = content_body.match(/<img[^>]*>/g);
@@ -2266 +2319 @@
                                             fileUploadMSG.find('.attachments-list').find('input[value="'+idAttach+'"]');
                                             delAttachment(new_border_ID,idAttach); 
-                                            $(this).parent().remove();
+                                            $(this).parent().qtip("destroy");
+                        $(this).parent().remove();
+                        if(!fileUploadMSG.find(' .attachments-list').find(".att-box").length){
+                            fileUploadMSG.find(' .attachments-list').hide();
+                        }
                                     });
 
                                     fileUploadMSG.find('.attachments-list').append(upload);
-
+                    fileUploadMSG.find('.attachments-list .att-box:last').qtip({
+                        content: DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs", {attach : attach}),
+                        position: {
+                            corner: {
+                                tooltip: 'bottomMiddle',
+                                target: 'topMiddle'
+                            },
+                            adjust: {
+                               resize: true,
+                               scroll: true,
+                               screen: show
+                            }
+                        },
+                        show: {
+                            when: 'mouseover', // Don't specify a show event
+                            ready: false // Show the tooltip when ready
+                        },
+                        hide: 'mouseout', // Don't specify a hide event
+                        style: {
+                            border: {
+                                width: 1,
+                                radius: 5
+                            },
+                            width: {
+                                                                 min: 75,
+                                                                 max : 1000
+                                                        },
+                            padding: 3, 
+                            textAlign: 'left',
+                            tip: true, // Give it a speech bubble tip with automatic corner detection
+                            name: 'blue' // Style it according to the preset 'cream' style
+                        }
+                    });
                         }
 
@@ -2288 +2377 @@
             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(',');                                 
                 var att = new Object();
@@ -2300 +2389 @@
 
                 var attach = {};
+
                 attach.fileName =  attachments[i].text.substring(0, attachments[i].text.lastIndexOf('('));
-
-                if(attach.fileName.length > 45)
-                    attach.fileName = attach.fileName.substr(0, 32) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length);
+                attach.fullFileName = attach.fileName;
+
+                if(attach.fileName.length > 20)
+                    attach.fileName = attach.fileName.substr(0, 17) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length);
 
                 attach.fileSize =  attachments[i].text.substring(( attachments[i].text.lastIndexOf('(')+1), attachments[i].text.lastIndexOf(')'));
+                attach.error = false;
 
                 var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));
-                upload.find('.status-upload').remove();
-                upload.find('.in-progress').remove(); 
-                upload.find('.button.close').button({
-                        icons: {
-                                primary: "ui-icon-close"
+                upload.find('.att-box-loading').remove(); 
+                upload.find('.att-box-delete').click(function(){
+                    var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
+                    var content_body = RichTextEditor.getData('body_'+new_border_ID);
+                    var imagens = content_body.match(/<img[^>]*>/g);
+                    var att = JSON.parse(idAttach);
+                    if(imagens != null)
+                    {   
+                        for (var x = 0; x < imagens.length; x++)
+                            if(imagens[x].indexOf('src="./inc/get_archive.php?msgFolder='+att.folder+'&amp;msgNumber='+att.uid+'&amp;indexPart='+att.part) !== -1)
+                                content_body = content_body.replace(imagens[x],'');
+
+                         RichTextEditor.setData('body_'+new_border_ID,content_body);    
+                    }       
+
+                    fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]');
+                    delAttachment(new_border_ID,idAttach); 
+                    $(this).parent().qtip("destroy");
+                    $(this).parent().remove();
+                    if(!fileUploadMSG.find(' .attachments-list').find(".att-box").length){
+                        fileUploadMSG.find(' .attachments-list').hide();
+                    }
+                });     
+
+
+                upload.append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>');
+                fileUploadMSG.find('.attachments-list').append(upload);
+                fileUploadMSG.find('.attachments-list .att-box:last').qtip({
+                    content: DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs", {attach : attach}),
+                    position: {
+                        corner: {
+                            tooltip: 'bottomMiddle',
+                            target: 'topMiddle'
                         },
-                        text: false
-                }).click(function(){
-                        var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
-                        var content_body = RichTextEditor.getData('body_'+new_border_ID);
-                        var imagens = content_body.match(/<img[^>]*>/g);
-                        var att = JSON.parse(idAttach);
-                        if(imagens != null)
-                        {   
-                            for (var x = 0; x < imagens.length; x++)
-                                if(imagens[x].indexOf('src="./inc/get_archive.php?msgFolder='+att.folder+'&amp;msgNumber='+att.uid+'&amp;indexPart='+att.part) !== -1)
-                                    content_body = content_body.replace(imagens[x],'');
-
-                             RichTextEditor.setData('body_'+new_border_ID,content_body);    
-                        }       
-
-                        fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]');
-                        delAttachment(new_border_ID,idAttach); 
-                        $(this).parent().remove();
-                });     
-
-
-                upload.find("p").append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>');
-                fileUploadMSG.find('.attachments-list').append(upload);
+                        adjust: {
+                           resize: true,
+                           scroll: true,
+                           screen: show
+                        }
+                    },
+                    show: {
+                        when: 'mouseover', // Don't specify a show event
+                        ready: false // Show the tooltip when ready
+                    },
+                    hide: 'mouseout', // Don't specify a hide event
+                    style: {
+                        border: {
+                            width: 1,
+                            radius: 5
+                        },
+                        width: {
+                                                         min: 75,
+                                                         max : 1000
+                                                },
+                        padding: 3, 
+                        textAlign: 'left',
+                        tip: true, // Give it a speech bubble tip with automatic corner detection
+                        name: 'blue' // Style it according to the preset 'cream' style
+                    }
+                });
 
     }                   
@@ -2582 +2705 @@
 
 function send_message(ID, folder, folder_name){
-     if(!zebraDiscardEventDialog && $('#fileupload_msg'+ID).find('.in-progress').length )
-     {
-         zebraDiscardEventDialog = true;
-         window.setTimeout(function() {
-         $.Zebra_Dialog('Existem anexos sendo enviados para o servidor. Caso envie sua mensagem agora estes arquivos serão perdidos.', {
-                    'type':     'question',
-                    'overlay_opacity': '0.5',
-                    'buttons':  ['Descartar anexos e enviar', 'Continuar editando e esperar anexos'],
-                    'width' : 500,
-                    'onClose':  function(clicked) {
-                            if(clicked == 'Descartar anexos e enviar' ) 
-                              send_valided_message(ID, folder, folder_name);
-
-                            window.setTimeout(function() {
-                                    zebraDiscardEventDialog = false;
-                            }, 500);
+    if(!zebraDiscardEventDialog && $('#fileupload_msg'+ID).find('.att-box-loading').length )
+    {
+        zebraDiscardEventDialog = true;
+        window.setTimeout(function() {
+            $.Zebra_Dialog('Existem anexos sendo enviados para o servidor. Caso envie sua mensagem agora estes arquivos serão perdidos.', {
+                'type':     'question',
+                'overlay_opacity': '0.5',
+                'buttons':  ['Descartar anexos e enviar', 'Continuar editando e esperar anexos'],
+                'width' : 500,
+                'onClose':  function(clicked) {
+                    if(clicked == 'Descartar anexos e enviar' ){ 
+                        $.each($('#fileupload_msg'+ID).find('.att-box'), function(index, value){
+                            if($(value).find(".att-box-loading").length)
+                                $(value).find('.att-box-delete').trigger("click");
+                        });
+                        send_valided_message(ID, folder, folder_name);
                     }
-             })
-          }, 300); 
-
-     }
-     else
-       send_valided_message(ID, folder, folder_name);     
+                    window.setTimeout(function() {
+                        zebraDiscardEventDialog = false;
+                    }, 500);
+                }
+            })
+        }, 300); 
+    }else
+        send_valided_message(ID, folder, folder_name);     
 }
 
@@ -3106 +3231 @@
                           success: function( data ){
                               data = connector.unserialize( data );
-                              
+
+                              selectAllFolderMsgs();
+                              $('.select-link').unbind('click');
+
                               if( data )
                                   handler_set_messages_flag( data );
@@ -3421 +3549 @@
 }
 
-function empty_trash_imap(){
+function empty_trash_imap(shared, button){
+        if(shared){
+                var folder_part = $(button).parents("li:first").attr("id").split(cyrus_delimiter);
+                var folder = folder_part[0]+cyrus_delimiter+folder_part[1];
+        }
+
         var handler_empty_trash = function(data){
                 Element('chk_box_select_all_messages').checked = false;
@@ -3432 +3565 @@
                 draw_tree_labels();
                 if (data){
+                        if(typeof(data) == "object"){
+                                if(data[1] == "Permission denied"){
+                                        cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                        return write_msg(get_lang("Permission denied"));
+                                }
+                        }
                         write_msg(get_lang('Your Trash folder was empty.'));
                         if (get_current_folder() == mount_url_folder(["INBOX",special_folders["Trash"]])){
@@ -3451 +3590 @@
                 'onClose':  function(caption) {
                         if(caption == get_lang("Yes")){
-                                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultTrashFolder", handler_empty_trash);
+                                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultTrashFolder"+(shared ? "&shared="+folder : ""), handler_empty_trash);
                         }
                 }
@@ -3457 +3596 @@
 }
 
-function empty_spam_imap(){
+function empty_spam_imap(shared, button){
+        if(shared){
+                var folder_part = $(button).parents("li:first").attr("id").split(cyrus_delimiter);
+                var folder = folder_part[0]+cyrus_delimiter+folder_part[1];
+        }
         var handler_empty_spam = function(data){
                 Element('chk_box_select_all_messages').checked = false;
@@ -3471 +3614 @@
                 draw_tree_labels();
                 update_quota(get_current_folder());
-                if (data)
-                        write_msg(get_lang('Your Spam folder was empty.'));
+                if (data){
+                        if(typeof(data) == "object"){
+                                if(data[1] == "Permission denied"){
+                                        cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                        return write_msg(get_lang("Permission denied"));
+                                }else{
+                                        write_msg(get_lang('Your Spam folder was empty.'));             
+                                }
+                        }else{
+                                write_msg(get_lang('Your Spam folder was empty.'));     
+                        }
+                }
                 else
                         write_msg(get_lang('ERROR emptying your Spam folder.'));
@@ -3484 +3637 @@
                 'onClose':  function(caption) {
                         if(caption == get_lang("Yes")){
-                                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder", handler_empty_spam);
+                                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder"+(shared ? "&shared="+folder : ""), handler_empty_spam);
                         }
                 }
@@ -3620 +3773 @@
                 msgs_number = get_selected_messages();
 
+        //TODO: REFATORAR O CÓDIGO PARA EVITAR recodificação
+        if(currentTab == 0)
+                msgs_number = get_selected_messages();
+
         if (parseInt(msgs_number) > 0 || msgs_number.length > 0)
                 cExecute ("$this.imap_functions.spam&folder="+folder+"&spam=false"+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_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="+0+"&cyrus_delimiter="+cyrus_delimiter, handler_move_msgs);
@@ -3657 +3814 @@
                 return;
         }else if(msgs_number == 'selected')
+                msgs_number = get_selected_messages();
+
+        //TODO: REFATORAR O CÓDIGO PARA EVITAR recodificação
+        if(currentTab == 0)
                 msgs_number = get_selected_messages();
 
@@ -4188 +4349 @@
 
 function create_new_folder(name_folder, base_path){
+        //Limit reached folders
+        if(preferences.imap_max_folders){
+                if(cp_tree1.length == parseInt(preferences.imap_max_folders)){
+                        $(".folders-loading").removeClass("folders-loading");
+                        cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                        return write_msg(get_lang("Limit reached folders"));
+                }
+        }
+        
         $.ajax({
                 url : "controller.php?action=$this.imap_functions.create_mailbox",
@@ -4197 +4367 @@
                         if(data == "Mailbox already exists"){
                                 write_msg(get_lang("Mailbox already exists"));
+                        }else if(data.substring(data.indexOf("Permission"), data.length) == "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"));
                         }
                         cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);

trunk/expressoMail1_2/js/manifest

@@ -44 +44 @@
           { "url": "sniff_browser.js?1.222" },
           { "url": "TreeS.js?1.222" },
-          { "url": "TreeShow.js?1.222" },
           { "url": "offline_access.js?1.222" },
           { "url": "lert/lert.js" },

trunk/expressoMail1_2/js/messages_controller.js

@@ -38 +38 @@
                                     
                                     if( data )
-                                        call_back( data );
+                                                call_back( data );
                               },
                                   beforeSend: function( jqXHR, settings ){
@@ -170 +170 @@
         }
         
-
+        /*
         messages_proxy.prototype.proxy_rename_folder = function(){
                 var specialFolders = special_folders[ttree.getFolder().split(cyrus_delimiter)[ttree.getFolder().split(cyrus_delimiter).length-1]]; 
@@ -206 +206 @@
                 
         }
-
+        */
+        /*
         messages_proxy.prototype.proxy_create_folder = function() {
                 if (folders.length == preferences.imap_max_folders){ 
@@ -244 +245 @@
                                 alert(get_lang("It's not possible create inside: ") + lang_folder(ttree.FOLDER.substr(6))+".");
         }
-        
+        */
+        /*
         messages_proxy.prototype.proxy_remove_folder = function() {
                 if (this.is_local_folder(ttree.FOLDER)) {
@@ -283 +285 @@
                 else
                         ttreeBox.del();
-        }
+        }*/
 
         messages_proxy.prototype.proxy_move_messages = function (folder, msgs_number, border_ID, new_folder, new_folder_name) {
@@ -475 +477 @@
                 }
         }
-
+        /*
         messages_proxy.prototype.proxy_export_all_msg=function(){
 
@@ -493 +495 @@
                 }
         }
-
+        */
         var proxy_mensagens;
         proxy_mensagens = new messages_proxy();

trunk/expressoMail1_2/js/preferences.js

@@ -20 +20 @@
                 cExecute(args,handler_preferences,params);
         }
-
-        Preferences.prototype.delete_dynamic_contacts = function(){
-                var handler = function(data){}
-                var args   = "$this.dynamic_contacts.delete_dynamic_contacts";
-                var params = "";
-                cExecute(args,handler,params);
-        }
 // Cria o objeto        
         var prefe;

trunk/expressoMail1_2/js/shortcut.js

@@ -331 +331 @@
 //**********************
 shortcut.add('up', function(e)
+{
+    if(currentTab == 0){
+        $(".selected_shortcut_msg").removeClass("selected_shortcut_msg");
+        if($(".current_selected_shortcut_msg").prev().parents("#tbody_box").length)
+            $(".current_selected_shortcut_msg").blur().removeClass("current_selected_shortcut_msg").prev().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+        $(".current_selected_shortcut_msg").addClass("selected_shortcut_msg").focus();
+    }
+},{'disable_in_input':true});
+
+
+shortcut.add('down', function(e)
+{
+    if(currentTab == 0){
+        $(".selected_shortcut_msg").removeClass("selected_shortcut_msg");
+        if($(".current_selected_shortcut_msg").next().parents("#tbody_box").length)
+            $(".current_selected_shortcut_msg").blur().removeClass("current_selected_shortcut_msg").next().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+        $(".current_selected_shortcut_msg").addClass("selected_shortcut_msg").focus();
+    }
+},{'disable_in_input':true});
+
+shortcut.add('space', function(e)
+{
+    if(currentTab == 0){
+        var allchecked = true;
+        $.each( $(".selected_shortcut_msg"), function(index, value){
+            if($(value).find(":checkbox").attr("checked") == undefined){
+                allchecked = false;
+            }
+        });
+        if(allchecked){
+            $(".selected_shortcut_msg").removeClass("selected_msg").find('input[type="checkbox"]').removeAttr("checked");
+        }else{
+            //$(".current_selected_shortcut_msg").addClass("selected_msg").find('input[type="checkbox"]').attr("checked", true);
+            $(".selected_shortcut_msg").addClass("selected_msg").find('input[type="checkbox"]').attr("checked", true);
+        }
+        $.each( $(".selected_shortcut_msg"), function(index, value){
+            updateSelectedMsgs($(value).find(":checkbox").is(':checked'),$(value).attr("id"));
+        });
+        $(".current_selected_shortcut_msg").focus();
+    }
+},{'disable_in_input':true});
+
+//****************
+
+shortcut.add("Shift+down",function()
+{    
+    if(currentTab == 0){            
+        //$(".selected_shortcut_msg").removeClass("selected_shortcut_msg");
+        if($(".current_selected_shortcut_msg").next().parents("#tbody_box").length)
+            if($(".current_selected_shortcut_msg").next().hasClass("selected_shortcut_msg"))
+                $(".current_selected_shortcut_msg").blur().removeClass("selected_shortcut_msg").removeClass("current_selected_shortcut_msg").next().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+            else
+                $(".current_selected_shortcut_msg").blur().addClass("selected_shortcut_msg").removeClass("current_selected_shortcut_msg").next().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+        $(".current_selected_shortcut_msg").focus();
+    }
+},{'disable_in_input':true, 'propagate':false});
+
+shortcut.add("Shift+up",function(){
+    if(currentTab == 0){            
+        //$(".selected_shortcut_msg").removeClass("selected_shortcut_msg");
+        if($(".current_selected_shortcut_msg").prev().parents("#tbody_box").length)
+            if($(".current_selected_shortcut_msg").prev().hasClass("selected_shortcut_msg"))
+                $(".current_selected_shortcut_msg").blur().removeClass("selected_shortcut_msg").removeClass("current_selected_shortcut_msg").prev().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+            else
+                $(".current_selected_shortcut_msg").blur().addClass("selected_shortcut_msg").removeClass("current_selected_shortcut_msg").prev().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+        $(".current_selected_shortcut_msg").focus();
+    }
+},{'disable_in_input':true, 'propagate':false});
+}
+else
+{
+    shortcut.add("Up",function(){
+        $(".selected_shortcut_msg").removeClass("selected_shortcut_msg");
+        if($(".current_selected_shortcut_msg").prev().parents("#tbody_box").length)
+            $(".current_selected_shortcut_msg").blur().removeClass("current_selected_shortcut_msg").prev().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+        $(".current_selected_shortcut_msg").focus();
+    },{'disable_in_input':true});
+
+    shortcut.add("Down",function(){
+        $(".selected_shortcut_msg").removeClass("selected_shortcut_msg");
+        if($(".current_selected_shortcut_msg").next().parents("#tbody_box").length)
+            $(".current_selected_shortcut_msg").blur().removeClass("current_selected_shortcut_msg").next().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+        $(".current_selected_shortcut_msg").focus();
+    },{'disable_in_input':true});
+
+    shortcut.add("Shift+down",function(){
+        if(currentTab == 0){            
+            if($(".current_selected_shortcut_msg").next().parents("#tbody_box").length)
+                if($(".current_selected_shortcut_msg").next().hasClass("selected_shortcut_msg"))
+                    $(".current_selected_shortcut_msg").blur().removeClass("selected_shortcut_msg").removeClass("current_selected_shortcut_msg").next().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+                else
+                    $(".current_selected_shortcut_msg").blur().addClass("selected_shortcut_msg").removeClass("current_selected_shortcut_msg").next().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+            $(".current_selected_shortcut_msg").focus();
+        }
+    },{'type':'keypress','disable_in_input':true, 'propagate':false});
+
+    shortcut.add("Shift+up",function(){
+        if(currentTab == 0){            
+            if($(".current_selected_shortcut_msg").prev().parents("#tbody_box").length)
+                if($(".current_selected_shortcut_msg").prev().hasClass("selected_shortcut_msg"))
+                    $(".current_selected_shortcut_msg").blur().removeClass("selected_shortcut_msg").removeClass("current_selected_shortcut_msg").prev().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+                else
+                    $(".current_selected_shortcut_msg").blur().addClass("selected_shortcut_msg").removeClass("current_selected_shortcut_msg").prev().addClass("current_selected_shortcut_msg selected_shortcut_msg");
+            $(".current_selected_shortcut_msg").focus();
+        }
+    },{'type':'keypress', 'disable_in_input':true, 'propagate':false});
+    shortcut.add('Space', function(e)
+    {
+        if(currentTab == 0){
+            var allchecked = true;
+            $.each( $(".selected_shortcut_msg"), function(index, value){
+                if($(value).find(":checkbox").attr("checked") == undefined){
+                    allchecked = false;
+                }
+            });
+            if(allchecked){
+                
+                $(".selected_shortcut_msg").removeClass("selected_msg").find('input[type="checkbox"]').removeAttr("checked");
+            }else{
+                //$(".current_selected_shortcut_msg").addClass("selected_msg").find('input[type="checkbox"]').attr("checked", true);
+                $(".selected_shortcut_msg").addClass("selected_msg").find('input[type="checkbox"]').attr("checked", true);
+            }
+
+            $.each( $(".selected_shortcut_msg"), function(index, value){
+                updateSelectedMsgs($(value).find(":checkbox").is(':checked'),$(value).attr("id"));
+            });
+        }
+    },{'disable_in_input':true});
+}
+
+shortcut.add("return",function(){
+    if ( Element('border_id_0').className==='menu-sel' )
+    {
+        all_messages = Element('tbody_box').childNodes;
+        for (var i=0; i < all_messages.length; i++)
         {
-                
-                var search_in_focus = false;
-                var search_win = document.getElementById( 'window_QuickCatalogSearch' );
-                if ( search_win && search_win.style.visibility == 'visible' )
-                        search_in_focus = true;
-
-                if ( !search_in_focus && currentTab == 0 )
-                    select_msg('null', 'up');
-                // Ao usuario pressionar o 'up' em uma outra aba, não pode ser removido o 'up'.
-                                else{}
-                   // shortcut.remove('up');
-                                e.stopPropagation();
-                                e.preventDefault();
-        },{'disable_in_input':false});
-
-
-        shortcut.add('down', function(e)
+            if ( exist_className(all_messages[i], 'selected_shortcut_msg') )
+            {
+                Element("td_from_" + all_messages[i].id).onclick();
+                return;
+            }
+        }
+    }
+},{'disable_in_input':true});
+
+shortcut.add("f9",function(){
+    Element("em_refresh_button").onclick();
+    return;
+},{'disable_in_input':false});
+
+function exec_msg_action(action)
+{
+    var msg_id = get_msg_id();
+    if (msg_id)
+    {
+        var msg_id = 'msg_opt_' + action + '_' + msg_id;
+        try {Element(msg_id).onclick();}
+    catch(e){/*alert(e);*/}
+}
+return;
+}
+
+function show_head_option()
+{
+    var msg_id = get_msg_id();
+    if (msg_id) {
+        var msg_id = 'option_hide_more_' + msg_id;
+        try {Element(msg_id).onclick();}
+    catch(e){/*alert(e);*/}
+}
+return;
+}
+
+function show_address_full()
+{
+    var toaddress = Element('div_toaddress_' + get_msg_id());   
+    var ccaddress = Element('div_ccaddress_' + get_msg_id());
+
+    if(toaddress &&  '' == toaddress.style.display) {
+        show_div_address_full(get_msg_id(),'to');
+    }
+    else {
+        if(toaddress)
+            toaddress.style.display = '';
+        var toaddress_full = Element('div_toaddress_full_' + get_msg_id());
+        if(toaddress_full)
+            toaddress_full.style.display = 'none';
+    }           
+    if(ccaddress &&  '' == ccaddress.style.display) {
+        show_div_address_full(get_msg_id(),'cc');
+    }
+    else {
+        if(ccaddress)
+            ccaddress.style.display = '';
+        var ccaddress_full = Element('div_ccaddress_full_' + get_msg_id());
+        if(ccaddress_full)
+            ccaddress_full.style.display = 'none';
+    }
+    return;
+}
+
+function get_msg_id()
+{
+    children = Element('border_tr').childNodes;
+
+    for (var i=0; i<children.length; i++)
+    {
+        if ( (children[i].nodeName==='TD') && (children[i].className==='menu-sel') && children[i].id != 'border_id_0')
         {
-                var search_in_focus = false;
-                var search_win = document.getElementById( 'window_QuickCatalogSearch' );
-                if ( search_win && search_win.style.visibility == 'visible' )
-                        search_in_focus = true;
-
-                if ( !search_in_focus && currentTab == 0 )
-                    select_msg('null', 'down');
-                                // Ao usuario pressionar o 'down' em uma outra aba, não pode ser removido o 'down'. 
-                else{}
-                   // shortcut.remove('down');
-                                e.stopPropagation();
-                                e.preventDefault();
-        },{'disable_in_input':false});
-
-//****************
-
-        shortcut.add("Shift+down",function(){
-                if ( Element('border_id_0').className==='menu-sel' )
-                {
-                        if (shift_up_count > 0)
-                                unselect_top_msg();
-                        else
-                                select_bottom_msg();
-                }
-        },{'disable_in_input':true, 'propagate':false});
-        
-        shortcut.add("Shift+up",function(){
-                if ( Element('border_id_0').className==='menu-sel' )
-                {
-                        if (shift_down_count > 0)
-                                unselect_bottom_msg();
-                        else
-                                select_top_msg();
-                }
-        },{'disable_in_input':true, 'propagate':false});
-}
-else
-{
-        shortcut.add("Up",function(){
-                if (currentTab == 0)
-                  select_msg('null', 'up');
-        },{'disable_in_input':false});
-        
-        shortcut.add("Down",function(){
-
-                if (currentTab == 0)
-                  select_msg('null', 'down');
-                
-        },{'disable_in_input':false});
-        
-        shortcut.add("Shift+down",function(){
-                if ( Element('border_id_0').className==='menu-sel' )
-                {
-                        if (shift_up_count > 0)
-                                unselect_top_msg();
-                        else
-                                select_bottom_msg();
-                }
-        },{'type':'keypress','disable_in_input':true, 'propagate':false});
-        
-        shortcut.add("Shift+up",function(){
-                if ( Element('border_id_0').className==='menu-sel' )
-                {
-                        if (shift_down_count > 0)
-                                unselect_bottom_msg();
-                        else
-                                select_top_msg();
-                }
-        },{'type':'keypress', 'disable_in_input':true, 'propagate':false});
-}
-
-shortcut.add("return",function(){
-        if ( Element('border_id_0').className==='menu-sel' )
-        {
-                all_messages = Element('tbody_box').childNodes;
-                for (var i=0; i < all_messages.length; i++)
-                {
-                        if ( exist_className(all_messages[i], 'selected_shortcut_msg') )
-                        {
-                                Element("td_from_" + all_messages[i].id).onclick();
-                                return;
-                        }
-                }
-        }
-},{'disable_in_input':true});
-
-shortcut.add("f9",function(){
-        Element("em_refresh_button").onclick();
-        return;
-},{'disable_in_input':true});
-
-function exec_msg_action(action)
-{
-        var msg_id = get_msg_id();
-        if (msg_id)
-        {
-                var msg_id = 'msg_opt_' + action + '_' + msg_id;
-                try {Element(msg_id).onclick();}
-                catch(e){/*alert(e);*/}
-        }
-        return;
-}
-
-function show_head_option()
-{
-        var msg_id = get_msg_id();
-    if (msg_id) {
-                var msg_id = 'option_hide_more_' + msg_id;
-                try {Element(msg_id).onclick();}
-                catch(e){/*alert(e);*/}
-    }
-        return;
-}
-
-function show_address_full()
-{
-        var toaddress = Element('div_toaddress_' + get_msg_id());       
-        var ccaddress = Element('div_ccaddress_' + get_msg_id());
-        
-        if(toaddress &&  '' == toaddress.style.display) {
-                show_div_address_full(get_msg_id(),'to');
-        }
-        else {
-                if(toaddress)
-                        toaddress.style.display = '';
-                var toaddress_full = Element('div_toaddress_full_' + get_msg_id());
-                if(toaddress_full)
-                        toaddress_full.style.display = 'none';
-        }               
-        if(ccaddress &&  '' == ccaddress.style.display) {
-                show_div_address_full(get_msg_id(),'cc');
-        }
-        else {
-                if(ccaddress)
-                        ccaddress.style.display = '';
-                var ccaddress_full = Element('div_ccaddress_full_' + get_msg_id());
-                if(ccaddress_full)
-                        ccaddress_full.style.display = 'none';
-        }
-        return;
-}
-
-function get_msg_id()
-{
-        children = Element('border_tr').childNodes;
-        
-        for (var i=0; i<children.length; i++)
-        {
-                if ( (children[i].nodeName==='TD') && (children[i].className==='menu-sel') && children[i].id != 'border_id_0')
-                {
-                        var border_selected = children[i];
-                        var msg_id = border_selected.id.replace("border_id_","");
-                        return msg_id;
-                }
-        }
-        return false;
+            var border_selected = children[i];
+            var msg_id = border_selected.id.replace("border_id_","");
+            return msg_id;
+        }
+    }
+    return false;
 }
 
 function select_msg(msg_number, keyboard_action, force_msg_selection)
 {
-    /*
-          ** Se caso for limpado toda a caixa de email,
-          ** é adicionado um novo atalho de seleção.
-          ** main.js on function refrash and line 629.
-        */
-        
-        if(keyboard_action == "reload_msg"){
-           if( $("#tbody_box .selected_shortcut_msg").length == 0 )
-                $("#tbody_box tr:first").addClass("selected_shortcut_msg");     
-        }
-        
-        shift_up_count = 0;
-        shift_down_count = 0;
-
-        if (msg_number != 'null') {
-        
-                if(Element(msg_number)){
-                        unselect_all_msgs();
-                        add_className(Element(msg_number), 'selected_shortcut_msg');
-                }
-                
-        } else {
-                var scrollMain = Element('divScrollMain_0');
-                var selection_size = parseInt(preferences.line_height) + 10; 
-                
-                        if( keyboard_action == 'down') {
-                        
-                                if(!Element("chk_box_select_all_messages").checked){
-                                        
-                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
-                                        
-                                                if($(this).hasClass("selected_shortcut_msg") && $(this).next().length){
-                                                        $(this).next().addClass("selected_shortcut_msg");
-                                                        $(this).removeClass("selected_shortcut_msg");
-                                                        return false;
-                                                }
-                                                
-                                        });
-                                        
-                                } else {
-                                
-                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
-                                                
-                                                if($(this).hasClass("current_selected") && $(this).next().length){
-                                                        $(this).removeClass("current_selected");
-                                                        $(this).removeClass("selected_shortcut_msg");
-                                                        $(this).next().addClass("current_selected");
-                                                        $(this).next().addClass("selected_shortcut_msg");
-                                                        return false;
-                                                }
-                                        
-                                        });
-                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
-                                                                if(!$(this).hasClass("current_selected"))
-                                                                        $(this).removeClass("selected_shortcut_msg");
-                                        });
-                                }
-                        
-                        } else if( keyboard_action == 'up') {
-                        
-                                if(!Element("chk_box_select_all_messages").checked){
-                                
-                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
-                                        
-                                                if($(this).hasClass("selected_shortcut_msg") && $(this).prev().length){
-                                                                $(this).prev().addClass("selected_shortcut_msg");
-                                                                $(this).removeClass("selected_shortcut_msg");
-                                                                return false;
-                                                }
-                                                
-                                        });
-                                        
-                                } else {
-                                        
-                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
-                                                
-                                                if($(this).hasClass("current_selected") && $(this).prev().length){
-                                                        $(this).removeClass("current_selected");
-                                                        $(this).removeClass("selected_shortcut_msg");
-                                                        $(this).prev().addClass("current_selected");
-                                                        $(this).prev().addClass("selected_shortcut_msg");
-                                                        return false;
-                                                }
-                                        
-                                        });
-                                        $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
-                                                                if(!$(this).hasClass("current_selected"))
-                                                                        $(this).removeClass("selected_shortcut_msg");
-                                        });
-                                
-                                }
-                  
-                        }
-                return true;
-        }
+/*
+** Se caso for limpado toda a caixa de email,
+** e adicionado um novo atalho de selecao.
+** main.js on function refrash and line 629.
+*/
+$("#table_box").find("tr").attr("tabindex", -1);
+
+if(keyboard_action == "reload_msg"){
+    if( $("#tbody_box .current_selected_shortcut_msg").length == 0 ){
+        $("#tbody_box tr:first").addClass("current_selected_shortcut_msg selected_shortcut_msg");       
+    }
+}
+
+shift_up_count = 0;
+shift_down_count = 0;
+
+if (msg_number != 'null') {
+
+    if(Element(msg_number)){
+        unselect_all_msgs();
+        $("#tbody_box tr").removeClass("current_selected_shortcut_msg selected_shortcut_msg");
+        $("#"+msg_number).addClass('current_selected_shortcut_msg selected_shortcut_msg');
+    }
+
+} else {
+    var scrollMain = Element('divScrollMain_0');
+    var selection_size = parseInt(preferences.line_height) + 10; 
+
+    if( keyboard_action == 'down') {
+
+        if(!Element("chk_box_select_all_messages").checked){
+
+            $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+
+                if($(this).hasClass("selected_shortcut_msg") && $(this).next().length){
+                    $(this).next().addClass("selected_shortcut_msg");
+                    $(this).removeClass("selected_shortcut_msg");
+                    return false;
+                }
+
+            });
+
+        } else {
+
+            $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+
+                if($(this).hasClass("current_selected") && $(this).next().length){
+                    $(this).removeClass("current_selected");
+                    $(this).removeClass("selected_shortcut_msg");
+                    $(this).next().addClass("current_selected");
+                    $(this).next().addClass("selected_shortcut_msg");
+                    return false;
+                }
+
+            });
+            $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+                if(!$(this).hasClass("current_selected"))
+                    $(this).removeClass("selected_shortcut_msg");
+            });
+        }
+
+    } else if( keyboard_action == 'up') {
+
+        if(!Element("chk_box_select_all_messages").checked){
+
+            $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+
+                if($(this).hasClass("selected_shortcut_msg") && $(this).prev().length){
+                    $(this).prev().addClass("selected_shortcut_msg");
+                    $(this).removeClass("selected_shortcut_msg");
+                    return false;
+                }
+
+            });
+
+        } else {
+
+            $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+
+                if($(this).hasClass("current_selected") && $(this).prev().length){
+                    $(this).removeClass("current_selected");
+                    $(this).removeClass("selected_shortcut_msg");
+                    $(this).prev().addClass("current_selected");
+                    $(this).prev().addClass("selected_shortcut_msg");
+                    return false;
+                }
+
+            });
+            $("#divScrollMain_0").find("#tbody_box").find("tr").each(function(){
+                if(!$(this).hasClass("current_selected"))
+                    $(this).removeClass("selected_shortcut_msg");
+            });
+
+        }
+
+    }
+    return true;
+}
 }
 
 function select_bottom_msg()
 {
-        all_messages = Element('tbody_box').childNodes;
-        
-        if ( exist_className(all_messages[all_messages.length-1], 'selected_shortcut_msg') )
-                return;
-        
-        for (var i=all_messages.length-1; i >=0; i--)
-        {
-                if ( (exist_className(all_messages[i], 'selected_shortcut_msg')) && (i+1 <= all_messages.length-1) )
-                {
-                        shift_down_count++;
-                        add_className(all_messages[i+1], 'selected_shortcut_msg');
-                        break;
-                }
-        }
+    all_messages = Element('tbody_box').childNodes;
+
+    if ( exist_className(all_messages[all_messages.length-1], 'selected_shortcut_msg') )
+        return;
+
+    for (var i=all_messages.length-1; i >=0; i--)
+    {
+        if ( (exist_className(all_messages[i], 'selected_shortcut_msg')) && (i+1 <= all_messages.length-1) )
+        {
+            shift_down_count++;
+            add_className(all_messages[i+1], 'selected_msg');
+            break;
+        }
+    }
 }
 
 function select_top_msg()
 {
-        all_messages = Element('tbody_box').childNodes;
-                
-        if ( exist_className(all_messages[0], 'selected_shortcut_msg') )
-                return;
-        
-        for (var i=0; i <=all_messages.length-1; i++)
-        {
-                if ( exist_className(all_messages[i], 'selected_shortcut_msg') )
-                {
-                        shift_up_count++;
-                        add_className(all_messages[i-1], 'selected_shortcut_msg');
-                        break;
-                }
-        }
+    all_messages = Element('tbody_box').childNodes;
+
+    if ( exist_className(all_messages[0], 'selected_shortcut_msg') )
+        return;
+
+    for (var i=0; i <=all_messages.length-1; i++)
+    {
+        if ( exist_className(all_messages[i], 'selected_shortcut_msg') )
+        {
+            shift_up_count++;
+            add_className(all_messages[i-1], 'selected_msg');
+            break;
+        }
+    }
 }
 
 function unselect_bottom_msg()
 {
-        all_messages = Element('tbody_box').childNodes;
-        for (var i=all_messages.length-1; i >=0; i--)
-        {
-                if ( exist_className(all_messages[i], 'selected_shortcut_msg') )
-                {
-                        shift_down_count--;
-                        remove_className(all_messages[i], 'selected_shortcut_msg');
-                        break;
-                }
-        }
+    all_messages = Element('tbody_box').childNodes;
+    for (var i=all_messages.length-1; i >=0; i--)
+    {
+        if ( exist_className(all_messages[i], 'selected_shortcut_msg') )
+        {
+            shift_down_count--;
+            remove_className(all_messages[i], 'selected_msg');
+            break;
+        }
+    }
 }
 
 function unselect_top_msg()
 {
-        all_messages = Element('tbody_box').childNodes;
-        for (var i=0; i <=all_messages.length-1; i++)
-        {
-                if ( exist_className(all_messages[i], 'selected_shortcut_msg') )
-                {
-                        shift_up_count--;
-                        remove_className(all_messages[i], 'selected_shortcut_msg');
-                        break;
-                }
-        }
+    all_messages = Element('tbody_box').childNodes;
+    for (var i=0; i <=all_messages.length-1; i++)
+    {
+        if ( exist_className(all_messages[i], 'selected_shortcut_msg') )
+        {
+            shift_up_count--;
+            remove_className(all_messages[i], 'selected_msg');
+            break;
+        }
+    }
 }
 
 function unselect_all_msgs()
 {
-        all_messages = Element('tbody_box').childNodes;
-        for (var i=0; i <=all_messages.length-1; i++)
-        {
-                remove_className(all_messages[i], 'selected_shortcut_msg');
-        }
-}
+    all_messages = Element('tbody_box').childNodes;
+    for (var i=0; i <=all_messages.length-1; i++)
+    {
+        remove_className(all_messages[i], 'selected_msg');
+    }
+}

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -924 +924 @@
 Impossible editing this contact, but it's possible to remove it expressoMail1_2 pt-br   Impossível editar este contato, mas é possível removê-lo
 The contact was moved from recent contacts to personal contacts successful.     expressoMail1_2 pt-br   O Contato foi movido dos contatos recentes para os contatos pessoais com sucesso.
+Permission denied       expressoMail1_2 pt-br   Permissão negada
+Success expressoMail1_2 pt-br   Concluído

trunk/expressoMail1_2/templates/default/main.css

@@ -144 +144 @@
 form.fileupload .files-list { margin-left: 5px; margin-top: -14px; padding: 0.2em 0.7em; }
 form.fileupload .files-list .delete-upload { top: 7px}
-ul.attachments-list { padding: 0; }
+
+div.attachments-list {
+        max-height: 130px;
+        overflow-y: auto;
+        padding-top: 5px;
+}
 
 .button-files-upload { float:left; }
@@ -230 +235 @@
 .expressomail-qs-container .menu-control { float:right; margin-left:400px; position: absolute; z-index: 100; padding-top:5px;}
 .expressomail-qs-container .acc-list { width:444px;height:250px;float:left;border:1px solid #DDD;background-color:#EEE;border-radius:3px;margin-left:1px; margin: 10px 5px 5px 1px;}
-.expressomail-qs-container .details-container { width:295px;height:246px; float:right; margin: 5px 5px;}
+.expressomail-qs-container .details-container { width:300px;height:246px; float:right; margin: 5px 0;}
 
 .expressomail-qs-container .acc-list .demo {width:100%;margin-top:20px;}
@@ -236 +241 @@
 .dialog-modal.expressomail-qs-container  { height: 416px; padding:5px; }
 
-.ui-dialog .ui-dialog-buttonpane { padding: 0; border:none; margin: 0; padding-right: 0.3px !important;}
+.ui-dialog .ui-dialog-buttonpane { padding: 0; border:none; margin: 0;}
 .expressomail-qs-container .menu-control .ui-button-text-only .ui-button-text { padding: 0.1em 0.6em; }
 
@@ -404 +409 @@
         color: red;
 }
-.selected_shortcut_msg{
-        color: white;
-        background-color: #5194d2;
-}
+
 .show_img_link{
         width : 100%;
@@ -1012 +1014 @@
 }
 
-.qtip.qtip-blue.qtip-active ul {
-        padding: 0;
-}
-
-.qtip.qtip-blue.qtip-active li {
-        width: 160px;
-        list-style: none;
-}
-
 .new-event-win.active .fc-event-skin {
         border-color: #36C !important;
@@ -1355 +1348 @@
 }
 
-
-.box-selected{
-        background-color : #BBBBBB;
-}
-
 .hidden {
         display : none;
@@ -1392 +1380 @@
 }
 
+div.conteudo div.new-msg-head-data div.att-box{
+        background-color: #DFEFFC;
+        border-radius: 5px;
+        -moz-border-radius: 5px;
+        border: 1px solid #ADD9ED; 
+        display: inline-block;
+        cursor : pointer;
+        margin-top : 3px;
+        margin-right: 3px;
+        outline : none;
+        padding : 1px;
+}
+
+
+div.conteudo div.new-msg-head-data  div.att-box span.att-box-value{
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 11px;
+        color : #201b41;
+        outline : none;
+}
+
+div.conteudo div.new-msg-head-data div.att-box span.att-box-loading{
+        background : url("../../../prototype/modules/mail/img/loading.gif") no-repeat !important;
+        display: inline-block;
+        background-size: 15px auto !important;
+}
+
+div.conteudo div.new-msg-head-data div.att-box.invalid-email-box{
+        background-color: #ea9aa0;
+        border : 1px solid #540303 !important;
+}
+
 div.new-msg-head-data div.email-area .invalid-email-box{
         color: #540303;
@@ -1401 +1421 @@
         background-color : #BBBBBB;
 }
+
+.fileupload_msg_tooltip{
+        width: 99.7%;
+        text-align: center;
+        background: #DFEFFC;
+        font-weight: bold;
+        border-radius: 5px;
+    height: 115px;
+    line-height: 115px;
+    font-size: larger;
+}
+
+.fileupload_msg_tooltip.hover {
+    background: #ADD9ED;
+}
+
+.select-all-messages{
+        min-height: 20px;
+        font-size: 13px;
+        font-family: Arial;
+        white-space: nowrap;
+        text-align: center;
+}
+.select-all-messages .select-link{
+        text-decoration: underline !important;
+}
+
+.selected_shortcut_msg{
+    color: white;
+    background-color: #95A7FC;
+}
+
+.current_selected_shortcut_msg{
+    color: white;
+    background-color: #5194d2;
+}

trunk/library/ckeditor/plugins/expresso/plugin.js

@@ -125 +125 @@
                 },
                 add: function (e, data) {
-     
+            var iterator = idattachbycontent;
                         if(!maxAttachmentSize || data.files[0].size < maxAttachmentSize || is_ie) {
                                 setTimeout(function() {
                                         $('#attDisposition'+ID).val('embedded');
-                                        data.submit();
-                                }, 5000);
+                                        jqXHR[iterator] = data.submit();
+                                }, 100);
                         }
-
+            fileUploadMSG.find(' .attachments-list').show();
                         $.each(data.files, function (index, file) {     
                                 var attach = {};
                                 attach.fullFileName = file.name;
                                 attach.fileName = file.name;
-                                if(file.name.length > 10)
-                                        attach.fileName = file.name.substr(0, 18) + "..." + file.name.substr(file.name.length-9, file.name.length);
+                                if(file.name.length > 20)
+                                        attach.fileName = file.name.substr(0, 17) + "..." + file.name.substr(file.name.length-9, file.name.length);
                                 attach.fileSize = formatBytes(file.size);
                                 if(maxAttachmentSize && file.size > maxAttachmentSize)
                                         attach.error = 'Tamanho de arquivo nao permitido!!'
-                                                                
+                                else
+                    attach.error = true;
                                 var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));   
 
-                                upload.find('.button.close').button({
-                                        icons: {
-                                                primary: "ui-icon-close"
-                                        },
-                                        text: false
-                                }).click(function(){
+                                upload.find('.att-box-delete').click(function(){
                                         var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
                         
@@ -165 +161 @@
                     $('.attachments-list').find('input[value="'+idAttach+'"]').remove();
                     delAttachment(ID, idAttach);
-                                        $(this).parent().remove();
+                                        $(this).parent().qtip("destroy");
+                    $(this).parent().remove();
+                    if(!fileUploadMSG.find(' .attachments-list').find(".att-box").length){
+                        fileUploadMSG.find(' .attachments-list').hide();
+                    }
+                    if(jqXHR){
+                        jqXHR[iterator].abort();
+                    }
                                 });
                                 
-            fileUploadMSG.find('.attachments-list').append(upload);
-
-                        if(!maxAttachmentSize || file.size < maxAttachmentSize){
-                                if(data.fileInput){
-                                        fileUploadMSG.find('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');
-                                        fileUploadMSG.find('.attachments-list').find('[type=file]').addClass('hidden'); 
-                                }
-                        }else
-                                fileUploadMSG.find(' .fileinput-button.new').removeClass('new');
-                                                                
+                fileUploadMSG.find('.attachments-list').append(upload);
+                fileUploadMSG.find('.attachments-list .att-box:last').qtip({
+                    content: DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs", {attach : attach}),
+                    position: {
+                        corner: {
+                            tooltip: 'bottomMiddle',
+                            target: 'topMiddle'
+                        },
+                        adjust: {
+                           resize: true,
+                           scroll: true,
+                           screen: show
+                        }
+                    },
+                    show: {
+                        when: 'mouseover', // Don't specify a show event
+                        ready: false // Show the tooltip when ready
+                    },
+                    hide: 'mouseout', // Don't specify a hide event
+                    style: {
+                        border: {
+                            width: 1,
+                            radius: 5
+                        },
+                        width: {
+                             min: 75,
+                             max : 1000
+                        },
+                        padding: 3, 
+                        textAlign: 'left',
+                        tip: true, // Give it a speech bubble tip with automatic corner detection
+                        name: (typeof(attach.error) == 'boolean' ? 'light' : 'red') // Style it according to the preset 'cream' style
+                    }
+                });
+                        if(!maxAttachmentSize || file.size < maxAttachmentSize){
+                                if(data.fileInput){
+                                        fileUploadMSG.find('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');
+                                        fileUploadMSG.find('.attachments-list').find('[type=file]').addClass('hidden'); 
+                                }
+                        }else{
+                                fileUploadMSG.find(' .fileinput-button.new').removeClass('new');
+                        }                                       
                 CKEDITOR.instances['body_'+ID].insertHtml('<img src=""/>');
-
+                idattachbycontent++; 
                         });
                 
             CKEDITOR.dialog.getCurrent().hide();        
-                        
+                       
                 },
                 done: function(e, data){
-                        if(!!data.result && data.result != "[]"){
-                                var newAttach = data.result;
-                                if(!newAttach.mailAttachment.error){
-                                        if(newAttach.rollback !== false)
-                                        {
-                                                fileUploadMSG.find('.in-progress:first').parents('p').append('<input type="hidden" name="fileId[]" value="'+newAttach['mailAttachment'][0][0].id+'"/>').find('.status-upload').addClass('ui-icon ui-icon-check');
-                                                addAttachment(ID,newAttach['mailAttachment'][0][0].id);
-                                                var content_body  = RichTextEditor.getData('body_'+ID);
-                                                var rex = new RegExp('<img src="" [^\/>]*\/>', 'i'); 
-                                                var newImg = '<img src="../prototype/getArchive.php?mailAttachment='+newAttach['mailAttachment'][0][0].id+'" />'; 
-                                                content_body = content_body.replace(rex,newImg); 
-                                                RichTextEditor.setData('body_'+ID,content_body); 
-                                        }
-                                        else
-                                                fileUploadMSG.find('.in-progress:first').parents('p').find('.status-upload').append('Erro ao fazer upload!').addClass('message-attach-error');   
+            var attach_box = fileUploadMSG.find('.att-box-loading:first').parents('.att-box');
+            var attach = {
+                fullFileName : attach_box.find(".att-box-fullfilename").text(),
+                fileSize : attach_box.find(".att-box-filesize").text(),
+                OK : true,
+                error : false
+            };
+            if(!!data.result && data.result != "[]" ){
+                var newAttach = data.result;                             
+                if(!newAttach.mailAttachment.error || newAttach.rollback !== false){
+                                        attach_box.append('<input type="hidden" name="fileId[]" value="'+newAttach['mailAttachment'][0][0].id+'"/>');
+                                        addAttachment(ID,newAttach['mailAttachment'][0][0].id);
+                                        var content_body  = RichTextEditor.getData('body_'+ID);
+                                        var rex = new RegExp('<img src="" [^\/>]*\/>', 'i'); 
+                                        var newImg = '<img src="../prototype/getArchive.php?mailAttachment='+newAttach['mailAttachment'][0][0].id+'" />'; 
+                                        content_body = content_body.replace(rex,newImg); 
+                                        RichTextEditor.setData('body_'+ID,content_body); 
                                 }else{
-                                        fileUploadMSG.find('.in-progress:first').parents('p').find('.status-upload').append(newAttach.mailAttachment.error).addClass('message-attach-error');   
-                                }
-                        }else 
-                        {
-                fileUploadMSG.find('.in-progress:first').parents('p').find('.status-upload').append('Erro ao fazer upload!').addClass('message-attach-error');   
-                        }
-                        fileUploadMSG.find('.in-progress:first').remove();
-                    
+                                        attach_box.addClass('invalid-email-box');
+                    attach.error = newAttach.mailAttachment.error ? newAttach.mailAttachment.error : 'Erro ao anexar...';
+                }
+                        }else {
+                attach_box.addClass('invalid-email-box');
+                attach.error = 'Erro ao anexar...';
+            }
+            attach_box.qtip("destroy").qtip({
+                content: DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs", {attach : attach}),
+                position: {
+                    corner: {
+                        tooltip: 'bottomMiddle',
+                        target: 'topMiddle'
+                    },
+                    adjust: {
+                       resize: true,
+                       scroll: true,
+                       screen: show
+                    }
+                },
+                show: {
+                    when: 'mouseover', // Don't specify a show event
+                    ready: false // Show the tooltip when ready
+                },
+                hide: 'mouseout', // Don't specify a hide event
+                style: {
+                    border: {
+                        width: 1,
+                        radius: 5
+                    },
+                    width: {
+                         min: 75,
+                         max : 1000
+                    },
+                    padding: 3, 
+                    textAlign: 'left',
+                    tip: true, // Give it a speech bubble tip with automatic corner detection
+                    name: (attach.error == false ? 'blue' : 'red')// Style it according to the preset 'cream' style
+                }
+            });
+            fileUploadMSG.find(' .att-box-loading:first').remove();
                 }
         });

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

@@ -116 +116 @@
         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]});
@@ -166 +172 @@
         }).end().end();
         
-        folders_html.find('[id="'+selected+'"]').children().addClass("selected").end().end().find("li:first").find(".folder").not(".head_folder,.inbox,.drafts,.sent,.spam,.trash").draggable({
+        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(){
@@ -280 +287 @@
                                         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){
-                                                        cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                                if(data == "Permission denied"){
+                                                        write_msg(get_lang("Permission denied"));
+                                                }else if(data){
                                                         write_msg(get_lang("The folder was successfully moved"));
                                                 }
@@ -292 +301 @@
                         }
                 }
-        }).hover(
+        });
+        $(".folder").not(".head_folder").not(".shared-folders").parent().find(".folder").hover(
                 function(){
                         //CASO A LI NÃO TENHA UM eventNU FLUTUANTE AINDA, O eventNU É ADICIONADO!
@@ -298 +308 @@
                                 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";
-                                html = DataLayer.render("../prototype/modules/mail/templates/float_folder_menu.ejs", {name_folder : folder_name});                                      
+                                
+                                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;
@@ -334 +357 @@
                                                                         type : "POST",
                                                                         data : "current="+folder_id+"&rename="+new_name,
-                                                                        success : function(){
+                                                                        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);
@@ -383 +412 @@
                                                                                         $(".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));
@@ -447 +480 @@
                                                 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

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

@@ -1 @@
-<div id="fileupload_msg<%=data.ID%>" class="fileupload" style="margin : 15px 0px -15px -10px;">
+<div id="fileupload_msg<%=data.ID%>" class="fileupload" style="margin : 15px 0px -15px -10px; padding-bottom : 5px;">
         <div class="row fileupload-buttonbar">
                 <div class="button-files-upload">
@@ -13 +13 @@
         <br />
         <div class="files-list" style="margin: 5px; padding: 5px;">
-                <ul class="attachments-list"></ul>
+                <div class="attachments-list ui-corner-all" style="display:none;"></div>
         </div>
 </div>
+<div id="fileupload_msg<%=data.ID%>_droopzone" style="display:none;" class="fileupload_msg_tooltip">
+        Solte aqui seus anexos
+</div>

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

@@ -1 @@
-<li style="list-style : none;">
-        <p class="input-group archive-info" style="margin: 0px 0 !important; height: 17px">             
-                <span title="<%=data.file.fullFileName%>" class="archive-attach name"><%=data.file.fileName%></span>
-                <span class="archive-attach size"><%=data.file.fileSize%></span>
-                <button type="button" style="margin-bottom: -4px; <%= is_webkit || is_ie ? '' : 'top : 7px;'%>" class="button close tiny upload delete-upload" title="Deletar">Deletar</button>
-                <span class="status-upload"></span>
-                <%if(data.file.error){%>
-                        <span class="archive-error error"><%=data.file.error%></span>
-                <%}if(!data.file.error){%>
-                        <span style="width: 110px; height: 14px; overflow:hidden">
-                                <span class="in-progress"> <img src="../prototype/modules/mail/img/loader.gif" /></span>
-                        </span>
-                <%}%>
-                <label class="fileinput-button new"></label>
-    </p>
-</li>
+<div class="att-box ui-corner-all <%= (typeof(data.file.error) != 'boolean' ? 'invalid-email-box' : '') %>">
+    <!--<div style="position:absolute; text-align: center; line-height: 1.9em;">-->
+        <span class="att-box-value"><%=data.file.fileName%>&nbsp;<b>(<%=data.file.fileSize%>)</b></span>
+        <span class="att-box-fullfilename" style="display:none;"><%=data.file.fullFileName%></span>
+        <span class="att-box-filesize" style="display:none;"><%=data.file.fileSize%></span>
+        <% if(typeof(data.file.error) == 'boolean'){ %>
+        <span class="att-box-loading">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <% } %>
+        <span class="att-box-delete ui-icon-close ui-icon" style="display: inline-block;">&nbsp;</span>
+    <!--</div>-->
+</div>

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

@@ -12 +12 @@
 
 <span class="float-menu">
-        <span class="ui-icon ui-icon-document float-menu-new floating-default" title="Nova Pasta"></span>  
-        <%if(!specialFolders[data.name_folder]){ %>
-                <span class="ui-icon ui-icon-pencil float-menu-edit floating-default" title="Editar Pasta"></span>  
-                <span class="ui-icon ui-icon-close float-menu-remove floating-default" title="Excluir Pasta"></span>  
-        <%} 
-        else if(data.name_folder == trashfolder){%>
-                <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_trash_imap();" title="Limpar Pasta"></span>  
-        <%}
-        else if(data.name_folder == spamfolder){%>
-                <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_spam_imap();" title="Limpar Pasta"></span>  
+        <%if(!data.flag.valid){ %>
+                <span class="ui-icon ui-icon-document float-menu-new floating-default" title="Nova Pasta"></span>  
+                <%if(!specialFolders[data.name_folder]){ %>
+                        <span class="ui-icon ui-icon-pencil float-menu-edit floating-default" title="Editar Pasta"></span>  
+                        <span class="ui-icon ui-icon-close float-menu-remove floating-default" title="Excluir Pasta"></span>  
+                <%} 
+                else if(data.name_folder == trashfolder){%>
+                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_trash_imap();" title="Limpar Pasta"></span>  
+                <%}
+                else if(data.name_folder == spamfolder){%>
+                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_spam_imap();" title="Limpar Pasta"></span>  
+                        
+                <%}%>
+
+        <%}else{ %>
+        <%      if(parseInt(data.acl.create)){%>
+                        <span class="ui-icon ui-icon-document float-menu-new floating-default" title="Nova Pasta"></span> 
+        <%              if(parseInt(data.acl.delete) && parseInt(data.acl.rename) && !specialFolders[data.name_folder] && !data.flag.head){ %>
+                                <span class="ui-icon ui-icon-pencil float-menu-edit floating-default" title="Editar Pasta"></span>  
+        <%              } %>
+
+        <%      } %>
+        <%      if(parseInt(data.acl.delete) && !specialFolders[data.name_folder] && !data.flag.head){ %>
+                        <span class="ui-icon ui-icon-close float-menu-remove floating-default" title="Excluir Pasta"></span>
+                <%}%>
+                <%if(data.name_folder == trashfolder && parseInt(data.acl.delete)){%>
+                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_trash_imap(true, $(this));" title="Limpar Pasta"></span>  
+                <%}else if(data.name_folder == spamfolder && parseInt(data.acl.delete)){%>
+                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_spam_imap(true, $(this));" title="Limpar Pasta"></span>  
+                <%}%>
         <%}%>
-        
+
+        <span class="ui-icon ui-icon-arrowthickstop-1-n float-menu-export floating-default" title="Exportar Mensagens da Pasta"></span>  
  </span>

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

@@ -137 +137 @@
                         <tr class="attachment">
                                 <td class="field">
+                                        <%=get_lang("Attachments: ")%>
                                         <input style="display:none;" name="attDisposition<%= data.id %>" id="attDisposition<%= data.id%>" value="attachment"/>
                                 </td>

trunk/prototype/services/ImapServiceAdapter.php

@@ -78 +78 @@
                                 foreach ($result as $res) {
 
-                                        $response[] = array(
+                                        //monta o array padrao
+                                        $array = array(
                                                         'id' => mb_convert_encoding( $res['folder_id'], 'UTF-8', 'UTF7-IMAP' ),
                                                         'commonName' => mb_convert_encoding( $res['folder_name'], 'UTF-8' , 'UTF7-IMAP' ),
                                                         'parentFolder' => mb_convert_encoding( $res['folder_parent'], 'UTF-8' , 'UTF7-IMAP' ),
                                                         'messageCount' => array('unseen' => isset($res['folder_unseen']) ? $res['folder_unseen'] : null, 'total' => null)
-                                                );
-                                }
-
+                                        );
+
+                                        //se existir compartilhamento para pasta compartilhada
+                                        //adicionar array de permissoes
+                                        if(isset($res['acl_share'])){
+                                                $array['acl_share'] = $res['acl_share'];
+                                        }
+                                        $response[] = $array;
+                                }
                                 return $response;
                         }