adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 19:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating Auth component

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5419 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-07-09 04:38:58 +00:00
parent a1019dfad3
commit 49817ea42d
1 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
cake/libs/controller/components/auth.php
View file

@ -300,34 +300,38 @@ class AuthComponent extends Object {
} }
} }
} }
extract($this->__authType($this->authorize));
if($type !== 'controller') { if($this->authorize) {
if(isset($controller->Acl)) { extract($this->__authType($this->authorize));
$this->Acl =& $controller->Acl; if($type !== 'controller') {
if($type == 'model') { if(isset($controller->Acl)) {
if(!isset($object)) { $this->Acl =& $controller->Acl;
if (isset($controller->{$controller->modelClass}) && is_object($controller->{$controller->modelClass})) { if($type == 'model') {
$object = $controller->modelClass; if(!isset($object)) {
} elseif (!empty($controller->uses) && isset($controller->{$controller->uses[0]}) && is_object($controller->{$controller->uses[0]})) { if (isset($controller->{$controller->modelClass}) && is_object($controller->{$controller->modelClass})) {
$object = $controller->uses[0]; $object = $controller->modelClass;
} else { } elseif (!empty($controller->uses) && isset($controller->{$controller->uses[0]}) && is_object($controller->{$controller->uses[0]})) {
$object = $this->objectModel; $object = $controller->uses[0];
} else {
$object = $this->objectModel;
}
} }
} }
} if ($this->isAuthorized($type, null, $object)) {
if ($this->isAuthorized($type, null, $object)) { return true;
return true; }
} else {
trigger_error(__('Could not find AclComponent. Please include Acl in Controller::$components.', true), E_USER_WARNING);
} }
} else { } else {
trigger_error(__('Could not find AclComponent. Please include Acl in Controller::$components.', true), E_USER_WARNING); if (method_exists($controller, 'isAuthorized')) {
} if($controller->isAuthorized()) {
} else { return true;
if (method_exists($controller, 'isAuthorized')) { }
if($controller->isAuthorized()) {
return true;
} }
} }
} }
$this->Session->setFlash($this->authError); $this->Session->setFlash($this->authError);
$controller->redirect($controller->referer(), null, true); $controller->redirect($controller->referer(), null, true);
return false; return false;