hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix granted bases order

Browse Source
This commit is contained in:
Romain Neutron
2012-01-19 12:24:09 +01:00
parent c7abf22256
commit 8b15f3b732
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/classes/ACL.class.php
View File

@@ -620,33 +620,43 @@ class ACL implements cache_cacheableInterface
{
$this->load_rights_bas();
$ret = array();
foreach ($this->_rights_bas as $base_id => $datas)
foreach($this->appbox->get_databoxes() as $databox)
{
$continue = false;
if ($sbas_ids && !in_array(phrasea::sbasFromBas($base_id), $sbas_ids))
if ($sbas_ids && !in_array($databox->get_sbas_id(), $sbas_ids))
{
continue;
}
foreach ($rights as $right)
foreach ($databox->get_collections() as $collection)
{
if (!$this->has_right_on_base($base_id, $right))
{
$continue = true;
break;
}
}
if ($continue || $this->is_limited($base_id))
continue;
$continue = false;
try
{
$ret[$base_id] = collection::get_from_base_id($base_id);
}
catch (Exception $e)
{
if(!array_key_exists($collection->get_base_id(), $this->_rights_bas))
continue;
$base_id = $collection->get_base_id();
$datas = $this->_rights_bas[$base_id];
foreach ($rights as $right)
{
if (!$this->has_right_on_base($base_id, $right))
{
$continue = true;
break;
}
}
if ($continue || $this->is_limited($base_id))
continue;
try
{
$ret[$base_id] = collection::get_from_base_id($base_id);
}
catch (Exception $e)
{
}
}
}