diff options
author | Simon | 2011-03-16 13:01:28 +0100 |
---|---|---|
committer | Simon | 2011-03-16 13:01:28 +0100 |
commit | b99d7a884edabd9e5d297c8117ee7552ca702b96 (patch) | |
tree | 185a8b8a4cdbb868380a1549f0e540c4174f5dae /application | |
parent | controller und actions für Client und Pool hinzugefügt (diff) | |
download | pbs2-b99d7a884edabd9e5d297c8117ee7552ca702b96.tar.gz pbs2-b99d7a884edabd9e5d297c8117ee7552ca702b96.tar.xz pbs2-b99d7a884edabd9e5d297c8117ee7552ca702b96.zip |
Arbeiten am Clientcontroller, Membership in Auth gesetzt
Diffstat (limited to 'application')
7 files changed, 53 insertions, 13 deletions
diff --git a/application/modules/dev/layouts/dev.phtml b/application/modules/dev/layouts/dev.phtml index 2c7f6f0..b911944 100644 --- a/application/modules/dev/layouts/dev.phtml +++ b/application/modules/dev/layouts/dev.phtml @@ -22,7 +22,7 @@ echo $this->headScript()."\n"; <div id='sidepannel'> <div id="logo"><div id="logo-bar-gray"></div></div> <div id="sidepannel-top"> - <h1>dev</h1> + <h1><a href=/><</a> <a href=/dev/>dev</a></h1> <ul> <li>Controller: <ul> diff --git a/application/modules/fbgui/layouts/fbgui.phtml b/application/modules/fbgui/layouts/fbgui.phtml index 1f10683..e3b286a 100644 --- a/application/modules/fbgui/layouts/fbgui.phtml +++ b/application/modules/fbgui/layouts/fbgui.phtml @@ -23,8 +23,8 @@ echo $this->headScript()."\n"; <div id='sidepannel'> <div id="logo"><div id="logo-bar-gray"></div></div> <div id="sidepannel-top"> + <h1><a href=/><</a> <a href=/fbgui/>fbgui</a></h1> <ul> - <h1>fbgui</h1> <li>Controller: <ul> <li><a href='/dev/person'>Person</a></li> diff --git a/application/modules/user/controllers/AuthController.php b/application/modules/user/controllers/AuthController.php index 4721616..76dc243 100644 --- a/application/modules/user/controllers/AuthController.php +++ b/application/modules/user/controllers/AuthController.php @@ -11,6 +11,7 @@ class User_AuthController extends Zend_Controller_Action public function indexAction() { // action body + $_SESSION['membershipID'] = 1; } diff --git a/application/modules/user/controllers/ClientController.php b/application/modules/user/controllers/ClientController.php index cb139d5..a8d0d3d 100644 --- a/application/modules/user/controllers/ClientController.php +++ b/application/modules/user/controllers/ClientController.php @@ -2,15 +2,29 @@ class User_ClientController extends Zend_Controller_Action { - + private $this->membership; public function init() { /* Initialize action controller here */ + $membershipMapper = new Application_Model_MembershipMapper(); + $this->membership = new Application_Model_Membership(); + $membershipMapper->find($_SESSION['membershipID'],$this->membership); } public function indexAction() { - // action body + // TODO: ACL: is he athorized to see this ? + + // Get the Clients which booted with a bootiso of this group + $groupID = $this->membership->getGroupID(); + $bootisoMapper = new Application_Model_BootIsoMapper(); + $bootisos = $bootisoMapper->findby('groupID',$groupID); + + $sessions + + + + } public function addclientAction() diff --git a/application/modules/user/controllers/IndexController.php b/application/modules/user/controllers/IndexController.php index d39ff21..8b295e0 100644 --- a/application/modules/user/controllers/IndexController.php +++ b/application/modules/user/controllers/IndexController.php @@ -2,17 +2,26 @@ class User_IndexController extends Zend_Controller_Action { - public function init() { /* Initialize action controller here */ } - public function indexAction() - { - + public function indexAction() + { + if (!Zend_Auth::getInstance()->hasIdentity()) { + $this->view->text = 'Your not logged in, please log in first <a href="/user/auth/">here</a>.'; + } + else{ + $this->view->text = "You're Welcome"; + $links = array( + '/user/person' => 'Change your Details', + '/user/person/request' => 'Request Membership in a Group', + '/user/config' => 'Create your own Configuration', + '/user/bootmenu' => 'Create your Bootmenu', + ); + } + $this->view->links = $links; } - - } diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml index 91e5eb8..36d73b4 100644 --- a/application/modules/user/layouts/user.phtml +++ b/application/modules/user/layouts/user.phtml @@ -23,8 +23,8 @@ echo $this->headScript()."\n"; <div id='sidepannel'> <div id="logo"><div id="logo-bar-gray"></div></div> <div id="sidepannel-top"> + <h1><a href=/><</a> <a href=/user/>user</a></h1> <ul> - <h1>user</h1> <li>Controller: <ul> <li><a href='/user/person'>Person</a></li> @@ -37,7 +37,7 @@ echo $this->headScript()."\n"; <li><a href='/user/client'>Client</a></li> <li><a href='/user/filter'>Filter</a></li> <li><a href='/user/pool'>Pool</a></li> - + <li><a href='/user/auth'>Auth</a></li> <?php if (!Zend_Auth::getInstance()->hasIdentity()) {?> <li><a href='/user/auth/login'>Login</a></li> <li><a href='/user/auth/register'>Register</a></li> diff --git a/application/modules/user/views/scripts/index/index.phtml b/application/modules/user/views/scripts/index/index.phtml index f4feaa0..77e0720 100644 --- a/application/modules/user/views/scripts/index/index.phtml +++ b/application/modules/user/views/scripts/index/index.phtml @@ -1,2 +1,18 @@ <h1>Welcome</h1> -<div class='infobox'>nothing to see here</div> + +<div class='infobox'><?php echo $this->text;?></div> +<div class='checkbox'><?php echo $this->text;?></div> +<div class='warningbox'><?php echo $this->text;?></div> +<div class='errorbox'><?php echo $this->text;?></div> +<?php print_a($this->links);?> + +<?php if(count($this->links)>0 && is_array($this->links)): ?> +<ul> +<?php foreach($this->links as $link => $text):?> +<li><a href='<?php echo $link;?>'><?php echo $text;?></a></li> + +<?php endforeach ?> +</ul> + +<?php endif ?> + |