diff options
| author | michael pereira | 2011-09-27 00:36:00 +0200 |
|---|---|---|
| committer | michael pereira | 2011-09-27 00:36:00 +0200 |
| commit | deb4e6c901c3b0afecd752db3fbc10a8a548c031 (patch) | |
| tree | 4e48a870cbb10ff76e392aaa76de0246bd21e4f1 /application/modules/ipxe | |
| parent | auth header (diff) | |
| download | pbs2-deb4e6c901c3b0afecd752db3fbc10a8a548c031.tar.gz pbs2-deb4e6c901c3b0afecd752db3fbc10a8a548c031.tar.xz pbs2-deb4e6c901c3b0afecd752db3fbc10a8a548c031.zip | |
vesamenu test
Diffstat (limited to 'application/modules/ipxe')
| -rw-r--r-- | application/modules/ipxe/controllers/AuthController.php | 22 | ||||
| -rw-r--r-- | application/modules/ipxe/views/scripts/resource/getvesamenu.phtml | 5 |
2 files changed, 14 insertions, 13 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php index 5d0b504..d98c0e4 100644 --- a/application/modules/ipxe/controllers/AuthController.php +++ b/application/modules/ipxe/controllers/AuthController.php @@ -83,10 +83,8 @@ class Ipxe_AuthController extends Zend_Controller_Action $result = "#!ipxe\n"; $result .= "imgfree\n"; if(isset($this->session)){ - $result .= "module http://".$_SERVER['HTTP_HOST']."/ipxe/pbs2.png\n"; $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/$this->error\n"; }else{ - $result .= "module http://".$_SERVER['HTTP_HOST']."/ipxe/pbs2.png\n"; $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/serialnumer/$serialnumber/mac/$mac/error/$this->error\n"; } header("Content-Length: ".(strlen($result))); @@ -102,7 +100,7 @@ class Ipxe_AuthController extends Zend_Controller_Action if (isset($login)){ header('Content-Type: text/plain'); $result = "#!ipxe\n"; - //$result .= "imgfree\n"; + $result .= "imgfree\n"; $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))); @@ -194,15 +192,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-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; - header("Content-Length: ".(strlen($result))); - - echo $result; + $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 73e0cff..5d0e747 100644 --- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml +++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml @@ -73,7 +73,7 @@ TIMEOUT 100 PROMPT 0 DEFAULT vesamenu.c32 -MENU BACKGROUND pbs2.png +MENU BACKGROUND <?php echo "http://$this->host/ipxe/pbs2.png\n"; ?> MENU WIDTH 78 MENU MARGIN 9 MENU PASSWORDMARGIN 9 @@ -164,7 +164,8 @@ MENU MSGCOLOR #ff1c2a33 #00000000 none uriboot ( "Login", "/ipxe/auth/login/alpha/$this->alphaID/login/true", "" ); texthelp("Login to get your own Bootmenu."); }else{ - uriboot ( "Switch Group From $this->group", "/ipxe/auth/switchgroup/alpha/$this->alphaID", "" ); + //uriboot ( "Switch Group From $this->group", "/ipxe/auth/switchgroup/alpha/$this->alphaID", "" ); + uriboot ( "Switch Group From $this->group", "vesamenu.c32", "/ipxe/auth/switchgroup/alpha/$this->alphaID" ); uriboot ( "Return to Group Bootmenu $this->group", "/ipxe/auth/logout/alpha/$this->alphaID", "" ); } |