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

Timestamp:

10/07/08 14:50:11 (16 years ago)

Author:

niltonneto

Message:

Vide no Trac #344 - Melhorar tratamento de erros (parte 1)

File:

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

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

@@ -42 +42 @@
         {
                 $folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1");
-                $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password) or die(serialize(array('imap_error' => imap_last_error())));
+                $this->mbox = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password) or die(serialize(array('imap_error' => $this->parse_error(imap_last_error()))));
                 return $this->mbox;
          }
 
+        function parse_error($error){
+                // This error is returned from Imap.
+                if(strstr($error,'Connection refused')) {
+                        return str_replace("%1", $this->functions->getLang("Mail"), $this->functions->getLang("Connection failed with %1 Server. Try later."));
+                }
+                // This error is returned from Postfix.
+                elseif(strstr($error,'message file too big')) {
+                        return str_replace("%1", ini_get('upload_max_filesize'),$this->functions->getLang('The size of this message has exceeded  the limit (%1B).'));                  
+                }
+                // This condition verifies if SESSION is expired.
+                elseif(!count($_SESSION))                       
+                        return "nosession";
+
+                return $error;
+        }
+        
         function get_range_msgs2($params)
         {
@@ -833 +849 @@
                 }
 
-                //$mbox_stream = $this->open_mbox($folder);
-                $mbox_stream = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password) or die(serialize(array('imap_error' => imap_last_error())));
+                //$mbox_stream = $this->open_mbox($folder);             
+                $mbox_stream = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$folder, $this->username, $this->password) or die(serialize(array('imap_error' => $this->parse_error(imap_last_error()))));
                 
                 foreach ($msgs_number as $msg_number)
@@ -1259 +1275 @@
                         }
                         if( $total_uploaded_size > $upload_max_filesize)
-                                return 'false';                 
+                                return $this->parse_error("message file too big");                      
                 }                       
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1292 +1308 @@
                         $mail->ConfirmReadingTo = $_SESSION['phpgw_info']['expressomail']['user']['email'];
 ////////////////////////////////////////////////////////////////////////////////////////////////////
+
                 $sent = $mail->Send();
+                
                 if(!$sent)
                 {
-                        return $mail->ErrorInfo;
+                        return $this->parse_error($mail->ErrorInfo);
                 }
                 else
@@ -1536 +1554 @@
                                 $userID         = $_SESSION['phpgw_info']['expressomail']['user']['userid'];                                                            
                                 $server         = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer'];
-                                $mbox           = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}INBOX", $accountID, $pass) or die(serialize(array('imap_error' => imap_last_error())));
+                                $mbox           = @imap_open("{".$this->imap_server.":".$this->imap_port.$this->imap_options."}INBOX", $accountID, $pass) or die(serialize(array('imap_error' => $this->parse_error(imap_last_error()))));
                                 if(!$mbox)
                                         return imap_last_error();