Changeset 6256 for sandbox/webservice

Timestamp:

05/21/12 16:05:22 (12 years ago)

Author:

niltonneto

Message:

Ticket #2507 - Implementadas as devidas validações para evitar retorno nulo.

File:

• sandbox/webservice/api/adapters/MailAdapter.php (modified) (2 diffs)

sandbox/webservice/api/adapters/MailAdapter.php

@@ -106 +106 @@
                 //$msg['msgDate']        =  $info_msg['fulldate'];
                 $msg['msgDate']  =  $info_msg['msg_day']." ".$info_msg['msg_hour'];
-
-                $msg['msgFrom']['fullName']     = $info_msg['from']['name'];
-                $msg['msgFrom']['mailAddress']  = $info_msg['from']['email'];           
-                $msg['msgSender']['fullName']   = $info_msg['sender']['name'];
-                $msg['msgSender']['mailAddress']= $info_msg['sender']['email'];
-                
-                $toaddresses = explode(",",$info_msg['toaddress2']);
-                if(count($toaddresses) > 1) {                           
-                        foreach ($toaddresses as $i => $toaddress){
-                                $msg['msgTo'][$i] = $this->formatMailObject($toaddress);                        
+                if($info_msg['from']) {
+                        $msg['msgFrom']['fullName']     = $info_msg['from']['name'];
+                        $msg['msgFrom']['mailAddress']  = $info_msg['from']['email'];
+                }
+                if($info_msg['sender'] != null){
+                        $msg['msgSender']['fullName']   = $info_msg['sender']['name'];
+                        $msg['msgSender']['mailAddress']= $info_msg['sender']['email'];
+                }               
+                if($info_msg['toaddress2'] != null){
+                        $toaddresses = explode(",",$info_msg['toaddress2']);
+                        if(count($toaddresses) > 1) {
+                                foreach ($toaddresses as $i => $toaddress){
+                                        $msg['msgTo'][$i] = $this->formatMailObject($toaddress);
+                                }
+                        }
+                        else{
+                                $msg['msgTo'][0] = $this->formatMailObject($info_msg['toaddress2']);
                         }
                 }
-                else{
-                        $msg['msgTo'][0] = $this->formatMailObject($info_msg['toaddress2']);
-                }
-                        
-                $ccaddresses = explode(",",$info_msg['cc']);
-                if(count($ccaddresses) > 1) {           
-                        foreach ($ccaddresses as $i => $ccaddress){
-                                $msg['msgCC'][$i] = $this->formatMailObject($ccaddress);
+                if($info_msg['cc'] != null) {
+                        $ccaddresses = explode(",",$info_msg['cc']);
+                        if(count($ccaddresses) > 1) {
+                                foreach ($ccaddresses as $i => $ccaddress){
+                                        $msg['msgCC'][$i] = $this->formatMailObject($ccaddress);
+                                }
                         }
-                }
-                else{
-                        $msg['msgCC'][0] = $this->formatMailObject($info_msg['cc']);
-                }
-                
-
-                $msg['msgReplyTo'][0] = $this->formatMailObject($info_msg['reply_toaddress']);                                          
-                $msg['msgSubject']  = mb_convert_encoding($info_msg['subject'],"UTF8", "ISO_8859-1");           
+                        else{
+                                $msg['msgCC'][0] = $this->formatMailObject($info_msg['cc']);
+                        }
+                }               
+                if($info_msg['reply_toaddress'] != null) {
+                        $msg['msgReplyTo'][0] = $this->formatMailObject($info_msg['reply_toaddress']);
+                }                                               
+                $msg['msgSubject']  = ($info_msg['subject'] ? mb_convert_encoding($info_msg['subject'],"UTF8", "ISO_8859-1") : "");             
                 $msg['msgHasAttachments'] = $info_msg['attachments'] ? "1" : "0";               
                 $msg['msgAttachments'] = $info_msg['attachments'];              
@@ -143 +148 @@
                 $msg['msgSeen']         = $info_msg['Unseen'] == "U" ? "0" : "1";                               
                 $msg['msgSize']         = $info_msg['Size'];
-                $msg['msgBody']         = mb_convert_encoding($info_msg['body'],"UTF8", "ISO_8859-1");          
+                $msg['msgBody']         = ($info_msg['body'] ? mb_convert_encoding($info_msg['body'],"UTF8", "ISO_8859-1") : "");               
                 
                 return $msg;