abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added request log mechanism

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@832 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-09-01 04:43:24 +00:00
parent ef64644536
commit 68a1397ad6
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
site/app_controller.php
View File

@@ -296,6 +296,7 @@ class AppController extends Controller {
*/ */
function beforeFilter() { function beforeFilter() {
$this->params['user'] = $this->Permission->User->currentUser();
$this->params['dev'] = $this->Option->enabled('dev'); $this->params['dev'] = $this->Option->enabled('dev');
$this->params['admin'] = $this->Option->enabled('admin'); $this->params['admin'] = $this->Option->enabled('admin');
@@ -312,10 +313,10 @@ class AppController extends Controller {
$this->sideMenuEnable($area_name, $this->admin_area, false); $this->sideMenuEnable($area_name, $this->admin_area, false);
} }
$this->authorize("controller.{$this->params['controller']}");
$this->authorize("controller.{$this->params['controller']}"); $this->authorize("controller.{$this->params['controller']}");
$this->authorize("action.{$this->params['controller']}.{$this->params['action']}"); $this->authorize("action.{$this->params['controller']}.{$this->params['action']}");
$this->authorize("action.{$this->params['controller']}.{$this->params['action']}");
$this->log($this->params, 'request');
} }

14
site/models/user.php
View File

@@ -8,19 +8,21 @@ class User extends AppModel {
static $current_user_id; static $current_user_id;
function currentUser() {
if (!empty($_SERVER['REMOTE_USER']))
return $_SERVER['REMOTE_USER'];
return null;
}
function currentUserId() { function currentUserId() {
if (!empty(self::$current_user_id)) if (!empty(self::$current_user_id))
return self::$current_user_id; return self::$current_user_id;
if (!empty($_SERVER['REMOTE_USER']))
$login = $_SERVER['REMOTE_USER'];
else
$login = null;
$user = $this->find $user = $this->find
('first', ('first',
array('recursive' => -1, array('recursive' => -1,
'conditions' => compact('login'))); 'conditions' => array('login' => $this->currentUser())));
if (!empty($user['User']['id'])) if (!empty($user['User']['id']))
self::$current_user_id = $user['User']['id']; self::$current_user_id = $user['User']['id'];