Changeset 5362

Timestamp:

01/11/12 15:29:27 (12 years ago)

Author:

douglas

Message:

Ticket #2439 - Ajuste na informacao e validacao de cotas de pastas Imap do usuario

Location:

trunk/expressoMail1_2/inc

Files:

• class.imap_functions.inc.php (modified) (1 diff)
• class.imapfp.inc.php (modified) (3 diffs)

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

@@ -4058 +4058 @@
 
         function get_quota($params){
-                // folder_id = user/{uid} for shared folders
-                if(substr($params['folder_id'],0,5) != 'INBOX' && preg_match('/user\\'.$this->imap_delimiter.'/i', $params['folder_id'])){
-                        $array_folder =  explode($this->imap_delimiter,$params['folder_id']);
-                        $folder_id = "user".$this->imap_delimiter.$array_folder[1];
-                }
-                // folder_id = INBOX for inbox folders
-                else
-                        $folder_id = "INBOX";
+
+                $folder_id = str_replace('/',$this->imap_delimiter,$params['folder_id']);
 
                 if(!$this->mbox || !is_resource($this->mbox))

trunk/expressoMail1_2/inc/class.imapfp.inc.php

@@ -48 +48 @@
                         $this->must_update=false;
                         $this->tag=uniqid("HKC");
+                        $this->imap_delimiter = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'];
                 }
 
@@ -89 +90 @@
                 {                       
                         // INBOX
-                        if($this->put_line($this->tag . " GETANNOTATION \"user/".$this->user ."\" \"/vendor/cmu/cyrus-imapd/size\" \"value.shared\"" ))
+                        if($this->put_line($this->tag . " GETANNOTATION \"user".$this->imap_delimiter.$this->user ."\" \"/vendor/cmu/cyrus-imapd/size\" \"value.shared\"" ))
                         {
                                 $response_inbox=$this->get_server_responce();
@@ -109 +110 @@
 
                         // SUB_FOLDERS
-                        if($this->put_line($this->tag . " GETANNOTATION \"user/".$this->user ."/*\" \"/vendor/cmu/cyrus-imapd/size\" \"value.shared\"" ))
+                        if($this->put_line($this->tag . " GETANNOTATION \"user".$this->imap_delimiter.$this->user .$this->imap_delimiter."*\" \"/vendor/cmu/cyrus-imapd/size\" \"value.shared\"" ))
                         {
                                 $response_sub=$this->get_server_responce();