Changeset 1912 for trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

Timestamp:

01/04/10 11:25:23 (15 years ago)

Author:

valmir.sena

Message:

Ticket #858 - Alterar o comportamento do envio de mensagens por um usuário de uma conta compartilhada

File:

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

trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -689 +689 @@
         function getSharedUsersFrom($params){
                 $filter = '';
-                $i = 0;
+                $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();
+                        $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);
-                                if(preg_match("/a/",$acl))
-                                        $filter .= "(uid=$uid)";
-                        }
-                }
-
+                                if ( preg_match("/a/",$acl )){                          
+                                        $filter .= "(uid=$uid)";                                        
+                                        if ( preg_match("/p/",$acl )){                          
+                                                $acl_save_sent_in_shared[ $i ] =$uid;
+                                                $i++;
+                                        }                                       
+                                }                                                       
+                        }                       
+                }
+                
                 $this->ldapRootConnect(false);
                 if ($this->ds) {
-                        $justthese = array("cn","mail");
+                        $justthese = array("cn","mail","uid");
                         if($filter) {
-                                $filter="(&(phpgwAccountType=u)(|$filter))";
+                                $filter="(&(|(phpgwAccountType=u)(phpgwAccountType=s))(|$filter))";
                                 $sr             =       ldap_search($this->ds, $this->ldap_context, $filter, $justthese);
                                 ldap_sort($this->ds,$sr,"cn");
                                 $info   =       ldap_get_entries($this->ds, $sr);
-                                for ($i = 0;$i < $info["count"]; $i++)
+                                $var = print_r($acl_save_sent_in_shared, true);                         
+                                for ($i = 0;$i < $info["count"]; $i++){
                                         $info[$i]['cn'][0] = utf8_decode($info[$i]['cn'][0]);
-                        }
+                                        //verify if user has permission to save sent messages in a shared folder
+                                        if ( in_array( $info[$i]['uid'][0],$acl_save_sent_in_shared) ){                                         
+                                                $info[$i]['save_shared'][0] = 'y';
+                                        } else $info[$i]['save_shared'][0] = 'n';
+                                }
+                        }
+                
                         $info['myname'] = $_SESSION['phpgw_info']['expressomail']['user']['fullname'];
 
@@ -728 +745 @@
                                 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]['mail'][0] = $result[$j]['mail'][0];
+                                        $info[$i]['save_shared'][0] = 'n';
+                                        $info[$i++]['uid'][0] = $result[$j]['uid'][0];                                  
                                 }
                         }
 
                         $_SESSION['phpgw_info']['expressomail']['user']['shared_mailboxes'] = $info;
-
+                        
                         return $info;
                 }