- Timestamp:
- 09/11/12 15:24:49 (12 years ago)
- Location:
- sandbox/2.5.0-expresso1/expressoMail1_2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.5.0-expresso1/expressoMail1_2/inc/class.imap_functions.inc.php
r7184 r7189 4751 4751 4752 4752 function unarchive_mail($params) 4753 { 4753 { 4754 $dest_folder = urldecode($params['folder']); 4755 $sources = explode("#@#@#@",$params['source']); 4756 $timestamps = explode("#@#@#@",$params['timestamp']); 4757 $flags = explode("#@#@#@",$params['flags']); 4758 $ids = explode("#@#@#@",$params['id']); 4759 $return = array(); 4760 $archived = array(); 4761 $error = array(); 4762 4763 foreach($sources as $index=>$src) 4764 { 4765 if($src!="") 4766 { 4767 //If it is a MailArchiver incomming data 4768 if($params['madata']) 4769 $sourcedec = utf8_decode($src); 4770 //Default data 4771 else 4772 $sourcedec = $src; 4773 4774 $source = $this->treat_base64_from_post($sourcedec); 4775 $insert = $this->insert_email($source,$dest_folder,$timestamps[$index],$flags[$index]); 4776 4777 if($insert['error']) 4778 { 4779 $error[] = $ids[$index]; 4780 } 4781 else 4782 { 4783 $archived[] = $ids[$index]; 4784 } 4785 }else{ 4786 $error[] = $ids[$index]; 4787 } 4788 } 4789 4790 if (!empty($error)) 4791 { 4792 $return['error'] = $error; 4793 } 4794 if (!empty($archived)) 4795 { 4796 $return['archived'] = $archived; 4797 } 4798 4799 return $return; 4800 4801 /* 4754 4802 $dest_folder = $params['folder']; 4755 4803 $sources = explode("#@#@#@",$params['source']); … … 4766 4814 $insert = $this->insert_email($source, mb_convert_encoding( $dest_folder,"ISO-8859-1","UTF-8"), $timestampsactual,$flags[$index]); 4767 4815 } 4768 }4816 } 4769 4817 return $insert; 4818 */ 4770 4819 } 4771 4820 … … 5457 5506 return(false); 5458 5507 5459 $ a= imap_msgno($this->mbox, $msg_n);5460 $header = @imap_headerinfo($this->mbox, $ a, 80, 255);5508 $msgno_imap = imap_msgno($this->mbox, $msg_n); 5509 $header = @imap_headerinfo($this->mbox, $msgno_imap, 80, 255); 5461 5510 5462 5511 if (!is_object($header)) -
sandbox/2.5.0-expresso1/expressoMail1_2/js/mail_archiver.js
r7184 r7189 559 559 MailArchiver.prototype.unarchieve = function (folder, new_folder, msgs_number){ 560 560 try{ 561 document.getElementById('main_title').innerHTML = get_lang("Starting to unarchive messages"); 561 //Marcosw inicio - Melhoria na exibição de mensagem 562 //document.getElementById('main_title').innerHTML = get_lang("Starting to unarchive messages"); 563 write_msg(get_lang("Starting to unarchive messages")); 564 //Marcosw fim 562 565 if(currentTab.toString().indexOf("_r") != -1){ 563 566 msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); … … 573 576 expresso_mail_archive.unarchivecounter = 0; 574 577 expresso_mail_archive.unarchive_error_counter=0; 575 expresso_mail_archive.getFolderInfo(folder.substr(6, folder.length)); 578 579 //Marcosw início - correção de inconsistência com o nome da pasta local 580 //expresso_mail_archive.getFolderInfo(folder.substr(6, folder.length)); 581 expresso_mail_archive.getFolderInfo(folder.replace("local_messages","")); 582 //Marcosw fim 583 576 584 expresso_mail_archive.unarchievefolder = expresso_mail_archive.folder.name; 577 585 (new_folder != null)?expresso_mail_archive.unarchievenewfolder = new_folder:expresso_mail_archive.unarchievenewfolder='INBOX'; … … 677 685 expresso_mail_archive.unarchieveController(data); 678 686 } 679 //write_msg(get_lang('Unarchiving message %1 of %2', (expresso_mail_archive.unarchivecounter + 1), expresso_mail_archive.message_list.length)); 680 document.getElementById('main_title').innerHTML = get_lang('Unarchiving message %1 of %2', (expresso_mail_archive.unarchivecounter + 1), expresso_mail_archive.message_list.length); 687 //Marcosw inicio - Melhoria na exibição de mensagem 688 //document.getElementById('main_title').innerHTML = get_lang('Unarchiving message %1 of %2', (expresso_mail_archive.unarchivecounter + 1), expresso_mail_archive.message_list.length); 689 write_msg(get_lang('Unarchiving message %1 of %2', (expresso_mail_archive.unarchivecounter + 1), expresso_mail_archive.message_list.length)); 690 //Marcosw fim 691 681 692 cExecute ("$this.imap_functions.unarchive_mail&", handler_unarchive, params); 682 693 683 694 } 684 695 685 document.getElementById('main_title').innerHTML = get_lang('Opening message %1 to unarchive', (expresso_mail_archive.unarchivecounter + 1)); 696 //Marcosw inicio - Melhoria na exibição de mensagem 697 //document.getElementById('main_title').innerHTML = get_lang('Opening message %1 to unarchive', (expresso_mail_archive.unarchivecounter + 1)); 698 write_msg(get_lang('Opening message %1 to unarchive', (expresso_mail_archive.unarchivecounter + 1))); 699 //Marcosw fim 686 700 687 701 UnarchiveReqHandler.handler.open("GET", email, true);
Note: See TracChangeset
for help on using the changeset viewer.