Changeset 1904

Timestamp:

12/29/09 10:13:50 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Melhoria do FM. melhorias na interface, Compartilhamento de grupos

Location:

trunk/phpgwapi/inc

Files:

• class.accounts_ldap.inc.php (modified) (1 diff)
• class.vfs_sql.inc.php (modified) (1 diff)

trunk/phpgwapi/inc/class.accounts_ldap.inc.php

@@ -533 +533 @@
                                 else
                                 {
-                                        $filter = "(&(gidnumber=*)(phpgwaccounttype=g)(|(uid=*$query*)(sn=*$query*)(cn=*$query*)(givenname=*$query*)))";
+                                        if ($_type == 'both')
+                                                $filter = "(&(gidnumber=*)(phpgwaccounttype=g)(|(uid=$query)(sn=$query)(cn=$query)(givenname=$query)))";
+                                        else
+                                                $filter = "(&(gidnumber=*)(phpgwaccounttype=g)(|(uid=*$query*)(sn=*$query*)(cn=*$query*)(givenname=*$query*)))";
                                 }
                                 $sri = ldap_search($this->ds, $this->group_context, $filter);

trunk/phpgwapi/inc/class.vfs_sql.inc.php

@@ -645 +645 @@
                         if ($data['relatives'][0] == RELATIVE_NONE || $data['relatives'][0] == RELATIVE_ALL)
                         {
-                                $path = explode('/',$data['string']);
-                                $data['string'] = '/'.$path[1].'/'.$path[2];
-                        }
+                                $path = explode(SEP,$data['string']);
+                                $data['string'] = SEP.$path[1].SEP.$path[2];
+                        }
+                        if ($data['operation'] == PHPGW_ACL_READ){
+                                $user_groups = $GLOBALS['phpgw']->accounts->membership();
+                                foreach($user_groups as $val){
+                                        if (strpos($data['string'],$this->fakebase.SEP.$GLOBALS['phpgw']->accounts->id2name($val['account_id'])) === 0)
+                                                return true;
+                                }
+                        }
+