Changeset 6580

Timestamp:

06/22/12 16:20:14 (12 years ago)

Author:

acoutinho

Message:

Ticket #2899 - Problema ao criar um evento apartir de uma mensagem

Location:

trunk/expressoMail1_2

Files:

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

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

@@ -1402 +1402 @@
                 $return['login'] = $_SESSION['phpgw_info']['expressomail']['user']['account_id'];//$GLOBALS['phpgw_info']['user']['account_id'];
                 $return['reply_toaddress'] = $header->reply_toaddress;
-                
+                
                 if(($return['from']['email'] ==  '@unspecified-domain' || $return['sender']['email'] == null) && $return['msg_folder'] == 'INBOX/Drafts'){
                         $return['from']['email'] = "Rascunho";
                 }
-                if($return['toaddress2'] == 'undisclosed-recipients@, @'){
+
+                if(strpos($return['toaddress2'], 'undisclosed-recipients') !== false){
                         $return['toaddress2'] = $this->functions->getLang('without destination');
                 }  

trunk/expressoMail1_2/js/draw_api.js

@@ -3050 +3050 @@
                                                 
                                                 if( $.type(user) == "array")
-                                                                user = user[0];
+                                                    user = user[0];
+
+                                                if(typeof(user) != 'object')
+                                                    return (null);
 
                                                 if(!user)