stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-28 15:29:09 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix for ticket #452"

Browse Source 
This reverts commit 809e52d80c.
This commit is contained in:
Tim Almdal
2009-07-27 11:14:03 -07:00
parent 5fd82a2ede
commit 4edf86f0eb
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gallery/helpers/access.php
View File

@@ -95,7 +95,7 @@ class access_Core {
return false;
}
if ($user->admin && $item->owner_id == $user->id) {
if ($user->admin) {
return true;
}

22
modules/gallery/models/item.php
View File

@@ -38,17 +38,31 @@ class Item_Model extends ORM_MPTT {
if (user::active()->admin) {
$this->view_restrictions = array();
} else {
$this->view_restrictions["owner_id"] = user::active()->id;
foreach (user::group_ids() as $id) {
$this->view_restrictions["view_$id"] = access::ALLOW;
// Separate the first restriction from the rest to make it easier for us to formulate
// our where clause below
if (empty($this->view_restrictions)) {
$this->view_restrictions[0] = "view_$id";
} else {
$this->view_restrictions[1]["view_$id"] = access::ALLOW;
}
}
}
}
switch (count($this->view_restrictions)) {
case 0:
break;
if (!empty($this->view_restrictions)) {
case 1:
$this->where($this->view_restrictions[0], access::ALLOW);
break;
default:
$this->open_paren();
$this->orwhere($this->view_restrictions);
$this->where($this->view_restrictions[0], access::ALLOW);
$this->orwhere($this->view_restrictions[1]);
$this->close_paren();
break;
}
return $this;