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

Adding AuthComponent::user() to return current user, fixing config/paths docblocks, and adding IMAGES path

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4322 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-01-23 16:27:34 +00:00
parent 6c670400ca
commit 685054fac3
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/config/paths.php
View file

@ -93,13 +93,17 @@
*/ */
define ('LIBS', CAKE.'libs'.DS); define ('LIBS', CAKE.'libs'.DS);
/** /**
* Path to the public directory. * Path to the public CSS directory.
*/ */
define ('CSS', WWW_ROOT.'css'.DS); define ('CSS', WWW_ROOT.'css'.DS);
/** /**
* Path to the public directory. * Path to the public JavaScript directory.
*/ */
define ('JS', WWW_ROOT.'js'.DS); define ('JS', WWW_ROOT.'js'.DS);
/**
* Path to the public images directory.
*/
define ('IMAGES', WWW_ROOT.'img'.DS);
/** /**
* Path to the scripts direcotry. * Path to the scripts direcotry.
*/ */

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

@ -315,6 +315,18 @@ class AuthComponent extends Object {
} }
return $this->_loggedIn; return $this->_loggedIn;
} }
/**
* Get the current user from the session.
*
* @access public
* @return array User record, or null if no user is logged in.
*/
function user() {
if (!$this->Session->check($this->sessionKey)) {
return null;
}
return array($this->userModel => $this->Session->read($this->sessionKey));
}
/** /**
* Gets the authentication redirect URL * Gets the authentication redirect URL
* *