From 03b4da383449c290ea01723095d1a87fa257fea5 Mon Sep 17 00:00:00 2001 From: michael pereira Date: Tue, 29 Mar 2011 10:59:15 +0200 Subject: Preboot User Controller fertig, ACL fehlt noch --- application/modules/user/controllers/IndexController.php | 1 + 1 file changed, 1 insertion(+) (limited to 'application/modules/user/controllers/IndexController.php') diff --git a/application/modules/user/controllers/IndexController.php b/application/modules/user/controllers/IndexController.php index f795b16..f786eb7 100644 --- a/application/modules/user/controllers/IndexController.php +++ b/application/modules/user/controllers/IndexController.php @@ -9,6 +9,7 @@ class User_IndexController extends Zend_Controller_Action public function indexAction() { + if (!Zend_Auth::getInstance()->hasIdentity()) { $this->view->text = 'Your not logged in, please log in first here.'; } -- cgit v1.2.3-55-g7522 From 8a616c5e6d2a56b2aee5a10d68c27b99458a2c77 Mon Sep 17 00:00:00 2001 From: michael pereira Date: Tue, 29 Mar 2011 11:21:38 +0200 Subject: merges --- .zfproject.xml | 3 +- .../modules/user/controllers/IndexController.php | 3 +- application/modules/user/layouts/user.phtml | 32 +--------------------- 3 files changed, 5 insertions(+), 33 deletions(-) (limited to 'application/modules/user/controllers/IndexController.php') diff --git a/.zfproject.xml b/.zfproject.xml index 262f79c..c7a4807 100644 --- a/.zfproject.xml +++ b/.zfproject.xml @@ -316,6 +316,7 @@ + @@ -331,9 +332,9 @@ - + diff --git a/application/modules/user/controllers/IndexController.php b/application/modules/user/controllers/IndexController.php index f786eb7..1e15768 100644 --- a/application/modules/user/controllers/IndexController.php +++ b/application/modules/user/controllers/IndexController.php @@ -21,8 +21,9 @@ class User_IndexController extends Zend_Controller_Action '/user/config' => 'Create your own Configuration', '/user/bootmenu' => 'Create your Bootmenu', ); + $this->view->links = $links; } - $this->view->links = $links; + } diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml index 35f0b22..e09df87 100644 --- a/application/modules/user/layouts/user.phtml +++ b/application/modules/user/layouts/user.phtml @@ -19,36 +19,6 @@ echo $this->headScript()."\n";
-<<<<<<< HEAD - -
-
@@ -62,6 +32,7 @@ echo $this->headScript()."\n";
  • Group
  • Role
  • BootIso
    • +
  • PreBoot
  • BootMenu
  • Config
  • BootOs
    • @@ -75,7 +46,6 @@ echo $this->headScript()."\n"; Membership >>>>>> d7af4710c133f5cfaf830c9ef617bac9730a77d3 ?>
  • Select Membership
    • -- cgit v1.2.3-55-g7522