summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authormichael pereira2011-09-27 00:47:10 +0200
committermichael pereira2011-09-27 00:47:10 +0200
commit8cb48a247ad58e00b06e276793e3752cda2b15d8 (patch)
treedf8a8bcfe995e158a59bca8dd7f9636134efeb74 /application
parentvesamenu test (diff)
downloadpbs2-8cb48a247ad58e00b06e276793e3752cda2b15d8.tar.gz
pbs2-8cb48a247ad58e00b06e276793e3752cda2b15d8.tar.xz
pbs2-8cb48a247ad58e00b06e276793e3752cda2b15d8.zip
vesamenu test
Diffstat (limited to 'application')
-rw-r--r--application/modules/ipxe/controllers/AuthController.php18
-rw-r--r--application/modules/ipxe/views/scripts/resource/getvesamenu.phtml3
2 files changed, 12 insertions, 9 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index d98c0e4..ab06818 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -218,15 +218,17 @@ class Ipxe_AuthController extends Zend_Controller_Action
$this->error = "session";
}
- header('Content-Type: text/plain');
-
- $result = "#!ipxe\n";
- $result .= "imgfree\n";
- $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$alpha."/error/$this->error\n";
-
- header("Content-Length: ".(strlen($result)));
+// header('Content-Type: text/plain');
+//
+// $result = "#!ipxe\n";
+// $result .= "imgfree\n";
+// $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$alpha."/error/$this->error\n";
+//
+// header("Content-Length: ".(strlen($result)));
+//
+// echo $result;
- echo $result;
+ $this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error);
}
diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index 5d0e747..4c88d84 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -128,7 +128,8 @@ MENU MSGCOLOR #ff1c2a33 #00000000 none
title ( "Select Membership:" );
if(isset($this->memberships)){
foreach($this->memberships as $membership){
- uriboot ($membership['group']." as ".$membership['role'], "/ipxe/auth/setgroup/membershipid/".$membership['membershipID']."/alpha/$this->alphaID", '');
+// uriboot ($membership['group']." as ".$membership['role'], "/ipxe/auth/setgroup/membershipid/".$membership['membershipID']."/alpha/$this->alphaID", '');
+ uriboot ($membership['group']." as ".$membership['role'], "vesamenu.c32", "/ipxe/auth/setgroup/membershipid/".$membership['membershipID']."/alpha/$this->alphaID");
}
uriboot ( "Return to Group Bootmenu", "/ipxe/auth/logout/alpha/$this->alphaID", "" );
}else{