Changeset 1558

Timestamp:

10/29/09 16:36:21 (14 years ago)

Author:

eduardoalex

Message:

Ticket #708 - incluido verificacao de pasta vazia e adicao de traducao no .lang

Location:

trunk/expressoMail1_2

Files:

• inc/class.exporteml.inc.php (modified) (1 diff)
• js/TreeShow.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (previous)

trunk/expressoMail1_2/inc/class.exporteml.inc.php

@@ -111 +111 @@
                 
                 $msgs = imap_search($this->mbox_stream,"ALL",SE_UID);
-                foreach($msgs as $nMsgs){
-                        $header         = $this-> getHeader($nMsgs);                                                                    
-                        $body           = $this-> getBody($nMsgs);                      
-                        $sEMLData       = $this -> parseEml($header, $body);
-                        $fileName       = $this -> CreateFileEml($sEMLData, $tempDir,$nMsgs);
-                        if(!$fileName)  {
-                                $error = True;                                  
-                                break;
-                        }
-                        else
-                                $fileNames .= "\"".$fileName."\" ";                     
-                        
-                }
-                imap_close($this->mbox_stream);
-                
-                $nameFileZip = 'False';                 
-                if($fileNames && !$error) {                     
-                        $nameFileZip = $this -> createFileZip($fileNames, $tempDir);
-                        if($nameFileZip)                        
-                                $file = $tempDir.'/'.$nameFileZip;
-                        else {
+                if($msgs){
+                        foreach($msgs as $nMsgs){
+                                $header         = $this-> getHeader($nMsgs);                                                                    
+                                $body           = $this-> getBody($nMsgs);                      
+                                $sEMLData       = $this -> parseEml($header, $body);
+                                $fileName       = $this -> CreateFileEml($sEMLData, $tempDir,$nMsgs);
+                                if(!$fileName)  {
+                                        $error = True;                                  
+                                        break;
+                                }
+                                else
+                                        $fileNames .= "\"".$fileName."\" ";                     
+                                
+                        }
+                        
+                        imap_close($this->mbox_stream);
+                        
+                        $nameFileZip = 'False';                 
+                        if($fileNames && !$error) {                     
+                                $nameFileZip = $this -> createFileZip($fileNames, $tempDir);
+                                if($nameFileZip)                        
+                                        $file = $tempDir.'/'.$nameFileZip;
+                                else {
+                                        $file = false;
+                                }                                                               
+                        }
+                        else 
                                 $file = false;
-                        }                                                               
-                }
-                else 
-                        $file = false;
-                        
+                }else{
+                        $file["empty_folder"] = true;
+                }
                 return $file;
                 

trunk/expressoMail1_2/js/TreeShow.js

@@ -242 +242 @@
                         if(!data){
                                 write_msg(get_lang('Error compressing messages (ZIP). Contact the administrator.'))
+                        }else if(data["empty_folder"]){
+                                write_msg(get_lang("The selected folder is empty."));
+                                alert(get_lang("The selected folder is empty."));
                         }else
                           download_attachments(null, null, data, null,null, name_f +'.zip');