Changeset 1752
- Timestamp:
- 12/04/09 15:14:45 (14 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r1751 r1752 90 90 { 91 91 $temp = $this->get_info_head_msg($msg_number); 92 $temp['msg_sample'] = $this->get_msg_sample($msg_number,$folder); 92 93 if(!$temp) 94 { 93 95 return false; 96 } 94 97 95 98 $return[$i] = $temp; … … 704 707 $return['login'] = $_SESSION['phpgw_info']['expressomail']['user']['account_id'];//$GLOBALS['phpgw_info']['user']['account_id']; 705 708 $return['reply_toaddress'] = $header->reply_toaddress; 709 return $return; 710 } 711 712 function get_msg_sample($msg_number,$folder) 713 { 714 715 716 include_once("class.message_components.inc.php"); 717 $msg = &new message_components($this->mbox); 718 $msg->fetch_structure($msg_number); 719 $return = ""; 720 721 if( (isset($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['preview_msg_subject']) && ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['preview_msg_subject'] == "0")) && (isset($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['preview_msg_tip']) && ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['preview_msg_tip'] == "0")) ) 722 { 723 // $return['preview_msg_subject'] = ""; 724 // $return['preview_msg_tip'] = ""; 725 $return['body'] = ""; 726 return $return; 727 /*} else{ 728 if( isset($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['preview_msg_subject']) && ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['preview_msg_subject'] == "0") ) 729 { 730 $return['preview_msg_subject'] = ""; 731 } 732 733 if( isset($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['preview_msg_tip']) && ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['preview_msg_tip'] == "0") ) 734 { 735 $return['preview_msg_tip'] = ""; 736 } 737 */ 738 } 739 740 741 742 if(!$msg->structure[$msg_number]->parts) 743 { 744 $content = ''; 745 if (strtolower($msg->structure[$msg_number]->subtype) == "plain" || strtolower($msg->structure[$msg_number]->subtype) == "html") 746 { 747 $content = $this->decodeBody(imap_body($this->mbox, $msg_number, FT_UID|FT_PEEK), $msg->encoding[$msg_number][0], $msg->charset[$msg_number][0]); 748 } 749 } 750 else 751 { 752 foreach($msg->pid[$msg_number] as $values => $msg_part) 753 { 754 755 $file_type = strtolower($msg->file_type[$msg_number][$values]); 756 if($file_type == "text/plain" || $file_type == "text/html") { 757 $content = $this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID|FT_PEEK), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]); 758 break; 759 } 760 } 761 } 762 $content = $this->replace_special_characters($content); 763 $tags_replace = array("<br>","<br/>","<br />"); 764 $content = str_replace($tags_replace," ", $content); 765 $content = strip_tags($content); 766 $content = str_replace(array("{","}"," "), " ", $content); 767 $content = trim($content); 768 $content = substr($content,0,300); 769 $content != "" ? $return['body'] = " - " . $content: $return['body'] = ""; 706 770 return $return; 707 771 } … … 1374 1438 $flag = preg_match('/importance *: *(.*)\r/i', $tempHeader, $importance); 1375 1439 $return[$i]['Importance'] = $flag==0?"Normal":$importance[1]; 1440 1441 $msg_sample = $this->get_msg_sample($msg_number); 1442 $return[$i]['msg_sample'] = $msg_sample; 1376 1443 1377 1444 $header = $this->get_header($msg_number); -
trunk/expressoMail1_2/inc/hook_settings.inc.php
r1747 r1752 73 73 74 74 create_select_box('What is the maximum number of messages per page?','max_email_per_page',$default,'This is the number of messages shown in your mailbox per page'); 75 76 //$default = 0; 77 create_check_box('Preview message text within subject column','preview_msg_subject','this exhibits a sample of message within the message subject column'); 78 79 //$default = 0; 80 create_check_box('Preview message text within a tool-tip box','preview_msg_tip','this exhibits a sample of message within a tool-tip box'); 81 82 75 83 create_check_box('Save deleted messages in trash folder?','save_deleted_msg','When delete message, send it automatically to trash folder'); 76 84 $default = array( -
trunk/expressoMail1_2/js/draw_api.js
r1747 r1752 299 299 300 300 draw_paging(Element('tot_m').innerHTML); 301 302 if(document.getElementById("nINBOX/Trashtree_folders")) 303 { 304 var trash = document.createElement("SPAN"); 305 trash.id = 'empty_trash'; 306 trash.className = 'clean_trash'; 307 trash.style.cursor = 'pointer'; 308 trash.onclick = function () {empty_trash_imap();}; 309 trash.innerHTML = "["+get_lang("Clean")+"]"; 310 trash.title="Limpar lixeira"; 311 trash.onmouseover = function() {trash.style.color="red";}; 312 trash.onmouseout= function() {trash.style.color="#666666";}; //#114FA4 313 document.getElementById("nINBOX/Trashtree_folders").appendChild(trash); 314 } 315 301 316 // Draw right menu folders. 302 317 /* … … 417 432 return true; 418 433 } 419 proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort_box_type,search_box_type,sort_box_reverse, handler_draw_box);434 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); 420 435 // 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_box_type+ "&search_box_type="+ search_box_type +"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box); 421 436 } … … 483 498 if(current_page != 1) { 484 499 lnk_page = document.createElement("A"); 485 lnk_page.setAttribute("href", "javascript:current_page=1;kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+", function handler(data){draw_box(data, get_current_folder());});");500 lnk_page.setAttribute("href", "javascript:current_page=1;kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+","+preferences.preview_msg_subject+","+preferences.preview_msg_tip+",function handler(data){draw_box(data, get_current_folder());});"); 486 501 } 487 502 else { … … 522 537 msg_range_begin = ((i*preferences.max_email_per_page)-(preferences.max_email_per_page-1)); 523 538 msg_range_end = (i*preferences.max_email_per_page); 524 lnk_page.setAttribute("href", "javascript:current_page="+i+";kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+", function handler(data){draw_box(data, get_current_folder());});");539 lnk_page.setAttribute("href", "javascript:current_page="+i+";kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+","+preferences.preview_msg_subject+","+preferences.preview_msg_tip+",function handler(data){draw_box(data, get_current_folder());});"); 525 540 } 526 541 … … 539 554 msg_range_begin = ((total_pages*preferences.max_email_per_page)-(preferences.max_email_per_page-1)); 540 555 msg_range_end = (total_pages*preferences.max_email_per_page); 541 lnk_page.setAttribute("href", "javascript:current_page="+total_pages+";kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+", function handler(data){draw_box(data, get_current_folder());});");556 lnk_page.setAttribute("href", "javascript:current_page="+total_pages+";kill_current_box(); draw_paging("+num_msgs+"); proxy_mensagens.messages_list(get_current_folder(),"+msg_range_begin+","+msg_range_end+",'"+sort_box_type+"','"+search_box_type+"',"+sort_box_reverse+","+preferences.preview_msg_subject+","+preferences.preview_msg_tip+",function handler(data){draw_box(data, get_current_folder());});"); 542 557 } 543 558 else { … … 783 798 tr_element.id = headers_msgs.msg_number; 784 799 800 tr_element.msg_sample = ""; 801 //if(headers_msgs.msg_sample && headers_msgs.msg_sample.preview_msg_subject != "") 802 if(headers_msgs.msg_sample && preferences.preview_msg_subject == "1") 803 { 804 tr_element.msg_sample = headers_msgs.msg_sample.body.substr(0,120) + "..."; //trecho do body que sera exibido com o assunto; 805 } 806 807 tr_element.tip = ""; 808 if(headers_msgs.msg_sample && preferences.preview_msg_tip == "1") 809 { 810 tr_element.tip = headers_msgs.msg_sample.body.substr(3,300) + "..."; //trecho do body que sera exibido no tool-tip; 811 } 812 785 813 if ((headers_msgs.Unseen == 'U') || (headers_msgs.Recent == 'N')){ 786 814 if ((headers_msgs.Flagged == 'F') || (headers_msgs.Importance.toLowerCase().indexOf("high")!=-1 && parseInt(preferences.use_important_flag))) … … 899 927 td_element3.className = "td_msg"; 900 928 td_element3.id = "td_who_"+ headers_msgs.msg_number; 901 td_element3.setAttribute("width", " 30%");929 td_element3.setAttribute("width", "20%"); 902 930 var _onclick = function(){InfoContact.hide();proxy_mensagens.get_msg(headers_msgs.msg_number, msg_folder,true, show_msg);}; 903 931 td_element3.onclick = _onclick; … … 942 970 td_element4 = document.createElement("TD"); 943 971 td_element4.className = "td_msg"; 944 td_element4.setAttribute("width", " 40%");972 td_element4.setAttribute("width", "50%"); 945 973 td_element4.onclick = _onclick; 946 td_element4.innerHTML = !is_ie ? "<a id='a_message_"+tr_element.id+"'> " : " "; 974 // td_element4.setAttribute("style","white-space:nowrap;"); 975 td_element4.innerHTML = !is_ie ? "<a nowrap id='a_message_"+tr_element.id+"'> " : " "; 947 976 948 977 if ((headers_msgs.subject)&&(headers_msgs.subject.length > 50)) 949 td_element4.innerHTML += headers_msgs.subject.substring(0,50) + "..."; 978 { 979 // if( (headers_msgs.subject.length+tr_element.msg_sample.length)> 980 td_element4.innerHTML += headers_msgs.subject.substring(0,50) + "..." + "<span style=\"color:#b3b3b3;\"> " + tr_element.msg_sample +"</span>";//modificacao feita para exibir o trecho do body ao lado do assunto da mensagem; 981 } 950 982 else 951 td_element4.innerHTML += headers_msgs.subject; 983 { 984 td_element4.innerHTML += headers_msgs.subject + "<span style=\"color:#b3b3b3;\"> " + tr_element.msg_sample + "</span>";//modificacao feita para exibir o trecho do body ao lado do assunto da mensagem; 985 } 952 986 987 td_element4.title=tr_element.tip; 953 988 if(!is_ie){ 954 989 td_element4.innerHTML += "</a>"; 955 tr_element.onmouseover = function(){};956 990 } 957 991 … … 1020 1054 search_box_type = search; 1021 1055 1022 proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort,search,sort_box_reverse, handler_draw_box);1056 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); 1023 1057 current_page = 1; 1024 1058 //Comentado para nao sobrepor o numero de msgs nao lidas ao utilizar os filtros -
trunk/expressoMail1_2/js/local_messages.js
r1747 r1752 445 445 var head = rs.field(1); 446 446 var codigoMail = rs.field(0); 447 448 var msg_body = rs.field(5);//recebe o conteudo da coluna "body" do banco de dados; 449 447 450 var rs2 = this.dbGears.execute('select count(*) from anexo where id_mail = '+codigoMail); 448 451 var head_unserialized = connector.unserialize(head); … … 451 454 head_unserialized.Unseen = 'U'; 452 455 456 457 head_unserialized.subject=(head_unserialized.subject==null)?"":head_unserialized.subject; 458 453 459 //var email_unserialized = connector.unserialize(email); 454 460 retorno[cont] = head_unserialized; 455 461 retorno[cont]['msg_number'] = codigoMail; 456 462 463 //declaracao do array() para receber o body de cada mensagem encontrada na busca sql realizada; 464 msg_body=this.strip_tags(msg_body); 465 msg_body=msg_body.replace(/\ /ig," "); 466 retorno[cont]['msg_sample'] = new Array(); 467 468 if( (preview_msg_subject == 0) && (preview_msg_tip == 0) ) 469 { 470 retorno[cont]['msg_sample']['body'] = ""; 471 } 472 else 473 { 474 retorno[cont]['msg_sample']['body'] = " - " + msg_body.substr(3,300); 475 } 476 457 477 cont++; 458 478 rs.next(); … … 1046 1066 while(rs.isValidRow()){ 1047 1067 mail = connector.unserialize(rs.field(0)); 1048 src = this.get_src(mail.url_export_file);1068 mail.msg_source?src = mail.msg_source:src = this.get_src(mail.url_export_file); 1049 1069 subject = rs.field(1); 1050 1070 mesgs += src; … … 1086 1106 msgs_to_export[j]=rs.field(2) 1087 1107 mail = connector.unserialize(rs.field(0)); 1088 m sg=this.get_src(mail.url_export_file);1108 mail.msg_source?src = mail.msg_source:src = this.get_src(mail.url_export_file); 1089 1109 subject = rs.field(1); 1090 1110 mesgs += msg; -
trunk/expressoMail1_2/js/messages_proxy.js
r1691 r1752 9 9 * Retorna os cabeçalhos das mensagens a serem desenhadas na caixa de email. 10 10 */ 11 messages_proxy.prototype.messages_list = function(folder,msg_range_begin,emails_per_page,sort_box_type,search_box_type,sort_box_reverse, call_back) {11 messages_proxy.prototype.messages_list = function(folder,msg_range_begin,emails_per_page,sort_box_type,search_box_type,sort_box_reverse,preview_msg_subject,preview_msg_tip,call_back) { 12 12 if(this.is_local_folder(folder)) { 13 13 var real_folder = folder.substr(6); 14 var msgs = expresso_local_messages.get_local_range_msgs(real_folder,msg_range_begin,preferences.max_email_per_page,sort_box_type,sort_box_reverse,search_box_type );14 var msgs = expresso_local_messages.get_local_range_msgs(real_folder,msg_range_begin,preferences.max_email_per_page,sort_box_type,sort_box_reverse,search_box_type,preferences.preview_msg_subject,preferences.preview_msg_tip); 15 15 eval('call_back(msgs)'); 16 16 }else {
Note: See TracChangeset
for help on using the changeset viewer.