removing changes made in trunk after directory changes made on next release

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1056 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2005-10-03 04:43:55 +00:00
parent a316884f37
commit ab1db2532e
6 changed files with 536 additions and 538 deletions

View file

@ -1,4 +1,4 @@
;<? die(); ?>
<? die(); ?>
; acl.ini.php - Cake ACL Configuration
; ---------------------------------------------------------------------

View file

@ -38,17 +38,17 @@
* its action called 'display', and we pass a param to select the view file
* to use (in this case, /app/views/pages/home.thtml)...
*/
$Route->connect('/', array('controller'=>'Pages', 'action'=>'display', 'home'));
$Route->connect ('/', array('controller'=>'Pages', 'action'=>'display', 'home'));
/**
* ...and connect the rest of 'Pages' controller's urls.
*/
$Route->connect('/pages/*', array('controller'=>'Pages', 'action'=>'display'));
$Route->connect ('/pages/*', array('controller'=>'Pages', 'action'=>'display'));
/**
* Then we connect url '/test' to our test controller. This is helpfull in
* developement.
*/
$Route->connect('/test', array('controller'=>'Tests', 'action'=>'index'));
$Route->connect ('/test', array('controller'=>'Tests', 'action'=>'index'));
?>
?>

View file

@ -22,17 +22,17 @@
* and its action called 'display'. We pass a parameter to select the view file
* to use (in this case, /app/views/pages/home.thtml).
*/
$Route->connect('/', array('controller'=>'Pages', 'action'=>'display', 'home'));
$Route->connect ('/', array('controller'=>'Pages', 'action'=>'display', 'home'));
/**
* ...and connect the rest of 'Pages' controller's URLs.
*/
$Route->connect('/pages/*', array('controller'=>'Pages', 'action'=>'display'));
$Route->connect ('/pages/*', array('controller'=>'Pages', 'action'=>'display'));
/**
* Then we connect url '/test' to our test controller. This is helpful in
* development.
*/
$Route->connect('/test', array('controller'=>'Tests', 'action'=>'test_all'));
$Route->connect ('/test', array('controller'=>'Tests', 'action'=>'test_all'));
?>

View file

@ -42,19 +42,21 @@
*
*/
class Acl
{
/**
* Static function used to gain an instance of the correct ACL class.
*
* @return MyACL
*/
function getACL()
{
require_once CONFIGS.'core.php';
require_once APP.'apis'.DS.ACL_FILENAME;
{
/**
* Static function used to gain an instance of the correct ACL class.
*
* @return MyACL
*/
function getACL()
{
require_once(CONFIGS.'core.php');
require_once(APP.'apis'.DS.ACL_FILENAME);
$myacl = ACL_CLASSNAME;
return new $myacl;
}
$myacl = ACL_CLASSNAME;
return new $myacl;
}
}
?>
?>

View file

@ -36,25 +36,26 @@ uses('error_messages');
* Access Control List abstract class. Not to be instantiated.
* Subclasses of this class are used by AclHelper to perform ACL checks in Cake.
*
* @package cake
* @package cake
* @subpackage libs
* @since CakePHP v 0.9.2
* @since CakePHP v 0.9.2
*
*/
class AclBase
{
function AclBase()
{
//No instantiations or constructor calls (even statically)
if (strcasecmp(get_class($this), "AclBase") == 0 || !is_subclass_of($this, "AclBase"))
{
trigger_error(ERROR_ABSTRACT_CONSTRUCTION, E_USER_ERROR);
return NULL;
}
}
function check($aro, $aco)
{
}
}
function AclBase()
{
//No instantiations or constructor calls (even statically)
if (strcasecmp(get_class($this), "AclBase") == 0 || !is_subclass_of($this, "AclBase"))
{
trigger_error(ERROR_ABSTRACT_CONSTRUCTION, E_USER_ERROR);
return NULL;
}
}
function check($aro, $aco) {}
}
?>

File diff suppressed because it is too large Load diff