- Timestamp:
- 08/08/11 11:22:27 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/mail_archiver.js
r4899 r4909 343 343 expresso_mail_archive.folder_destination = destination_folder; 344 344 345 var fcaption = expresso_mail_archive.folder_destination; 346 347 for (var w=0; w < expresso_mail_archive.folders.length; w++){ 348 if(expresso_mail_archive.folders[w]["id"] == expresso_mail_archive.folder_destination){ 349 fcaption = expresso_mail_archive.folders[w]["name"]; 350 break; 351 } 352 } 353 345 354 //window.alert('destination_folder = ' + expresso_mail_archive.folder_destination); 346 355 … … 350 359 try{ 351 360 //Archive services needs session id, message source and destination folder 352 document.getElementById('main_title').innerHTML = get_lang("Archiving message on folder") + " " + expresso_mail_archive.folder_destination +"...";361 document.getElementById('main_title').innerHTML = get_lang("Archiving message on folder") + " " + fcaption +"..."; 353 362 ArchiveServices.archive(expresso_mail_archive.getArchiveOperationOK, expresso_mail_archive.getArchiveOperationFailure, sessid, data ,expresso_mail_archive.folder_destination); 354 363 } … … 585 594 } 586 595 var n_demo = new dNode({id: localBaseName + expresso_mail_archive.folders[i]["id"], caption: folder_caption, onClick: "change_folder('"+ localBaseName + expresso_mail_archive.folders[i]["id"] +"','"+ localBaseName + expresso_mail_archive.folders[i]["id"]+"', '" + expresso_mail_archive.drawdata.treeName + "')", plusSign:expresso_mail_archive.folders[i]["haschild"]}); 596 //var n_demo = new dNode({id: localBaseName + expresso_mail_archive.folders[i]["name"], caption: folder_caption, onClick: "change_folder('"+ localBaseName + expresso_mail_archive.folders[i]["name"] +"','"+ localBaseName + expresso_mail_archive.folders[i]["name"]+"', '" + expresso_mail_archive.drawdata.treeName + "')", plusSign:expresso_mail_archive.folders[i]["haschild"]}); 587 597 588 598 //Adjust the id node names … … 633 643 //createFolder operation 634 644 MailArchiver.prototype.createFolder = function(parentFolder, folderName){ 645 635 646 try{ 636 647 ArchiveServices.createFolder(expresso_mail_archive.createFolderOperationOK, expresso_mail_archive.createFolderOperationFailure, sessid, parentFolder, folderName); … … 776 787 var data_to_draw = expresso_mail_archive.drawdata.messagesList; 777 788 //window.alert('data to draw = ' + data_to_draw.length + '\ndata_to_draw[0].from.full = ' + print_r(data_to_draw)); 789 //window.alert('Current folder = ' + expresso_mail_archive.currentfolder + ' com ' + expresso_mail_archive.folders.length + ' folders.'); 790 var fcaption = expresso_mail_archive.currentfolder; 778 791 792 for (var w=0; w < expresso_mail_archive.folders.length; w++){ 793 if(expresso_mail_archive.folders[w]["id"] == expresso_mail_archive.currentfolder){ 794 fcaption = expresso_mail_archive.folders[w]["name"]; 795 break; 796 } 797 } 798 779 799 alternate_border(0); 780 Element("border_id_0").innerHTML = " " + lang_folder( expresso_mail_archive.currentfolder) + ' <font face="Verdana" size="1" color="#505050">[<span id="new_m"> </span> / <span id="tot_m"></span>]</font>';800 Element("border_id_0").innerHTML = " " + lang_folder(fcaption) + ' <font face="Verdana" size="1" color="#505050">[<span id="new_m"> </span> / <span id="tot_m"></span>]</font>'; 781 801 draw_box(data_to_draw, expresso_mail_archive.currentfolder, true); 782 802 draw_paging(expresso_mail_archive.drawdata.messagesList.length); … … 800 820 //one address 801 821 if(typeof(Fromdata.mailbox.length) == 'undefined'){ 802 var dataName = Fromdata.mailbox["@name"]; 822 var dataName = Fromdata.mailbox["@name"]; 803 823 var dataEmail = Fromdata.mailbox["@localPart"] + '@' + Fromdata.mailbox["@domain"]; 824 if(dataName == 'null') 825 dataName = dataEmail; 804 826 } 805 827 //address list: to header(msgs list), only first metters … … 807 829 var dataName = Fromdata.mailbox[0]["@name"]; 808 830 var dataEmail = Fromdata.mailbox[0]["@localPart"] + '@' + Fromdata.mailbox[0]["@domain"]; 831 if(dataName == 'null') 832 dataName = dataEmail; 809 833 } 810 834
Note: See TracChangeset
for help on using the changeset viewer.