Changeset 13 for trunk/expressoMail1_2
- Timestamp:
- 04/10/07 10:21:10 (17 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/docs/change_log.txt
r12 r13 61 61 em outro parametro não padrão. 62 62 - Adicionada funcionalidade que compatibiliza mensagens encapsuladas, e com formato 7bit, serem visualizadas no ExpressoMail. 63 64 09/04/2007 - [1.2030] 65 - Implementado mesma funcionalidade do expandir Campo "Para" para o campo "CC", abrir uma mensagem. O objetivo é evitar travamento 66 do navegador quando existem muito destinatários a serem expandidos com o plugin do Contact Center. 67 - Corrigido problema de mensagens que têm nome de arquivos nos atributos "parameters" e "dparameters" de sua estrutura. 68 -
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r12 r13 588 588 */ 589 589 // HTML Filter 590 //$body = preg_replace("#(^|[\n ])([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=# onclick=\"javascript:new_message('new_by_message', '\\2@\\3')\">\\2@\\3</a>", $body); 591 590 //$body = preg_replace("#(^|[\n ])([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=# onclick=\"javascript:new_message('new_by_message', '\\2@\\3')\">\\2@\\3</a>", $body); 592 591 $body = str_replace("\r\n", "\n", $body); 593 592 if ($encoding == 'quoted-printable') 594 593 { 594 595 595 for($i=0;$i<256;$i++) { 596 596 $c1=dechex($i); … … 611 611 $body = base64_decode($body); 612 612 } 613 else if ($encoding == '7bit')613 /*else if ($encoding == '7bit') 614 614 { 615 $body = quoted_printable_decode($body); 616 } 615 $body = quoted_printable_decode($body); 616 }*/ 617 617 // All other encodings are returned raw. 618 618 if (strtolower($charset) == "utf-8") … … 692 692 // It no has exception,then open the link in new window. 693 693 if(!count($matches)){ 694 $body = @eregi_replace("<a href=", "<a target='_blank' href=", $body); 694 $body = @eregi_replace("<a (.*) href=", "<a \\1 target='_blank' href=", $body); 695 $body = @str_replace("<a href=", "<a target='_blank' href=", $body); 695 696 $body = @eregi_replace("target=\"\"", "target='_blank'", $body); 696 697 $body = @eregi_replace("target=''", "target='_blank'", $body); … … 1501 1502 $str = ereg_replace('"', '"', $str); 1502 1503 $str = ereg_replace('\'', ''', $str); 1504 1503 1505 $str = ereg_replace('<', '<', $str); 1504 1506 $str = ereg_replace('>', '>', $str); -
trunk/expressoMail1_2/inc/class.message_components.inc.php
r10 r13 127 127 $this->charset[$mid][$n] = $charset; 128 128 $this->fsize[$mid][$n] = (!isset($parts[$p]->bytes) || empty($parts[$p]->bytes))? 0 : $parts[$p]->bytes; 129 129 $hasAttachment = false; 130 130 # Force inline disposition if none is present 131 131 //if ($parts[$p]->ifdisposition == true) … … 144 144 { 145 145 $this->fname[$mid][$n] = $param->value; 146 $hasAttachment = true; 146 147 break; 147 } 148 } 148 149 } 149 150 } 150 151 151 152 // Alguns web-mails utilizam o parameters 152 if ($parts[$p]->ifparameters == true )153 if ($parts[$p]->ifparameters == true && !$hasAttachment) 153 154 { 154 155 $params = $parts[$p]->parameters; … … 170 171 if(strtolower($param->attribute) == 'charset'){ 171 172 if($this->charset[$mid][$n] == '') 172 $this->charset[$mid][$n] = $param->value; 173 $this->charset[$mid][$n] = $param->value; 173 174 } 174 175 } … … 224 225 } 225 226 226 $this->encoding[$mid][0] 227 $this->encoding[$mid][0] = $this->encoding_types[$this->structure[$mid]->encoding]; 227 228 if(!preg_match("/5./",phpversion())) 228 229 $this->charset[$mid][0] = $this->structure[$mid]->parameters[0]->value; … … 250 251 } 251 252 } 253 if (isset($this->structure[$mid]->ifparameters)) 254 { 255 $params = $this->structure[$mid]->parameters; 256 $n = 0; 257 if($params) 258 foreach ($params as $param) 259 { 260 if(strtolower($param->attribute) == 'charset'){ 261 if($this->charset[$mid][$n] == '') 262 $this->charset[$mid][$n] = $param->value; 263 } 264 $n++; 265 } 266 } 252 267 $this->disposition[$mid][0] = $this->structure[$mid]->disposition; 253 268 //$this->disposition[$mid][0] = 'inline'; -
trunk/expressoMail1_2/index.php
r10 r13 4 4 'nonavbar' => False, 5 5 'currentapp' => 'expressoMail1_2', 6 'update_version' => '1.20 29',6 'update_version' => '1.2030', 7 7 'enable_nextmatchs_class' => True 8 8 ); … … 82 82 83 83 // Is IE ?? 84 echo "<SCRIPT>if ((!is_gecko) && (!is_ie6up)) {alert('OPSS !! Desculpe, mas seu navegador não suporta este WebMail. Instale o Mozilla FireFox 1.0+ ou Internet Explorer 6.0+. No momento, utilize a versão antiga do WebMail.');window.location=\"../email/\";}</SCRIPT>";84 //echo "<SCRIPT>if ((!is_gecko) && (!is_ie6up)) {alert('OPSS !! Desculpe, mas seu navegador não suporta este WebMail. Instale o Mozilla FireFox 1.0+ ou Internet Explorer 6.0+. No momento, utilize a versão antiga do WebMail.');window.location=\"../email/\";}</SCRIPT>"; 85 85 86 86 // Get Preferences or redirect to preferences page. -
trunk/expressoMail1_2/js/draw_api.js
r2 r13 956 956 div_toaddress.id = "div_toaddress_"+ID; 957 957 div_toaddress.style.display=""; 958 div_toaddress.innerHTML += " (<a STYLE='color: RED;' onclick=javascript:show_div_address_full('"+ID+"' );>"+get_lang('more')+"</a>)";958 div_toaddress.innerHTML += " (<a STYLE='color: RED;' onclick=javascript:show_div_address_full('"+ID+"','to');>"+get_lang('more')+"</a>)"; 959 959 to.appendChild(div_toaddress); 960 960 } … … 981 981 cc_values.value = info_msg.cc; 982 982 983 var ccaddress_array= info_msg.cc.split(",");984 if (ccaddress_array .length > 1){983 ccaddress_array[ID] = info_msg.cc.split(","); 984 if (ccaddress_array[ID].length > 1){ 985 985 var div_ccaddress = document.createElement("SPAN"); 986 986 div_ccaddress.id = "div_ccaddress_"+ID; 987 987 var div_ccaddress_full = document.createElement("SPAN"); 988 div_ccaddress_full.id = "div_ccaddress_full_"+ID; 989 988 div_ccaddress_full.id = "div_ccaddress_full_"+ID; 990 989 div_ccaddress.style.display=""; 991 cc.innerHTML = draw_plugin_cc(ID, ccaddress_array[0]); 992 div_ccaddress.innerHTML += " (<a STYLE='color: RED;' onclick=document.getElementById('div_ccaddress_"+ID+"').style.display='none';document.getElementById('div_ccaddress_full_"+ID+"').style.display='';>"+get_lang('more')+"</a>)"; 993 cc.appendChild(div_ccaddress); 994 div_ccaddress_full.style.display="none"; 995 996 for(idx = 1 ; idx < ccaddress_array.length;idx++) { 997 div_ccaddress_full.innerHTML += ', '; 998 div_ccaddress_full.innerHTML += draw_plugin_cc(ID, ccaddress_array[idx]); 999 } 1000 1001 div_ccaddress_full.innerHTML += " (<a STYLE='color: RED;' onclick=document.getElementById('div_ccaddress_full_"+ID+"').style.display='none';document.getElementById('div_ccaddress_"+ID+"').style.display='';>"+get_lang('less')+"</a>)"; 1002 cc.appendChild(div_ccaddress_full); 990 cc.innerHTML = draw_plugin_cc(ID, ccaddress_array[ID][0]); 991 div_ccaddress.innerHTML += " (<a STYLE='color: RED;' onclick=javascript:show_div_address_full('"+ID+"','cc');>"+get_lang('more')+"</a>)"; 992 cc.appendChild(div_ccaddress); 1003 993 } 1004 994 else{ … … 2102 2092 2103 2093 } 2104 function show_div_address_full(id ) {2105 var div_ toaddress_full = Element("div_toaddress_full_"+id);2106 if(!div_ toaddress_full) {2107 div_ toaddress_full = document.createElement("SPAN");2108 div_ toaddress_full.id = "div_toaddress_full_"+id;2109 div_ toaddress_full.style.display="none";2110 var toaddress = toaddress_array[id];2111 var isOverLimit = ( toaddress.length > 100);2094 function show_div_address_full(id, type) { 2095 var div_address_full = Element("div_"+type+"address_full_"+id); 2096 if(!div_address_full) { 2097 div_address_full = document.createElement("SPAN"); 2098 div_address_full.id = "div_"+type+"address_full_"+id; 2099 div_address_full.style.display="none"; 2100 var _address = eval(type+"address_array['"+id+"']"); 2101 var isOverLimit = (_address.length > 100); 2112 2102 2113 2103 if(isOverLimit) { 2114 alert("Esse campo possui muitos endereços ("+ toaddress.length+" destinatários).\r\n"+2104 alert("Esse campo possui muitos endereços ("+_address.length+" destinatários).\r\n"+ 2115 2105 "Para evitar o travamento do navegador, o botão 'Adicionar Contato' foi desabilitado!"); 2116 2106 } 2117 for(var idx = 1 ; idx < toaddress.length;idx++) { 2118 div_toaddress_full.innerHTML += isOverLimit ? '<br>'+toaddress[idx] : ','+draw_plugin_cc(id,toaddress[idx]); 2107 2108 for(var idx = 1 ; idx < _address.length;idx++) { 2109 div_address_full.innerHTML += isOverLimit ? '<br>'+_address[idx] : ','+draw_plugin_cc(id,_address[idx]); 2119 2110 } 2120 div_ toaddress_full.innerHTML += " (<a STYLE='color: RED;' onclick=document.getElementById('div_toaddress_full_"+id+"').style.display='none';document.getElementById('div_toaddress_"+id+"').style.display='';>"+get_lang('less')+"</a>)";2121 Element( "to_"+id).appendChild(div_toaddress_full);2122 } 2123 Element('div_ toaddress_'+id).style.display='none';2124 div_ toaddress_full.style.display='';2125 } 2111 div_address_full.innerHTML += " (<a STYLE='color: RED;' onclick=document.getElementById('div_"+type+"address_full_"+id+"').style.display='none';document.getElementById('div_"+type+"address_"+id+"').style.display='';>"+get_lang('less')+"</a>)"; 2112 Element(type+"_"+id).appendChild(div_address_full); 2113 } 2114 Element('div_'+type+'address_'+id).style.display='none'; 2115 div_address_full.style.display=''; 2116 } -
trunk/expressoMail1_2/js/globals.js
r2 r13 13 13 var array_lang = new Array(); 14 14 var cyrus_delimiter = ''; 15 var ccaddress_array = new Array(); 15 16 var toaddress_array = new Array(); 16 17 var tree_folders = '';
Note: See TracChangeset
for help on using the changeset viewer.