Changeset 6884 for branches/2.4/expressoMail1_2/inc/class.ldap_functions.inc.php

Timestamp:

07/26/12 15:59:09 (12 years ago)

Author:

eduardow

Message:

Ticket #2898 - Bug na exibição de campo DE - send message.

File:

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

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

@@ -893 +893 @@
         function getSharedUsersFrom($params){
                 $filter = '';
-                //Added to save if must save sent messages in shared folder
-                $acl_save_sent_in_shared = array();
-                
-                $acls = $this->imap->getacl();
-
-                if($params['uids']) {
-                        $uids = explode(";",$params['uids']);
-                        $this->imap = new imap_functions();                     
-                        foreach($uids as $index => $uid){               
-                        
-                                $params = array();
-                                //Added to save if user has create permission 
-                                $acl_create_message = array();
-                                $user_arr = array();
-                                $user_arr['user'] = $uid;
-                                $user_arr['getShared'] = true;
-                                
-                                if(isset($acls[$uid])){ 
-                            if ( preg_match("/[pa]+/",$acls[$uid]['acls'])){    
-                                                $filter .= "(uid=$uid)";                                                        
-                                                $acl_save_sent_in_shared[] =$uid;                       
-                                        }       
-                                }
-                        }                       
-                }
+                $i = 0;          
+        //Added to save if must save sent messages in shared folder 
+        $acl_save_sent_in_shared = array(); 
+        
+        if($params['uids']) { 
+                $uids = explode(";",$params['uids']); 
+                $this->imap = new imap_functions();                      
+                foreach($uids as $index => $uid){ 
+                        $params = array(); 
+                        //Added to save if user has create permission 
+                        $acl_create_message = array(); 
+                        $acl = $this->imap->getacltouser($uid ,true); 
+   
+                        if ( preg_match("/p/",$acl )){                          
+                            $filter .= "(uid=$uid)";                                                     
+                            $acl_save_sent_in_shared[ $i ] =$uid; 
+                            $i++; 
+                                                                        
+                        }                                                        
+                }                        
+        }
                 
                 $this->ldapRootConnect(false);
@@ -952 +948 @@
                                 $result = ldap_get_entries($this->ds, $sr);
                                 for ($j = 0;$j < $result["count"]; $j++){
-                                        $info[$i]['cn'][0] = utf8_decode($result[$j]['cn'][0]);
-                                        $info[$i]['mail'][0] = $result[$j]['mail'][0];
-                                        $info[$i]['save_shared'][0] = 'n';
-                                        $info[$i++]['uid'][0] = $result[$j]['uid'][0];                                  
+                                        $result[$j]['cn'][0] = utf8_decode($result[$j]['cn'][0]); 
+                    $result[$j]['mail'][0] = $result[$j]['mail'][0]; 
+                    $result[$j]['save_shared'][0] = 'n'; 
+                    $info[$info['count']] = $result[$j]; 
+                    $info['count'] = (int)$info['count'] + 1;                                   
                                 }
                         }
 
                         $_SESSION['phpgw_info']['expressomail']['user']['shared_mailboxes'] = $info;
+                        
                         return $info;
                 }