Changeset 3841 for branches/2.2/expressoMail1_2
- Timestamp:
- 03/01/11 15:08:12 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/expressoMail1_2/js/local_messages.js
r3806 r3841 7 7 this.localServer = null; 8 8 this.store = null; 9 this.filterSerch = ""; 9 10 } 10 11 … … 900 901 this.finalize(); 901 902 } 902 903 904 local_messages.prototype.setFilter = function(sFilter) 905 { 906 this.filterSerch = sFilter; 907 } 908 909 local_messages.prototype.getFilter = function() 910 { 911 return this.filterSerch; 912 } 913 903 914 local_messages.prototype.search = function(folders,sFilter) { 904 915 this.init_local_messages(); 916 this.setFilter(sFilter); 905 917 var filters = sFilter.replace(/^##|##$/g,"").split('##'); 906 918 var friendly_filters = new Array(); … … 978 990 sql += ")"; 979 991 var rs = this.dbGears.execute(sql); 980 var retorno = ""; 981 while(rs.isValidRow()) { 982 var header = connector.unserialize(rs.field(0)); 983 var date_formated = ""+header["udate"]; 984 /* Antigamente o udate vinha com o formato de data e foi alterado para vir o timestamp. 992 var retorno = []; 993 var numRec = 0; 994 995 while( rs.isValidRow() ) 996 { 997 var header = connector.unserialize( rs.field(0) ); 998 var date_formated = ( header["udate"] ).toString(); 999 /* 1000 * Antigamente o udate vinha com o formato de data e foi alterado para vir o timestamp. 985 1001 * Nesse caso, e-mails arquivados anteriormente usamos o udate, caso contrario, usamos o smalldate, 986 1002 * pois o udate agora vem como timestamp*/ 987 if(!date_formated.match(/\d{2}\/\d{2}\/\d{4}/)) 1003 if( !date_formated.match(/\d{2}\/\d{2}\/\d{4}/) ) 1004 { 988 1005 date_formated = header["smalldate"]; 989 retorno+="##"+"local_"+rs.field(1)+"--"+"local_"+rs.field(1)+"--"+header["from"]["name"]+"--"+escape(header["subject"])+"--"+date_formated+"--"+this.aux_convert_size(rs.field(3))+"--"+header["Unseen"]+header["Recent"]+header["Flagged"]+header["Draft"]+"--"+rs.field(2)+"##"; 1006 } 1007 1008 retorno[ numRec++ ] = 1009 { 1010 'from' : header["from"]["name"], 1011 'subject' : header["subject"], 1012 'udate' : date_formated, 1013 'size' : this.aux_convert_size(rs.field(3)), 1014 'flag' : header["Unseen"]+header["Recent"]+header["Flagged"]+header["Draft"], 1015 'boxname' : "local_"+rs.field(1), 1016 'uid' : rs.field(2) 1017 } 1018 990 1019 rs.next(); 991 1020 } 992 1021 993 1022 this.finalize(); 994 return retorno==""?false:retorno; 995 1023 1024 return ( retorno.length > 0 ) ? retorno : false ; 996 1025 } 997 1026 … … 1006 1035 } 1007 1036 1008 local_messages.prototype.aux_convert_filter_field = function(filter,date) { 1009 1010 var dateObj; 1011 if (typeof date != 'undefined'){ 1012 dateObj=new Date(date[2],date[1]-1,date[0]); 1037 local_messages.prototype.aux_convert_filter_field = function(filter,date) 1038 { 1039 var dateObj; 1040 1041 if (typeof date != 'undefined') 1042 { 1043 dateObj = new Date(date[2],date[1]-1,date[0]); 1013 1044 } 1014 1045
Note: See TracChangeset
for help on using the changeset viewer.