- Timestamp:
- 07/20/12 11:39:05 (12 years ago)
- Location:
- branches/2.4/expressoMail1_2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php
r6831 r6833 2575 2575 } 2576 2576 2577 $toaddress = $db->getAddrs(explode(',', $params['input_to'])); //implode(',',); 2578 $ccaddress = $db->getAddrs(explode(',', $params['input_cc'])); //implode(',',); 2579 $ccoaddress = $db->getAddrs(explode(',', $params['input_cco'])); //implode(',',); 2577 /*Wraps the text dividing the emails as from ">,"*/ 2578 $toaddress = $db->getAddrs(preg_split('/>,/',preg_replace('/>,/', '>>,', $params['input_to']))); 2579 $ccaddress = $db->getAddrs(preg_split('/>,/',preg_replace('/>,/', '>>,', $params['input_cc']))); 2580 $ccoaddress = $db->getAddrs(preg_split('/>,/',preg_replace('/>,/', '>>,', $params['input_cco']))); 2580 2581 2581 2582 if ($toaddress["False"] || $ccaddress["False"] || $ccoaddress["False"]) { -
branches/2.4/expressoMail1_2/js/draw_api.js
r6754 r6833 2842 2842 // fim 2843 2843 // ALEXANDRE LUIZ CORREIA 2844 if(info_msg.toaddress2 != null 2844 if(info_msg.toaddress2 != null) 2845 2845 { 2846 toaddress_array[ID] = info_msg.toaddress2.split(",");2846 toaddress_array[ID] = break_comma(info_msg.toaddress2); 2847 2847 2848 2848 if (toaddress_array[ID].length > 1) … … 3325 3325 //window.setTimeout(function() { $("#div_message_scroll_"+ID).focus() },250); 3326 3326 3327 /* 3328 * @AUTHOR Marcos Luiz Wilhelm 3329 * @DATE 2012/07/17 3330 * @BRIEF Break out emails only with comma out of quote marks 3331 */ 3332 function break_comma (originalText){ 3333 var quotesMarks = false; 3334 var completeString = ""; 3335 var brokenEmails = new Array(); 3336 originalText+=","; 3337 for(i=0; i<originalText.length; i++){ 3338 var character = originalText.substr(i,1); 3339 if(character == "\""){ 3340 quotesMarks = !quotesMarks; 3341 } 3342 if(!quotesMarks){ 3343 if(character == ","){ 3344 brokenEmails.push(completeString); 3345 completeString = ""; 3346 } 3347 else 3348 completeString+=character; 3349 } 3350 else 3351 completeString+=character; 3352 } 3353 return brokenEmails; 3354 } 3355 3327 3356 function mailto( link ) 3328 3357 { … … 3688 3717 } 3689 3718 if(input.val() != ""){ 3719 if(e.keyCode == 188 && !e.shiftKey && input.val().split("\"").length > 1){ 3720 return; 3721 } 3690 3722 if(e.keyCode != 9) 3691 3723 e.preventDefault();
Note: See TracChangeset
for help on using the changeset viewer.