Changeset 5243 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

12/12/11 15:35:26 (12 years ago)

Author:

gustavo

Message:

Ticket #2375 - Verificar problema ao alternar entre a interface web/mobile

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -2459 +2459 @@
                 
                 $quotaInfo =  (!isset($params['noQuotaInfo'])) ? $this->get_quota( array('folder_id' => $currentFolder)) : false; //VERIFICA SE O USUARIO TEM COTA
-                
+
                 return ( ( is_array($quotaInfo) ) ?  array_merge($return, $quotaInfo) : $return );        
         }
@@ -3263 +3263 @@
         }
 
-        function add_recipients($recipient_type, $full_address, $mail)
+        function add_recipients($recipient_type, $full_address, $mail, $mobile = false)
         {
                 //remove a comma if is given two unexpected commas
@@ -3269 +3269 @@
                 $parse_address = imap_rfc822_parse_adrlist($full_address, "");
                 $bolean = true;
-                foreach ($parse_address as $val)
-                {
-                        //echo "<script language=\"javascript\">javascript:alert('".$val->mailbox."@".$val->host."');</script>";
-                        if ($val->mailbox == "INVALID_ADDRESS")
-                                continue;
-
-                        if (empty($val->personal))
+                if(!$mobile){
+                        foreach ($parse_address as $val)
                         {
-                                switch($recipient_type)
+                                //echo "<script language=\"javascript\">javascript:alert('".$val->mailbox."@".$val->host."');</script>";
+                                if ($val->mailbox == "INVALID_ADDRESS")
+                                        continue;
+
+                                if (empty($val->personal))
                                 {
-                                        case "to":
-                                                $mail->AddTo($val->mailbox."@".$val->host);
-                                                break;
-                                        case "cc":
-                                                $mail->AddCc($val->mailbox."@".$val->host);
-                                                break;
-                                        case "cco":
-                                                $mail->AddBcc($val->mailbox."@".$val->host);
-                                                break;
-                                }
-                        }
-                        else
+                                        switch($recipient_type)
+                                        {
+                                                case "to":
+                                                        $mail->AddTo($val->mailbox."@".$val->host);
+                                                        break;
+                                                case "cc":
+                                                        $mail->AddCc($val->mailbox."@".$val->host);
+                                                        break;
+                                                case "cco":
+                                                        $mail->AddBcc($val->mailbox."@".$val->host);
+                                                        break;
+                                        }
+                                }
+                                else
+                                {
+                                        switch($recipient_type)
+                                        {
+                                                case "to":
+                                                        $mail->AddTo($val->mailbox."@".$val->host, $val->personal);
+                                                        break;
+                                                case "cc":
+                                                        $mail->AddCc($val->mailbox."@".$val->host, $val->personal);
+                                                        break;
+                                                case "cco":
+                                                        $mail->AddBcc($val->mailbox."@".$val->host, $val->personal);
+                                                        break;
+                                        }
+                                }
+                                if($val->mailbox == "UNEXPECTED_DATA_AFTER_ADDRESS"){
+                                        $bolean = false;
+                                }
+                                
+                        }
+                }else{
+                        foreach ($parse_address as $val)
                         {
-                                switch($recipient_type)
+                                //echo "<script language=\"javascript\">javascript:alert('".$val->mailbox."@".$val->host."');</script>";
+                                if ($val->mailbox == "INVALID_ADDRESS")
+                                        continue;
+
+                                if (empty($val->personal))
                                 {
-                                        case "to":
-                                                $mail->AddTo($val->mailbox."@".$val->host, $val->personal);
-                                                break;
-                                        case "cc":
-                                                $mail->AddCc($val->mailbox."@".$val->host, $val->personal);
-                                                break;
-                                        case "cco":
-                                                $mail->AddBcc($val->mailbox."@".$val->host, $val->personal);
-                                                break;
-                                }
-                        }
-                        if($val->mailbox == "UNEXPECTED_DATA_AFTER_ADDRESS"){
-                                $bolean = false;
-                }
-                        
+                                        switch($recipient_type)
+                                        {
+                                                case "to":
+                                                        $mail->AddAddress($val->mailbox."@".$val->host);
+                                                        break;
+                                                case "cc":
+                                                        $mail->AddCC($val->mailbox."@".$val->host);
+                                                        break;
+                                        }
+                                }
+                                else
+                                {
+                                        switch($recipient_type)
+                                        {
+                                                case "to":
+                                                        $mail->AddAddress($val->mailbox."@".$val->host, $val->personal);
+                                                        break;
+                                                case "cc":
+                                                        $mail->AddCC($val->mailbox."@".$val->host, $val->personal);
+                                                        break;
+                                        }
+                                }
+                                if($val->mailbox == "UNEXPECTED_DATA_AFTER_ADDRESS"){
+                                        $bolean = false;
+                                }
+                                
+                        }
                 }
                 return $bolean;