diff options
Diffstat (limited to 'application/modules/ipxe/controllers')
| -rw-r--r-- | application/modules/ipxe/controllers/AuthController.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php index 9ab1421..00e6cc3 100644 --- a/application/modules/ipxe/controllers/AuthController.php +++ b/application/modules/ipxe/controllers/AuthController.php @@ -85,7 +85,8 @@ class Ipxe_AuthController extends Zend_Controller_Action if(isset($this->session)){ $result .= ":start\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"; - $result .= "goto start\n"; + $result .= "imgselect login || goto start\n"; + $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/login\n"; }else{ $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/serialnumer/$serialnumber/mac/$mac/error/$this->error\n"; } @@ -103,7 +104,7 @@ class Ipxe_AuthController extends Zend_Controller_Action header('Content-Type: text/plain'); $result = "#!ipxe\n"; $result .= "login\n"; - $result .= "module http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."\n"; + $result .= "chain http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."\n"; header("Content-Length: ".(strlen($result))); echo $result; exit; @@ -141,15 +142,16 @@ class Ipxe_AuthController extends Zend_Controller_Action } else { $this->error = "login"; + $this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); } }else{ $this->error = "session"; } header('Content-Type: text/plain'); - $result = "blub"; - header("Content-Length: ".(strlen($result))); - echo $result; +// $result = "blub"; +// header("Content-Length: ".(strlen($result))); +// echo $result; //$this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); |