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

Timestamp:

02/05/09 16:48:28 (15 years ago)

Author:

niltonneto

Message:

Resolve #422

File:

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

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

@@ -187 +187 @@
         * com .emls gerados pelo expresso, e o arquivo pode ser um zip contendo vários emls ou um .eml.
         */
-        function import_msgs() {
-                
-                if(!$this->mbox)
-                        $this->mbox = $this->open_mbox($params["folder"]);
+        function import_msgs($params) {
+                if(!$this->mbox)                
+                        $this->mbox = $this->open_mbox();
                 $errors = array();
                 $invalid_format = false;
-                $filename = $_FILES['arquivo']['name'];
+                $filename = $params['FILES'][0]['name'];
+                $quota = imap_get_quotaroot($this->mbox, $params["folder"]);
+                if((($quota['limit'] - $quota['usage'])*1024) <= $params['FILES'][0]['size']){
+                        return array( 'error' => $this->functions->getLang("fail in import:").
+                                                        " ".$this->functions->getLang("Over quota"));           
+                }
                 if(substr($filename,strlen($filename)-4)==".zip") {
-                        $zip = zip_open($_FILES['arquivo']['tmp_name']);
+                        $zip = zip_open($params['FILES'][0]['tmp_name']);
 
                         if ($zip) {
@@ -203 +207 @@
                                                 $email = zip_entry_read($zip_entry, zip_entry_filesize($zip_entry));
                                                 $status = @imap_append($this->mbox,
-                                                                "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}"."INBOX",
+                                                                "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$params["folder"],
                                                                         $email
                                                                         );
@@ -211 +215 @@
                                         }
                                 }
-
-                        }
-
-                        zip_close($zip);
+                                zip_close($zip);
+                        }
                 }
                 else if(substr($filename,strlen($filename)-4)==".eml") {
-                        $email = implode("",file($_FILES['arquivo']['tmp_name']));
+                        $email = implode("",file($params['FILES'][0]['tmp_name']));
                         $status = @imap_append($this->mbox,
-                                                                "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}"."INBOX",
+                                                                "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}".$params["folder"],
                                                                         $email
                                                                         );
-                        if(!$status)
+                        if(!$status){
                                 array_push($errors,zip_entry_name($zip_entry));
-                        zip_entry_close($zip_entry);
+                                zip_entry_close($zip_entry);
+                        }
                 }
                 else 
                 {
-                        echo "<script>alert(\"".lang("wrong file format")."\")</script>";
+                        return array("error" => $this->functions->getLang("wrong file format"));
                         $invalid_format = true;
                 }
@@ -234 +237 @@
                 if(!$invalid_format) {
                         if(count($errors)>0) {
-                                $message = lang("fail in import:")."\n";
+                                $message = $this->functions->getLang("fail in import:")."\n";
                                 foreach($errors as $arquivo) {
                                         $message.=$arquivo."\n";
                                 }
-                                echo "<script>alert(\"$message\")</script>";
+                                return array("error" => $message);
                         }
                         else
-                                echo "<script>alert(\"".lang("messages imported successfully")."\")</script>";
-                }
-                echo "<script>location.href='/expressoMail1_2/index.php'</script>";
-        }
-        
+                                return $this->functions->getLang("The import was executed successfully.");                      
+                }
+        }       
         /*
                 Remove os anexos de uma mensagem. A estratégia para isso é criar uma mensagem nova sem os anexos, mantendo apenas