extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed ACL code to use standard get_grants method from the acl-class, the existing coded tried it on it's own and failed if directories were owned by a group

Browse Source
This commit is contained in:
Ralf Becker 2005-03-07 17:08:54 +00:00
parent 9c091abd5b
commit 8529237f82
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
phpgwapi/inc/class.vfs_sql.inc.php
View File

@ -134,6 +134,7 @@
'link_name' => $this->db->Record['vfs_link_name'], 'link_name' => $this->db->Record['vfs_link_name'],
); );
} }
$this->grants = $GLOBALS['egw']->acl->get_grants('filemanager');
} }
/*! /*!
@ -680,6 +681,7 @@
else else
{ {
$p2 = $p; $p2 = $p;
//echo "using parent directory for acl-check, ";
} }
/* /*
@ -699,6 +701,7 @@
{ {
$owner_id = $data['owner_id']; $owner_id = $data['owner_id'];
} }
//echo "owner=$owner_id, ";
/* This is correct. The ACL currently doesn't handle undefined values correctly */ /* This is correct. The ACL currently doesn't handle undefined values correctly */
if (!$owner_id) if (!$owner_id)
@ -707,14 +710,14 @@
} }
$user_id = $GLOBALS['phpgw_info']['user']['account_id']; $user_id = $GLOBALS['phpgw_info']['user']['account_id'];
//echo "user=$user_id, ";
/* They always have access to their own files */ /* They always have access to their own files */
if ($owner_id == $user_id) if ($owner_id == $user_id)
{ {
return True; return True;
} }
/* RalfBecker 2005/03/07 using ACL standard function acl::get_grants() now
/* Check if they're in the group */ // Check if they're in the group
$memberships = $GLOBALS['phpgw']->accounts->membership ($user_id); $memberships = $GLOBALS['phpgw']->accounts->membership ($user_id);
if (is_array ($memberships)) if (is_array ($memberships))
@ -735,7 +738,7 @@
$rights = $acl->get_rights ($user_id); $rights = $acl->get_rights ($user_id);
/* Add privileges from the groups this user belongs to */ // Add privileges from the groups this user belongs to
if (is_array ($memberships)) if (is_array ($memberships))
{ {
foreach ($memberships as $group_array) foreach ($memberships as $group_array)
@ -743,7 +746,9 @@
$rights |= $acl->get_rights ($group_array['account_id']); $rights |= $acl->get_rights ($group_array['account_id']);
} }
} }
*/
$rights = $this->grants[$owner_id];
//echo "rights=$rights, ";
if ($rights & $data['operation']) if ($rights & $data['operation'])
{ {
return True; return True;
@ -1761,13 +1766,13 @@
'operation' => PHPGW_ACL_ADD) 'operation' => PHPGW_ACL_ADD)
) )
) )
{ {//echo "!acl_check('$p->fake_full_path',PHPGW_ACL_ADD)";
return False; return False;
} }
/* We don't allow /'s in dir names, of course */ /* We don't allow /'s in dir names, of course */
if (strstr ($p->fake_name,'/')) if (strstr ($p->fake_name,'/'))
{ {//echo "strstr('$p->fake_name','/')";
return False; return False;
} }
@ -1778,7 +1783,7 @@
if (!@is_dir($p->real_leading_dirs)) // eg. /home or /group does not exist if (!@is_dir($p->real_leading_dirs)) // eg. /home or /group does not exist
{ {
if (!@mkdir($p->real_leading_dirs,0770)) // ==> create it if (!@mkdir($p->real_leading_dirs,0770)) // ==> create it
{ {//echo "!mkdir('$p->real_leading_dirs')";
return False; return False;
} }
} }
@ -1787,7 +1792,7 @@
$this->update_real($data,True); // update its contents $this->update_real($data,True); // update its contents
} }
elseif (!@mkdir ($p->real_full_path, 0770)) elseif (!@mkdir ($p->real_full_path, 0770))
{ {//echo "!mkdir('$p->real_full_path')";
return False; return False;
} }
} }
@ -1832,10 +1837,9 @@
); );
} }
else else
{ {//echo"!file_exists('$p->fake_full_path');";
return False; return False;
} }
return True; return True;
} }