summaryrefslogtreecommitdiffstats
path: root/application/modules/ipxe
diff options
context:
space:
mode:
authormichael pereira2011-09-26 02:38:27 +0200
committermichael pereira2011-09-26 02:38:27 +0200
commit79ee45445d6d30d1e45914037775c0d2ec32ce5b (patch)
treeb10f303a8567b4653845d537c702b0c836e96fd4 /application/modules/ipxe
parentmenues ueberarbeitet (diff)
downloadpbs2-79ee45445d6d30d1e45914037775c0d2ec32ce5b.tar.gz
pbs2-79ee45445d6d30d1e45914037775c0d2ec32ce5b.tar.xz
pbs2-79ee45445d6d30d1e45914037775c0d2ec32ce5b.zip
menues ueberarbeitet
Diffstat (limited to 'application/modules/ipxe')
-rw-r--r--application/modules/ipxe/controllers/AuthController.php1
-rw-r--r--application/modules/ipxe/controllers/ResourceController.php7
-rw-r--r--application/modules/ipxe/views/scripts/resource/getvesamenu.phtml1
3 files changed, 9 insertions, 0 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index 1fdaead..eedee1f 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -105,6 +105,7 @@ class Ipxe_AuthController extends Zend_Controller_Action
$result .= "login\n";
$result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."\n";
header("Content-Length: ".(strlen($result)));
+ echo $result;
exit;
}
diff --git a/application/modules/ipxe/controllers/ResourceController.php b/application/modules/ipxe/controllers/ResourceController.php
index 44e45b2..b853c24 100644
--- a/application/modules/ipxe/controllers/ResourceController.php
+++ b/application/modules/ipxe/controllers/ResourceController.php
@@ -76,6 +76,13 @@ class Ipxe_ResourceController extends Zend_Controller_Action
$vesamenuView->loggedin = false;
}
+ if($this->session->getMembershipID() != null){
+ $groupMapper = new Application_Model_GroupMapper();
+ $membershipMapper = new Application_Model_MembershipMapper();
+ $membership = $membershipMapper->find($this->session->getMembershipID());
+ $vesamenuView->group = $groupMapper->find($membership->getGroupID())->getTitle();
+ }
+
if ($this->session->getPersonID() != null && $this->session->getMembershipID() == null ){
$groupMapper = new Application_Model_GroupMapper();
$roleMapper = new Application_Model_RoleMapper();
diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index 7755c54..d54c030 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -156,6 +156,7 @@ MENU MSGCOLOR #ff1c2a33 #00000000 none
nobootmenu();
}
+ comment ("", "");
comment ("info", "More Options:");
if(!$this->loggedin){