- Timestamp:
- 07/24/12 10:27:50 (12 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.exporteml.inc.php
r5934 r6860 16 16 var $mbox_stream; 17 17 var $tempDir; 18 18 19 19 function ExportEml() { 20 20 … … 50 50 return $sEMail; 51 51 } 52 52 53 53 // create EML File. 54 54 // Funcao alterada para tratar a exportacao … … 62 62 $header = imap_headerinfo($this->mbox_stream, imap_msgno($this->mbox_stream, $id), 80, 255); 63 63 $subject = $this->decode_subject($header->fetchsubject); 64 64 65 65 if (strlen($subject) > 60) 66 66 $subject = substr($subject, 0, 59); … … 214 214 // se encontram em um mesmo folder 215 215 if (count($sorted_msgs)==1){ 216 217 216 $array_names_keys = array_keys($sorted_msgs); 218 217 $this->folder = mb_convert_encoding($array_names_keys[0], "UTF7-IMAP","UTF-8, ISO-8859-1, UTF7-IMAP"); … … 228 227 $fileName = $this->CreateFileEml($sEMLData, $tempDir, $msg_number[0]."_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]); 229 228 230 229 $header = imap_headerinfo($this->mbox_stream, imap_msgno($this->mbox_stream, $msg_number[0]), 80, 255); 230 $subject = $this->decode_subject(html_entity_decode($header->fetchsubject)); 231 231 232 imap_close($this->mbox_stream); 232 233 if (!$fileName) { 233 234 return false; 234 235 }else{ 235 return $tempDir.'/'.$fileName; 236 $return = array(); 237 $return[] = $tempDir.'/'.$fileName; 238 $return[] = $subject; 239 return $return; 236 240 } 237 241 } … … 271 275 } 272 276 273 return $file; 277 return $file; 274 278 275 279 //exporta mensagens de diferentes pastas … … 362 366 $file = false; 363 367 } 364 365 368 return $file; 366 369 … … 369 372 { 370 373 $this-> folder = $params['folder']; 371 374 $this->folder = mb_convert_encoding($this->folder, "UTF7-IMAP","UTF-8, ISO-8859-1, UTF7-IMAP"); 372 375 $array_ids = explode(',', $params['msgs_to_export']); 373 376 $error = False; … … 383 386 $sEMLData = $this->parseEml($header, $body); 384 387 $fileName = $this->CreateFileEml($sEMLData, $tempDir, $array_ids[0]."_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]); 388 389 $header = imap_headerinfo($this->mbox_stream, imap_msgno($this->mbox_stream, $array_ids[0]), 80, 255); 390 $subject = $this->decode_subject(html_entity_decode($header->fetchsubject)); 385 391 386 392 imap_close($this->mbox_stream); … … 388 394 return false; 389 395 } else { 390 return $tempDir.'/'.$fileName; 396 $return = array(); 397 $return[] = $tempDir.'/'.$fileName; 398 $return[] = $subject; 399 return $return; 391 400 } 392 401 } … … 424 433 $file = false; 425 434 } 426 427 435 return $file; 428 436 } … … 453 461 $fileName = $this->CreateFileEml($sEMLData, $tempDir, $array_ids[0]."_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]); 454 462 463 $header = imap_headerinfo($this->mbox_stream, imap_msgno($this->mbox_stream, $array_ids[0]), 80, 255); 464 $subject = $this->decode_subject(html_entity_decode($header->fetchsubject)); 465 455 466 imap_close($this->mbox_stream); 456 467 if (!$fileName) { 457 468 return false; 458 469 } else { 459 return $tempDir.'/'.$fileName; 470 $return = array(); 471 $return[] = $tempDir.'/'.$fileName; 472 $return[] = $subject; 473 return $return; 460 474 } 461 475 } -
trunk/expressoMail1_2/js/common_functions.js
r6707 r6860 825 825 var num_msg = id_msg.substr(0,(id_msg.length - 2)); 826 826 var handler_source = function(data){ 827 download_attachments(null, null, data , null,null,'fonte_da_mensagem.eml');827 download_attachments(null, null, data[0], null,null,data[1]+'.eml'); 828 828 } 829 829 cExecute("$this.exporteml.export_msg",handler_source,"folder="+url_decode(folder)+"&msgs_to_export="+num_msg); -
trunk/expressoMail1_2/js/main.js
r6856 r6860 534 534 var confNotification = confirm(get_lang("The sender:\n%1\nwaits your notification of reading. Do you want to confirm this?",Base64.decode(msg_info.DispositionNotificationTo)), ""); 535 535 536 if (confNotification) 537 cExecute ("$this.imap_functions.send_notification¬ificationto="+msg_info.DispositionNotificationTo+"&date="+msg_info.udate+"&subject="+url_encode(msg_info.subject), handler_sendNotification); 536 if (confNotification) { 537 /* Adequação a nova funcionalidade. Agora, a confirmação de leitura é uma preferência do usuário. */ 538 if(preferences.confirm_read_message) { 539 $.Zebra_Dialog(get_lang("Would you like to send the read receipt?"), { 540 'type': 'question', 541 'title': get_lang('Read receipt'), 542 'buttons': [get_lang("Yes"), get_lang("No")], 543 'overlay_opacity' : 0.5, 544 'onClose': function(caption) { 545 if(caption == get_lang("Yes")) 546 cExecute ("$this.imap_functions.send_notification¬ificationto="+msg_info.DispositionNotificationTo+"&date="+msg_info.udate+"&subject="+url_encode(msg_info.subject), handler_sendNotification); 547 else 548 write_msg(get_lang("Confirmation message is not sent")); 549 } 550 }); 551 } 552 else 553 cExecute ("$this.imap_functions.send_notification¬ificationto="+msg_info.DispositionNotificationTo+"&date="+msg_info.udate+"&subject="+url_encode(msg_info.subject), handler_sendNotification); 554 } 555 538 556 } 539 557 //Change msg class to read. … … 2689 2707 } 2690 2708 //stringEmail = content.find('[name="input_to"]').val(); 2709 2691 2710 var stringEmail = ""; 2692 2711 var stringToEmail = ""; … … 3491 3510 else{ 3492 3511 var filename = 'mensagens.zip'; 3493 if (data .match(/\.eml$/gi)) {3494 filename = 'fonte_da_mensagem.eml';3512 if (data[0].match(/\.eml$/gi)) { 3513 filename = data[1]+'.eml'; 3495 3514 } 3496 3515 download_attachments(null, null, data, null,null,filename); … … 3869 3888 wfolders.makeWindow('null','import'); 3870 3889 } 3871 function import_calendar(data){ 3872 var import_url = '$this.db_functions.import_vcard&msg_folder='+data; 3873 var logUser; 3874 var up; 3875 var owner; 3876 3877 //Verifica o contexto de importação 3878 var decodeOwner = function(){ 3879 3890 3891 function decodeOwner(){ 3880 3892 owner = User.me.id; 3881 3893 var imapBox = openTab.imapBox[currentTab].split(cyrus_delimiter); … … 3883 3895 var user = DataLayer.get('user', {filter: ['=','uid',imapBox[1]]}); 3884 3896 owner = $.isArray(user) ? user[0].id : user.id; 3885 } 3886 3897 } 3887 3898 return owner; 3888 } 3889 3899 } 3900 function import_calendar(data){ 3901 var import_url = '$this.db_functions.import_vcard&msg_folder='+data; 3902 var logUser; 3903 var up; 3904 var owner; 3890 3905 function handler_import_calendar(data){ 3891 3906 if(data === true){ -
trunk/prototype/modules/filters/interceptors/FilterMapping.php
r6813 r6860 252 252 $require_vacation = true; 253 253 $action[$k]['parameter'] = "\"" . $action[$k]['parameter'] . "\""; 254 $vacation_action = ' :subject "Fora do Escritó rio" ' . $action[$k]['parameter'] . ";";254 $vacation_action = ' :subject "Fora do Escritório" ' . $action[$k]['parameter'] . ";"; 255 255 $vacation = true; 256 256 continue;
Note: See TracChangeset
for help on using the changeset viewer.