diff options
| -rw-r--r-- | application/modules/ipxe/controllers/AuthController.php | 20 | ||||
| -rw-r--r-- | application/modules/ipxe/views/scripts/resource/getvesamenu.phtml | 8 |
2 files changed, 21 insertions, 7 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php index b6f9f10..27feff7 100644 --- a/application/modules/ipxe/controllers/AuthController.php +++ b/application/modules/ipxe/controllers/AuthController.php @@ -172,7 +172,14 @@ class Ipxe_AuthController extends Zend_Controller_Action { $this->error = "session"; } - $this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); + header('Content-Type: text/plain'); + $result = "#!ipxe\n"; + $result .= "set filename http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$alpha."/error/".$this->error."\n"; + header("Content-Length: ".(strlen($result))); + echo $result; + exit; + + //$this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); } @@ -186,8 +193,15 @@ class Ipxe_AuthController extends Zend_Controller_Action { } else { $this->error = "session"; } - - $this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); + + header('Content-Type: text/plain'); + $result = "#!ipxe\n"; + $result .= "set filename http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$alpha."/error/".$this->error."\n"; + header("Content-Length: ".(strlen($result))); + echo $result; + exit; + + //$this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); } public function setgroupAction() { diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml index 8242923..fd257c4 100644 --- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml +++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml @@ -48,7 +48,7 @@ function nomembership ($alphaID) { title ("You have no memberships"); - uriboot ( "Return to Group Bootmenu", "/ipxe/vesamenu.c32", "/ipxe/auth/logout/alpha/$alphaID" ); + uriboot ( "Return to Group Bootmenu", "/ipxe/auth/logout/alpha/$alphaID", "" ); } function retry ($alphaID) { @@ -138,7 +138,7 @@ MENU MSGCOLOR #ff1c2a33 #00000000 none } comment ("", ""); comment ("login", "Logged-In as $this->firstname $this->name"); - uriboot ( "Logout (Return to Group Bootmenu)", "/ipxe/vesamenu.c32", "/ipxe/auth/logout/alpha/$this->alphaID" ); + uriboot ( "Logout (Return to Group Bootmenu)", "/ipxe/auth/logout/alpha/$this->alphaID", ""); }else{ nomembership($this->alphaID); } @@ -173,8 +173,8 @@ MENU MSGCOLOR #ff1c2a33 #00000000 none texthelp("Login to get your own Bootmenu."); }else{ comment ("login", "Logged-In as $this->firstname $this->name in Group $this->group"); - uriboot ( "Switch Group From $this->group", "/ipxe/vesamenu.c32", "/ipxe/auth/switchgroup/alpha/$this->alphaID" ); - uriboot ( "Logout (Return to Group Bootmenu)", "/ipxe/vesamenu.c32", "/ipxe/auth/logout/alpha/$this->alphaID" ); + uriboot ( "Switch Group From $this->group", "/ipxe/auth/switchgroup/alpha/$this->alphaID", "" ); + uriboot ( "Logout (Return to Group Bootmenu)", "/ipxe/auth/logout/alpha/$this->alphaID", "" ); } localboot(); |