adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating Acl, should fix #2733

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5273 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-06-10 17:43:37 +00:00
parent dad80d947d
commit 335a384613
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cake/libs/controller/components/acl.php
View file

@ -313,7 +313,7 @@ class DB_ACL extends AclBase {
* *
* @return boolean * @return boolean
*/ */
function allow($aro, $aco, $action = "*", $value = 1) { function allow($aro, $aco, $actions = "*", $value = 1) {
$perms = $this->getAclLink($aro, $aco); $perms = $this->getAclLink($aro, $aco);
$permKeys = $this->_getAcoKeys($this->Aro->Permission->loadInfo()); $permKeys = $this->_getAcoKeys($this->Aro->Permission->loadInfo());
$save = array(); $save = array();
@ -327,18 +327,26 @@ class DB_ACL extends AclBase {
$save = $perms[0]['Permission']; $save = $perms[0]['Permission'];
} }
if ($action == "*") { if ($actions == "*") {
$permKeys = $this->_getAcoKeys($this->Aro->Permission->loadInfo()); $permKeys = $this->_getAcoKeys($this->Aro->Permission->loadInfo());
foreach($permKeys as $key) { foreach($permKeys as $key) {
$save[$key] = $value; $save[$key] = $value;
} }
} else { } else {
if (in_array('_' . $action, $permKeys)) { if(!is_array($actions)) {
$save['_' . $action] = $value; $actions = array('_' . $action);
} else { $actions = am($permKeys, $actions);
trigger_error(__('DB_ACL::allow() - Invalid ACO action', true), E_USER_WARNING); }
return false; if(is_array($actions)) {
foreach($actions as $action) {
if ($action{0} != '_') {
$action = '_' . $action;
}
if (in_array($action, $permKeys)) {
$save[$action] = $value;
}
}
} }
} }
@ -348,7 +356,8 @@ class DB_ACL extends AclBase {
if ($perms['link'] != null && count($perms['link']) > 0) { if ($perms['link'] != null && count($perms['link']) > 0) {
$save['id'] = $perms['link'][0]['Permission']['id']; $save['id'] = $perms['link'][0]['Permission']['id'];
} }
return $this->Aro->Permission->save(array('Permission' => $save)); $this->Aro->Permission->create($save);
return $this->Aro->Permission->save();
} }
/** /**
* Deny * Deny