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

Timestamp:

04/03/12 09:24:37 (12 years ago)

Author:

douglasz

Message:

Ticket #2504 - Nao ter como criar sub pastas nas Pastas compartilhadas.

File:

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

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

@@ -4389 +4389 @@
         {
                 $useracl = $params['user'];
-
-                $return = array();
-                $return[$useracl] = 'false';
-                $mbox_stream = $this->open_mbox();
-                $mbox_acl = imap_getacl($mbox_stream, 'INBOX');
-
-                foreach ($mbox_acl as $user => $acl)
-                {
-                        if (($user != $this->username) && ($user == $useracl))
-                        {
-                                $return[$user] = $acl;
-                        }
-                }
-                return $return;
-        }
-
-        function getacltouser($user)
-        {
                 $return = array();
                 $mbox_stream = $this->open_mbox();
+                if($params['getShared']){               
+                         $mbox_acl = imap_getacl($mbox_stream, 'user'.$this->imap_delimiter.$useracl);          
+                        foreach ($mbox_acl as $user => $acl)
+                        {
+                                if (($user == $this->username) && ($user != $useracl))
+                                {
+                                        $return[$useracl] = $acl;
+                                }
+                        }                        
+                }else { 
+                        $mbox_acl = imap_getacl($mbox_stream, 'INBOX');
+                        foreach ($mbox_acl as $user => $acl)
+                        {
+                                if (($user != $this->username) && ($user == $useracl))
+                                {
+                                        $return[$user] = $acl;
+                                }
+                        }
+                }
+                if(count($return) == 0)
+                                $return[$useracl] = 'false';
+                                
+                return $return;
+        }
+
+        function getacltouser($user)
+        {
+                $return = array();
+                $mbox_stream = $this->open_mbox();      
+                
                 //Alterado, antes era 'imap_getacl($mbox_stream, 'user'.$this->imap_delimiter.$user);
                 //Afim de tratar as pastas compartilhadas, verificandos as permissoes de operacao sobre as mesmas
@@ -4416 +4428 @@
                 else
                   $mbox_acl = @imap_getacl($mbox_stream, $user);
+                
                 if(isset($mbox_acl[$this->username]))
                 return $mbox_acl[$this->username];