diff options
| author | michael pereira | 2011-10-28 12:23:18 +0200 |
|---|---|---|
| committer | michael pereira | 2011-10-28 12:23:18 +0200 |
| commit | bb871bfff179428ecd108239f80464bef254df88 (patch) | |
| tree | 66972bc98c3d8fba3822d976c9cb5ba1f08ab100 /application/modules | |
| parent | start label for vesamenu (diff) | |
| download | pbs2-bb871bfff179428ecd108239f80464bef254df88.tar.gz pbs2-bb871bfff179428ecd108239f80464bef254df88.tar.xz pbs2-bb871bfff179428ecd108239f80464bef254df88.zip | |
login
Diffstat (limited to 'application/modules')
| -rw-r--r-- | application/modules/ipxe/controllers/AuthController.php | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php index 45e1e22..a4d682c 100644 --- a/application/modules/ipxe/controllers/AuthController.php +++ b/application/modules/ipxe/controllers/AuthController.php @@ -85,9 +85,10 @@ 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 .= ":login\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"; - $result .= "shell\n"; + $result .= "goto 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"; } @@ -104,7 +105,7 @@ class Ipxe_AuthController extends Zend_Controller_Action if (isset($error)){ header('Content-Type: text/plain'); - $result = "bla"; + $result = "error"; header("Content-Length: ".(strlen($result))); echo $result; exit; @@ -158,24 +159,17 @@ class Ipxe_AuthController extends Zend_Controller_Action $this->error = "session"; } - if($this->error == 'login'){ + if(isset($this->error)){ header('Content-Type: text/plain'); $result = "#!ipxe\n"; - $result .= "module http://".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."/error/login\n"; - header("Content-Length: ".(strlen($result))); - echo $result; - exit; - }else{ - header('Content-Type: text/plain'); - $result = "#!ipxe\n"; - $result .= "module http://".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."/error/\n"; + $result = "imgfree\n"; + $result .= "module http://".$_SERVER['HTTP_HOST']."/ipxe/auth/login/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 logoutAction(){ |