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

Moving AclBase class to the acl.php file.

Browse source 
Removing components/iniacl directory.
Removing acl_base.php file.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4959 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-05-01 01:23:21 +00:00
parent 8780af05a3
commit 7111d292fd
2 changed files with 31 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* Access Control List factory class.
*
@ -27,7 +26,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Access Control List factory class.
*
@ -37,10 +35,8 @@
* @subpackage cake.cake.libs.controller.components
*/
class AclComponent extends Object {
var $_instance = null;
var $controller = true;
/**
* Constructor. Will return an instance of the correct ACL class.
*
@ -54,8 +50,8 @@ class AclComponent extends Object {
* @return MyACL
*/
function &getACL() {
if ($this->_instance == null) {
uses('controller' . DS . 'components' . DS . ACL_FILENAME);
if($this->_instance == null) {
uses('model' . DS . ACL_FILENAME);
$classname = ACL_CLASSNAME;
$this->_instance = new $classname;
}
@ -173,5 +169,33 @@ class AclComponent extends Object {
return $this->_instance->getAco($id);
}
}
/**
* Access Control List abstract class. Not to be instantiated.
* Subclasses of this class are used by AclComponent to perform ACL checks in Cake.
*
* @package cake
* @subpackage cake.cake.libs.controller.components
*/
class AclBase{
/**
* This class should never be instantiated, just subclassed.
*
* @return AclBase
*/
function AclBase() {
if (strcasecmp(get_class($this), "AclBase") == 0 || !is_subclass_of($this, "AclBase")) {
trigger_error(__("[acl_base] The AclBase class constructor has been called, or the class was instantiated. This class must remain abstract. Please refer to the Cake docs for ACL configuration.", true), E_USER_ERROR);
return NULL;
}
}
/**
* Empty method to be overridden in subclasses
*
* @param unknown_type $aro
* @param unknown_type $aco
* @param string $action
*/
function check($aro, $aco, $action = "*") {
}
}
?>

66
cake/libs/controller/components/acl_base.php
View file

@ -1,66 +0,0 @@
<?php
/* SVN FILE: $Id$ */
/**
* Access Control List abstract class.
*
* Long description for file
*
* PHP versions 4 and 5
*
* CakePHP(tm) : Rapid Development Framework <http://www.cakephp.org/>
* Copyright 2005-2007, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
* @copyright Copyright 2005-2007, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
* @package cake
* @subpackage cake.cake.libs.controller.components
* @since CakePHP(tm) v 0.10.0.1232
* @version $Revision$
* @modifiedby $LastChangedBy$
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Access Control List abstract class. Not to be instantiated.
* Subclasses of this class are used by AclComponent to perform ACL checks in Cake.
*
* @package cake
* @subpackage cake.cake.libs.controller.components
*/
class AclBase{
/**
* This class should never be instantiated, just subclassed.
*
* @return AclBase
*/
function AclBase() {
//No instantiations or constructor calls (even statically)
if (strcasecmp(get_class($this), "AclBase") == 0 || !is_subclass_of($this, "AclBase")) {
trigger_error(
__(
"[acl_base] The AclBase class constructor has been called, or the class was instantiated. This class must remain abstract. Please refer to the Cake docs for ACL configuration.", true),
E_USER_ERROR);
return NULL;
}
}
/**
* Empty method to be overridden in subclasses
*
* @param unknown_type $aro
* @param unknown_type $aco
* @param string $action
*/
function check($aro, $aco, $action = "*") {
}
}
?>