Changeset 6657

Timestamp:

06/27/12 11:46:17 (11 years ago)

Author:

brunocosta

Message:

Ticket #2853 - Exibição de cotas de sub pastas IMAP. - ajuste.

Location:

branches/2.3/expressoMail1_2

Files:

• imap.py (modified) (1 diff)
• inc/class.imap_functions.inc.php (modified) (2 diffs)
• js/filter.js (modified) (1 diff)

branches/2.3/expressoMail1_2/imap.py

@@ -8 +8 @@
 password=sys.argv[4]
 date_time=int(sys.argv[5])
-mailbox=sys.argv[6]
-print sys.argv[7]
+mailbox=base64.b64decode(sys.argv[6])
 imap_file = open(sys.argv[7],"r")
 tmp=imap_file.read()

branches/2.3/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -3256 +3256 @@
                 {    
                         $folder_id = "INBOX";
-                        $folderQuotas = $this->get_folders_with_quota();
+                        $folderQuotas = $this->get_quotaroot(array('folder' => 'INBOX/Arquivo Remoto'));
+                        if($folderQuotas['quota_limit'] == 0)
+                            $folderQuotas = false;
                 }
                 
@@ -4157 +4159 @@
                     fputs($f,base64_encode($source));
                 fclose($f);
+                $folder = base64_encode(mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1"));
                 $command = "python ".$_SERVER['DOCUMENT_ROOT']."/expressoMail1_2/imap.py ".escapeshellarg($imap_server)." ".escapeshellarg($imap_port)." ".escapeshellarg($username)." ".escapeshellarg($password)." ".escapeshellarg($timestamp)." '".$folder."' ".escapeshellarg($file);
                 $return['command']=exec(escapeshellcmd($command));

branches/2.3/expressoMail1_2/js/filter.js

@@ -147 +147 @@
                         }
                         for(var i=0; i < nm_folders.length; i++){
-                                if(nm_folders[i].id != "root" && !proxy_mensagens.is_local_folder(nm_folders[i].id)){
+                                if(nm_folders[i].id != "root" && 
+                                   !proxy_mensagens.is_local_folder(nm_folders[i].id) && 
+                                   nm_folders[i].id != "INBOX/Arquivo Remoto" && //não mostra a pasta "arquivo remoto"
+                                   nm_folders[i].id != "user"&&  //Não mostra a raiz das pastas compartilhadas.
+                                   nm_folders[i].parent != "INBOX/Arquivo Remoto" && //não mostra sub-pastas de "arquivo remoto"
+                                   nm_folders[i].id.substring(0,5) != 'user/' ) //Não mostra  pastas compartilhadas.
+                                {
                                         var opt = new Option(nm_folders[i].caption,nm_folders[i].id,false,true);
                                         sel_nm[sel_nm.length] = opt;