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

correctly set and use logged user

Browse source
This commit is contained in:
coderkun 2014-04-07 23:10:15 +02:00
commit 55d4de044d
9 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
controllers/BinaryController.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class BinaryController extends \hhu\z\controllers\ToplevelController
class BinaryController extends \hhu\z\controllers\IntermediateController
{

8
controllers/HtmlController.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class HtmlController extends \hhu\z\controllers\ToplevelController
class HtmlController extends \hhu\z\Controller
{
@ -49,9 +49,9 @@
$this->set('title', $this->request->getParam(1, 'intermediate'));
// Set userdata
$this->set('loggedUser', static::$user);
$this->set('loggedSeminary', static::$seminary);
$this->set('loggedCharacter', static::$character);
$this->set('loggedUser', IntermediateController::$user);
$this->set('loggedSeminary', IntermediateController::$seminary);
$this->set('loggedCharacter', IntermediateController::$character);
}
}

2
controllers/IntroductionController.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class IntroductionController extends \hhu\z\Controller
class IntroductionController extends \hhu\z\controllers\IntermediateController
{

2
controllers/MenuController.inc
View file

@ -34,7 +34,7 @@
parent::preFilter($request, $response);
// Set userdata
$this->set('loggedUser', HtmlController::$user);
$this->set('loggedUser', IntermediateController::$user);
}

4
controllers/SeminarymenuController.inc
View file

@ -35,8 +35,8 @@
parent::preFilter($request, $response);
// Set userdata
$this->set('loggedUser', HtmlController::$user);
$this->set('loggedSeminary', HtmlController::$seminary);
$this->set('loggedUser', IntermediateController::$user);
$this->set('loggedSeminary', IntermediateController::$seminary);
}

2
controllers/UploadsController.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class UploadsController extends \hhu\z\Controller
class UploadsController extends \hhu\z\controllers\IntermediateController
{
/**
* Required models

2
controllers/UsersController.inc
View file

@ -17,7 +17,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class UsersController extends \hhu\z\Controller
class UsersController extends \hhu\z\controllers\IntermediateController
{
/**
* User permissions