Changeset 6833 for branches

Timestamp:

07/20/12 11:39:05 (12 years ago)

Author:

eduardow

Message:

Ticket #2969 - Correção de bug ao enviar e-mail com virgla entre aspas no nome.

Location:

branches/2.4/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/draw_api.js (modified) (3 diffs)

branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -2575 +2575 @@
             }
 
-            $toaddress = $db->getAddrs(explode(',', $params['input_to'])); //implode(',',);
-            $ccaddress = $db->getAddrs(explode(',', $params['input_cc'])); //implode(',',);
-            $ccoaddress = $db->getAddrs(explode(',', $params['input_cco'])); //implode(',',); 
+            /*Wraps the text dividing the emails as from ">,"*/ 
+            $toaddress = $db->getAddrs(preg_split('/>,/',preg_replace('/>,/', '>>,', $params['input_to'])));
+                $ccaddress = $db->getAddrs(preg_split('/>,/',preg_replace('/>,/', '>>,', $params['input_cc']))); 
+                $ccoaddress = $db->getAddrs(preg_split('/>,/',preg_replace('/>,/', '>>,', $params['input_cco']))); 
 
             if ($toaddress["False"] || $ccaddress["False"] || $ccoaddress["False"]) {

branches/2.4/expressoMail1_2/js/draw_api.js

@@ -2842 +2842 @@
         // fim
         // ALEXANDRE LUIZ CORREIA
-        if(info_msg.toaddress2 != null )
+        if(info_msg.toaddress2 != null)
         {
-                toaddress_array[ID] = info_msg.toaddress2.split(",");
+                toaddress_array[ID] = break_comma(info_msg.toaddress2);
 
                 if (toaddress_array[ID].length > 1)
@@ -3325 +3325 @@
          //window.setTimeout(function() { $("#div_message_scroll_"+ID).focus() },250);
 
+        /* 
+     * @AUTHOR Marcos Luiz Wilhelm 
+     * @DATE 2012/07/17 
+     * @BRIEF Break out emails only with comma out of quote marks 
+     */ 
+    function break_comma (originalText){ 
+            var quotesMarks = false; 
+            var completeString = ""; 
+            var brokenEmails = new Array(); 
+            originalText+=","; 
+            for(i=0; i<originalText.length; i++){ 
+                    var character = originalText.substr(i,1); 
+                    if(character == "\""){ 
+                            quotesMarks = !quotesMarks; 
+                    } 
+                    if(!quotesMarks){ 
+                            if(character == ","){ 
+                                    brokenEmails.push(completeString); 
+                                    completeString = ""; 
+                            } 
+                            else 
+                                    completeString+=character;       
+                    } 
+                    else 
+                            completeString+=character; 
+            } 
+            return brokenEmails; 
+    }
+
         function mailto( link )
         {
@@ -3688 +3717 @@
                         }
                         if(input.val() != ""){
+                                        if(e.keyCode == 188 && !e.shiftKey && input.val().split("\"").length > 1){ 
+                            return; 
+                    }
                                 if(e.keyCode != 9)
                                         e.preventDefault();