- Timestamp:
- 10/10/12 11:29:09 (11 years ago)
- Location:
- sandbox/2.5.0-expresso1
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.5.0-expresso1/expressoMail1_2/inc/class.exporteml.inc.php
r7262 r7401 576 576 imap_close($this->mbox_stream); 577 577 578 if(!strpos($header,"Date: ")){ 579 $header = "Date: " . date("d-M-Y H:i:s") . "\r\n" .$header ; 580 } 581 578 582 $input = $header . "\r\n\r\n" . $body; 579 583 $input = preg_replace('/\x1d/', '', $input); //remove special char control detected (hex 1D) -
sandbox/2.5.0-expresso1/expressoMail1_2/inc/class.imap_functions.inc.php
r7352 r7401 3135 3135 3136 3136 3137 $mailService->addHeaderField('Date', date("d-M-Y H:i:s")); 3138 3137 3139 if ($folder != 'null') { 3138 3140 $mbox_stream = $this->open_mbox($folder); -
sandbox/2.5.0-expresso1/expressoMail1_2/js/draw_api.js
r7376 r7401 2049 2049 else 2050 2050 { 2051 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;2051 td_element4.innerHTML += ($.trim(headers_msgs.subject) == "" ? "("+get_lang("No Subject")+")" : 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; 2052 2052 } 2053 2053 … … 2599 2599 var _maxChar = menuHidden ? 40 : 15; 2600 2600 2601 if (info_msg.from.name) 2602 { 2603 var spanName = document.createElement("SPAN"); 2604 spanName.innerHTML = info_msg.from.name; 2605 _name = spanName.innerHTML.length > _maxChar ? spanName.innerHTML.substring(0,_maxChar) + "..." : spanName.innerHTML; 2606 } 2607 else 2608 _name = info_msg.from.email.length > _maxChar ? info_msg.from.email.substring(0,_maxChar) + "..." : info_msg.from.email; 2601 if(info_msg.from){ 2602 if (info_msg.from.name) 2603 { 2604 var spanName = document.createElement("SPAN"); 2605 spanName.innerHTML = info_msg.from.name; 2606 _name = spanName.innerHTML.length > _maxChar ? spanName.innerHTML.substring(0,_maxChar) + "..." : spanName.innerHTML; 2607 } 2608 else 2609 _name = info_msg.from.email.length > _maxChar ? info_msg.from.email.substring(0,_maxChar) + "..." : info_msg.from.email; 2610 } 2609 2611 2610 2612 td.innerHTML = _name.bold() + ', ' + info_msg.smalldate; … … 3171 3173 var tr1 = document.createElement("TR"); 3172 3174 tr1.className = "tr_message_header"; 3173 var td1 = document.createElement("TD"); 3174 td1.innerHTML = get_lang("From: "); 3175 td1.appendChild(deny_email(info_msg.from.email)); 3176 td1.width = "7%"; 3175 if(info_msg.from){ 3176 var td1 = document.createElement("TD"); 3177 td1.innerHTML = get_lang("From: "); 3178 td1.appendChild(deny_email(info_msg.from.email)); 3179 td1.width = "7%"; 3180 } 3177 3181 3178 3182 if (info_msg.sender){ … … 3199 3203 var from = document.createElement("TD"); 3200 3204 from.id = "from_"+ID; 3201 from.innerHTML = info_msg.from.full; 3205 if(info_msg.from){ 3206 from.innerHTML = info_msg.from.full; 3207 } 3202 3208 if (info_msg.Draft != "X"){ 3203 3209 from.innerHTML += draw_plugin_cc(ID, info_msg.from); … … 3208 3214 from_values.id = "from_values_"+ID; 3209 3215 from_values.type = "HIDDEN"; 3210 from_values.value = info_msg.from.full; //Veio do IMAP, sem images nem links. 3216 if(info_msg.from){ 3217 from_values.value = info_msg.from.full; //Veio do IMAP, sem images nem links. 3218 } 3211 3219 3212 3220 var local_message = document.createElement("INPUT"); … … 3216 3224 local_message.value = (info_msg.local_message)?"1":"0"; 3217 3225 3218 tr1.appendChild(td1); 3226 if(info_msg.from){ 3227 tr1.appendChild(td1); 3228 } 3219 3229 tr1.appendChild(from); 3220 3230 tr1.appendChild(from_values); -
sandbox/2.5.0-expresso1/prototype/services/ImapServiceAdapter.php
r7044 r7401 611 611 $mailService->addHeaderField('Message-Id', UUID::generate( UUID::UUID_RANDOM, UUID::FMT_STRING ) . '@Draft'); 612 612 $mailService->addHeaderField('Reply-To', mb_convert_encoding(($data['input_reply_to']), 'ISO-8859-1', 'UTF-8,ISO-8859-1')); 613 $mailService->addHeaderField('Date', date("d-M-Y H:i:s")); 613 614 $mailService->addTo(mb_convert_encoding(($data['input_to']), 'ISO-8859-1', 'UTF-8,ISO-8859-1')); 614 615 $mailService->addCc( mb_convert_encoding(($data['input_cc']), 'ISO-8859-1', 'UTF-8,ISO-8859-1'));
Note: See TracChangeset
for help on using the changeset viewer.