Changeset 607 for trunk


Ignore:
Timestamp:
01/14/09 16:05:20 (15 years ago)
Author:
niltonneto
Message:

resolve #369, e também faz algumas alterações desejáveis para #351

Location:
trunk/expressoMail1_2
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/js/QuickSearchUser.js

    r118 r607  
    8383        emQuickSearchUser.prototype.create_new_message = function (cn, mail) { 
    8484                _this.close_window(); 
    85                 Element("msg_number").value = cn+" <"+mail+">"; 
    86                 new_message("new","null"); 
     85                if (openTab.type[currentTab] != 4) 
     86                { 
     87                        Element("msg_number").value = cn+" <"+mail+">"; 
     88                        new_message("new","null"); 
     89                }else{ 
     90                        Element('to_'+currentTab).innerHTML = cn+" <"+mail+">"; 
     91                } 
    8792        } 
    8893 
  • trunk/expressoMail1_2/js/draw_api.js

    r569 r607  
    1 var openBox = { 
     1var openTab = { 
     2        'type' : [], // 8 types of tabs, further info. see expressolivre.org/dev/wiki/mail/Documentacao 
    23        'content_id' : [], 
    3         'tab_folder' : [] 
    4  }; 
    5 var numBox = 0; // Open Mailboxes at context 
     4        'imapUid' : [], // Stores the imap email number of current tab 
     5        'countFile' : [0,0,0,0,0,0,0,0,0,0], // Stores the number of files attached in current tab 
     6        'imapBox' : [], // Stores the folder name 
     7        'toPreserve' : [] // Check if the message should be removed from draft after send 
     8}; 
     9var tabTypes = { 
     10        'new':4, 
     11        'forward':6, 
     12        'reply_with_history':7, 
     13        'reply_to_all_with_history':7, 
     14        'reply_without_history':7, 
     15        'reply_to_all_without_history':7, 
     16        'edit':5 
     17        } 
     18var currentTab,numBox = 0; // Open Tab and num of mailboxes opened at context 
    619 
    720function draw_tree_folders(folders){ 
     
    143156                        } 
    144157                        folders = data; 
    145                         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&sort_box_reverse=1", handler_draw_box); 
     158                        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); 
    146159                } 
    147160} 
     
    154167// Action on change folders. 
    155168function change_folder(folder, folder_name){ 
    156         if (openBox.tab_folder[0] != folder) 
     169        if (openTab.imapBox[0] != folder) 
    157170        { 
    158171                current_folder = folder; 
     
    309322                document.getElementById("border_table").width = "99.5%"; 
    310323 
    311         openBox.content_id[numBox] = document.getElementById("content_id_"+numBox);      
    312         openBox.tab_folder[numBox] = msg_folder; 
     324        openTab.content_id[numBox] = document.getElementById("content_id_"+numBox);      
     325        openTab.imapBox[numBox] = msg_folder; 
    313326         
    314327        table_message_header_box = document.getElementById("table_message_header_box_"+numBox); 
     
    382395                tbody_element.appendChild(tr_element); 
    383396                table_element.appendChild(tbody_element); 
    384                 openBox.content_id[numBox].appendChild(table_element); 
     397                openTab.content_id[numBox].appendChild(table_element); 
    385398        } 
    386399        draw_header_box(); 
     
    450463        // Fim: Redimensiona DIV SCROLL 
    451464        _divScroll.appendChild(table_element); 
    452         openBox.content_id[numBox].appendChild(_divScroll); 
     465        openTab.content_id[numBox].appendChild(_divScroll); 
    453466         
    454467        var f_unseen = 0; 
     
    709722        search_box_type = search; 
    710723 
    711         cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&search_box_type="+search+"&sort_box_type="+sort+"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box); 
     724        cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+sort+"&search_box_type="+search+"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box); 
    712725        current_page = 1; 
    713726        //Comentado para nao sobrepor o numero de msgs nao lidas ao utilizar os filtros 
     
    761774        //img_next_msg.onclick = function () {cExecute ("$this.imap_functions.get_info_next_msg&msg_number="+ info_msg.msg_number + "&msg_folder="+ info_msg.msg_folder + "&sort_box_type="+ sort_box_type +  "&search_box_type="+ search_box_type +"&sort_box_reverse="+ sort_box_reverse +"&reuse_border="+ID, show_msg)}; 
    762775        var folder = document.getElementById(ID.substr(0, ID.indexOf('_'))); 
    763         if (!folder) 
    764                 delete_border(ID); 
    765         if (folder.nextSibling) 
    766         { 
    767                 var inbox = folder.nextSibling.name; 
    768                 if (inbox) 
    769                         info_msg.msg_folder = inbox; 
    770  
    771                 var next_msg = folder.nextSibling.id; 
     776        if (!folder){ 
     777                delete_border(ID); 
     778                return; 
     779                } 
     780        if (folder.nextSibling){ 
     781                var nextMsgBox = folder.nextSibling.name?folder.nextSibling.name:info_msg.msg_folder; 
    772782                img_next_msg.onclick = function() 
    773783                { 
    774                         cExecute("$this.imap_functions.get_info_msg&msg_number="+next_msg+"&msg_folder=" + info_msg.msg_folder+"&reuse_border="+ID, show_msg); 
     784                        currentTab = ID; 
     785                        openTab.type[ID] = 2; 
     786                        cExecute("$this.imap_functions.get_info_msg&msg_number="+folder.nextSibling.id+"&msg_folder="+nextMsgBox, show_msg); 
    775787                }; 
    776788        } 
    777789        else 
    778790                img_next_msg.onclick = function() 
    779                 { 
    780                         current_page++; 
    781                         msg_range_end = (current_page*preferences.max_email_per_page); 
    782                         msg_range_begin = (msg_range_end-(preferences.max_email_per_page)+1); 
    783                         kill_current_box(); 
    784                         cExecute ('$this.imap_functions.get_range_msgs2&folder='+get_current_folder()+'&msg_range_begin='+msg_range_begin+'&msg_range_end='+msg_range_end+'&sort_box_reverse=1', function handler(data){draw_box(data, get_current_folder());}) 
    785                         delete_border(ID); 
    786                 }; 
     791                        { 
     792                                /*current_page++; 
     793                                msg_range_end = (current_page*preferences.max_email_per_page); 
     794                                msg_range_begin = (msg_range_end-(preferences.max_email_per_page)+1); 
     795                                kill_current_box(); 
     796                                cExecute ('$this.imap_functions.get_range_msgs2&folder='+get_current_folder()+'&msg_range_begin='+msg_range_begin+'&msg_range_end='+msg_range_end+'&sort_box_reverse=1', function handler(data){draw_box(data, get_current_folder());}) */ 
     797                                        delete_border(ID); 
     798                        }; 
    787799 
    788800        var img_space = document.createElement("SPAN"); 
     
    797809        //img_previous_msg.onclick = function () {cExecute ("$this.imap_functions.get_info_previous_msg&msgs_number="+ info_msg.msg_number + "&folder="+ info_msg.msg_folder + "&sort_box_type="+ sort_box_type+ "&search_box_type="+ search_box_type + "&sort_box_reverse="+ sort_box_reverse +"&reuse_border="+ID, show_msg)} 
    798810        folder = document.getElementById(ID.substr(0, ID.indexOf('_'))); 
    799         if (!folder) 
     811        if (!folder){ 
    800812                delete_border(ID); 
     813                return; 
     814                } 
    801815        if (folder.previousSibling) 
    802816        { 
    803                 var inbox = folder.previousSibling.name; 
    804                 if (inbox) 
    805                         info_msg.msg_folder = inbox; 
    806  
    807                 var previous_msg = folder.previousSibling.id; 
     817                var previousMsgBox = folder.previousSibling.name?folder.previousSibling.name:info_msg.msg_folder; 
    808818                img_previous_msg.onclick = function() 
    809819                { 
    810                         cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + info_msg.msg_folder+"&reuse_border="+ID, show_msg);                       
     820                        currentTab = ID; 
     821                        openTab.type[ID] = 2; 
     822                        cExecute("$this.imap_functions.get_info_msg&msg_number="+folder.previousSibling.id+"&msg_folder=" + previousMsgBox, show_msg); 
    811823                }; 
    812824        } 
     
    14451457        } 
    14461458//      var option_save_as              = '<span class="message_options" onclick=wfolders.makeWindow("'+ID+'","save");>'+get_lang("Save as")+'</span> | '; 
    1447         var option_save                 = '<span id="save_message_options" class="message_options" onclick="newMessageTab.toPreserve['+ID+'] = true; save_msg('+ID+');">'+get_lang("Save")+'</span> | '; 
     1459        var option_save                 = '<span id="save_message_options_'+ID+'" class="message_options" onclick="openTab.toPreserve['+ID+'] = true; save_msg('+ID+');">'+get_lang("Save")+'</span> | '; 
    14481460        var option_search               = '<span class="message_options" onclick=openListUsers("'+ID+'");>'+get_lang("Search")+'</span>'; 
    14491461        td_menu_new_message.innerHTML = option_send + option_send_and_file + option_save + option_search; 
  • trunk/expressoMail1_2/js/rich_text_editor.js

    r389 r607  
    1 var newMessageTab = { 
    2                 'imapUid' : [], // Stores the imap email number of current tab 
    3                 'countFile' : [0,0,0,0,0,0,0,0,0,0], // Stores the number of files attached in current tab 
    4                 'imapBox' : [], // Stores the folder name 
    5                 'toPreserve' : [] // Check if the message should be removed from draft after send 
    6                 }; 
    7  
    81function cRichTextEditor(){ 
    92        this.emwindow   = new Array; 
     
    303296 
    304297        RichTextEditor.saveFlag = 0; // See if save function finished 
    305         var save_link = document.getElementById("save_message_options"); 
     298        var save_link = document.getElementById("save_message_options_"+id); 
    306299        //save_link.onclick = function () {}; 
    307300        save_msg(id); 
     
    314307        else 
    315308                if (RichTextEditor.saveFlag == 1) 
    316                         this.editorCommand('Image', './inc/show_embedded_attach.php?msg_folder=INBOX/'+draftsfolder+'&msg_num='+newMessageTab.imapUid[id]+'&msg_part='+(newMessageTab.countFile[id]+1)); 
     309                        this.editorCommand('Image', './inc/show_embedded_attach.php?msg_folder=INBOX/'+draftsfolder+'&msg_num='+openTab.imapUid[id]+'&msg_part='+(openTab.countFile[id]+1)); 
    317310                        // this.editorCommand('Image', '.inc/gotodownload.php?msg_folder="+msg_folder+"&msg_number="+msg_number+"&idx_file="+idx_file+"&msg_part="+msg_part+params')); 
    318311} 
  • trunk/expressoMail1_2/js/search.js

    r569 r607  
    461461        searchE.prototype.open_msg = function(mailbox, uid_msg, subject){ 
    462462                var handler_get_msg = function(data){ 
     463//              alert(mailbox); 
    463464                        if(Element("border_id_" + uid_msg + "_r")){alert(get_lang("This message is already opened!"));} 
    464465                        else{draw_message(data,create_border(url_decode(subject), uid_msg + "_r"));} 
     466                        //set_msg_as_read(msgs_to_set[i], false); 
    465467                } 
    466468                var args   = "$this.imap_functions.get_info_msg"; 
  • trunk/expressoMail1_2/templates/default/config.tpl

    r569 r607  
    2222    </td> 
    2323   </tr> 
    24    <tr bgcolor="{row_on}"> 
     24   <tr bgcolor="{row_off}"> 
    2525   <td>{lang_Do_you_want_to_cache_php_requests_in_javascript?}</td> 
    2626   <td> 
     
    3131   </td> 
    3232   </tr> 
    33    <tr bgcolor="{row_off}"> 
     33   <tr bgcolor="{row_on}"> 
    3434    <td>{lang_Do_you_want_to_use_the_spam_filter?}</td> 
    3535    <td> 
     
    4040    </td> 
    4141   </tr> 
    42    <tr bgcolor="{row_on}"> 
     42   <tr bgcolor="{row_off}"> 
    4343    <td>{lang_Command_for_spam}</td> 
    4444    <td> 
    45         <input type="text" name="newsettings[expressoMail_command_for_spam]" value="{value_expressoMail_command_for_spam}" size="60" />  
     45    <input type="text" name="newsettings[expressoMail_command_for_spam]" value="{value_expressoMail_command_for_spam}" size="60" />  
    4646    </td> 
    47    <tr bgcolor="{row_off}"> 
     47    <tr bgcolor="{row_on}"> 
    4848    <td>{lang_Command_for_unmark_spam}</td> 
    4949    <td> 
    50         <input size="60" name="newsettings[expressoMail_command_for_ham]" value="{value_expressoMail_command_for_ham}">  
     50    <input size="60" name="newsettings[expressoMail_command_for_ham]" value="{value_expressoMail_command_for_ham}">  
    5151    </td> 
    52    </tr> 
    53    <tr bgcolor="{row_on}"> 
     52    </tr> 
     53    <tr bgcolor="{row_off}"> 
     54    <td>{lang_Always_confirm_notification_to_these_domains}</td> 
     55    <td> 
     56    <input size="60" name="newsettings[expressoMail_notification_domains]" value="{value_expressoMail_notification_domains}"> 
     57    </td> 
     58    </tr> 
     59    <tr bgcolor="{row_on}"> 
    5460    <td>{lang_Number_of_dynamic_contacts}</td> 
    5561    <td> 
    56         <input size="1" name="newsettings[expressoMail_Number_of_dynamic_contacts]" value="{value_expressoMail_Number_of_dynamic_contacts}">  
     62    <input size="1" name="newsettings[expressoMail_Number_of_dynamic_contacts]" value="{value_expressoMail_Number_of_dynamic_contacts}">  
    5763    </td> 
    58    </tr> 
     64    </tr> 
    5965<!-- END body --> 
    6066<!-- BEGIN footer --> 
Note: See TracChangeset for help on using the changeset viewer.