Changeset 6859 for branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

07/24/12 10:24:52 (12 years ago)

Author:

eduardow

Message:

Ticket #2978 - Dificuldade no mapeamento de ACLs para ações de pastas compartilhadas.

File:

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

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

@@ -4281 +4281 @@
         {
                 $this->ldap = new ldap_functions();
-
-                $return = array();
                 $mbox_stream = $this->open_mbox();
                 $mbox_acl = imap_getacl($mbox_stream, 'INBOX');
 
-                $i = 0;
+                $oldAcls = array('d' , 'c' , 'a'); 
+        $newAcls = array('xte','ik', ''); 
+
+        $return = array(); 
                 foreach ($mbox_acl as $user => $acl)
                 {
-                        if ($user != $this->username)
-                        {
-                                $return[$i]['uid'] = $user;
-                                $return[$i]['cn'] = $this->ldap->uid2cn($user);
-                        }
-                        $i++;
-                }
-                return $return;
-        }
-
-        function setacl($params)
-        {
-                $old_users = $this->getacl();
-                if (!count($old_users))
-                        $old_users = array();
-
-                $tmp_array = array();
-                foreach ($old_users as $index => $user_info)
+                                if($user == $this->username)  
+                            continue; 
+
+                    //Compatibiliza acls no padrão antigo para o novo 
+                    $acl = str_replace($oldAcls, $oldAcls, $acl); 
+
+                    $return[$user] = array( 
+                                    'cn' => $this->ldap->uid2cn($user) , 
+                                    'acls' => $acl 
+                                    ); 
+            } 
+            return $return; 
+    } 
+
+    function setacl($params) 
+    { 
+            $old_users = $this->getacl(); 
+            $new_users = unserialize($params['acls']); 
+
+            $mbox_stream = $this->open_mbox(); 
+            $serverString = "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}"; 
+            $mailboxes_list = imap_getmailboxes($mbox_stream, $serverString, "user".$this->imap_delimiter.$this->username."*");                 
+
+            foreach ($new_users as $user => $value) { 
+                    if(isset($old_users[$user]) && $value['acls'] == $old_users[$user]['acls'])
+                                        {
+                                                        unset($old_users[$user]); 
+                            unset($new_users[$user]); 
+                    } 
+            } 
+
+            foreach ($new_users as $user => $value)
                 {
-                        $tmp_array[$index] = $user_info['uid'];
-                }
-                $old_users = $tmp_array;
-
-                $users = unserialize($params['users']);
-                if (!count($users))
-                        $users = array();
-
-                //$add_share = array_diff($users, $old_users);
-                $remove_share = array_diff($old_users, $users);
-
-                $mbox_stream = $this->open_mbox();
-
-                $serverString = "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}";
-                $mailboxes_list = imap_getmailboxes($mbox_stream, $serverString, "user".$this->imap_delimiter.$this->username."*");
-
-                /*if (count($add_share))
+                        if (is_array($mailboxes_list)) 
+            { 
+                foreach ($mailboxes_list as $key => $val) 
+                { 
+                    $folder = str_replace($serverString, "", imap_utf7_decode($val->name)); 
+                    $folder = str_replace("&-", "&", $folder); 
+                    imap_setacl ($mbox_stream, $folder, "$user", $value['acls']); 
+
+                } 
+            } 
+            if(isset($old_users[$user])) 
+                    unset($old_users[$user]); 
+            } 
+
+            foreach ($old_users as $user => $value)
                 {
-                        foreach ($add_share as $index=>$uid)
-                        {
-                        if (is_array($mailboxes_list))
-                        {
-                        foreach ($mailboxes_list as $key => $val)
-                        {
-                        $folder = str_replace($serverString, "", imap_utf7_decode($val->name));
-                                                imap_setacl ($mbox_stream, $folder, "$uid", "lrswipcda");
-                        }
-                        }
-                        }
-                }*/
-
-                if (count($remove_share))
-                {
-                        foreach ($remove_share as $index=>$uid)
-                        {
-                            if (is_array($mailboxes_list))
-                            {
-                                foreach ($mailboxes_list as $key => $val)
-                                {
-                                    $folder = str_replace($serverString, "", imap_utf7_decode($val->name));
-                                    $folder = str_replace("&-", "&", $folder);
-                                    imap_setacl ($mbox_stream, $folder, "$uid", "");
-                                }
-                            }
-                        }
-                }
+                        if (is_array($mailboxes_list)) 
+            { 
+                foreach ($mailboxes_list as $key => $val) 
+                { 
+                    $folder = str_replace($serverString, "", imap_utf7_decode($val->name)); 
+                    $folder = str_replace("&-", "&", $folder); 
+                    imap_setacl ($mbox_stream, $folder, "$user", ""); 
+
+                } 
+            } 
+            } 
+
 
                 return true;
         }
 
-        function getaclfromuser($params)
-        {
-                $useracl = $params['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, $decode = false)
@@ -4408 +4376 @@
                 else 
                     return '';
-        }
-
-
-        function setaclfromuser($params)
-        {
-                $user = $params['user'];
-                $acl = $params['acl'];
-
-                $mbox_stream = $this->open_mbox();
-
-                $serverString = "{".$this->imap_server.":".$this->imap_port.$this->imap_options."}";
-                $mailboxes_list = imap_getmailboxes($mbox_stream, $serverString, "user".$this->imap_delimiter.$this->username."*");
-
-                if (is_array($mailboxes_list))
-                {
-                        foreach ($mailboxes_list as $key => $val)
-                        {
-                                $folder = str_replace($serverString, "", imap_utf7_encode($val->name));
-                                $folder = str_replace("&-", "&", $folder);
-                                if (!imap_setacl ($mbox_stream, $folder, $user, $acl))
-                                {
-                                        $return = imap_last_error();
-                                }
-                        }
-                }
-                if (isset($return))
-                        return $return;
-                else
-                        return true;
         }