coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

update menu (split system and Seminary related elements)

Browse source
This commit is contained in:
coderkun 2014-03-30 14:21:45 +02:00
commit 55ae9cf198
8 changed files with 114 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/controllers/ToplevelController.inc
View file

@ -78,6 +78,13 @@
try {
static::$user = $this->Users->getUserById($this->Auth->getUserId());
// Determine user roles
static::$user['roles'] = array();
$roles = $this->Userroles->getUserrolesForUserById(static::$user['id']);
foreach($roles as &$role) {
static::$user['roles'][] = $role['name'];
}
// Character
$controller = $this->agent->getIntermediateAgent()->controller;
if(is_subclass_of($controller, '\hhu\z\controllers\SeminaryRoleController'))
@ -122,7 +129,10 @@
private function checkPermission(\nre\core\Request $request, \nre\core\Response $response)
{
// Determine user
$userId = $this->Auth->getUserId();
$userRoles = array('guest');
if(!is_null(static::$user)) {
$userRoles = static::$user['roles'];
}
// Do not check error pages
@ -133,20 +143,6 @@
return;
}
// Determine user roles
if($userId > 0)
{
$userRoles = array();
$roles = $this->Userroles->getUserrolesForUserById($userId);
foreach($roles as &$role) {
$userRoles[] = $role['name'];
}
}
else {
$userRoles = array('guest');
}
// Determine permissions of Intermediate Controller for current action
$controller = $this->agent->getIntermediateAgent()->controller;
$action = $this->request->getParam(2, 'action');