diff options
| author | michael pereira | 2011-10-27 15:25:16 +0200 |
|---|---|---|
| committer | michael pereira | 2011-10-27 15:25:16 +0200 |
| commit | a92b0b5dd8ce58b2a1f01cfb31036a7410a17ba8 (patch) | |
| tree | 17b807c68c3616474c8f8e6d6d50cc02439fc828 | |
| parent | vesamenu.c32 (diff) | |
| download | pbs2-a92b0b5dd8ce58b2a1f01cfb31036a7410a17ba8.tar.gz pbs2-a92b0b5dd8ce58b2a1f01cfb31036a7410a17ba8.tar.xz pbs2-a92b0b5dd8ce58b2a1f01cfb31036a7410a17ba8.zip | |
vesamenu
| -rw-r--r-- | application/modules/ipxe/controllers/AuthController.php | 33 | ||||
| -rw-r--r-- | application/modules/ipxe/views/scripts/resource/getvesamenu.phtml | 2 |
2 files changed, 4 insertions, 31 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php index d168d12..aaa4d0e 100644 --- a/application/modules/ipxe/controllers/AuthController.php +++ b/application/modules/ipxe/controllers/AuthController.php @@ -84,6 +84,7 @@ class Ipxe_AuthController extends Zend_Controller_Action $result .= "imgfree\n"; if(isset($this->session)){ $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 .= "show dns\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"; } @@ -107,8 +108,6 @@ class Ipxe_AuthController extends Zend_Controller_Action exit; } - - // if(!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])){ // header('WWW-Authenticate: Basic realm=""'); // header('HTTP/1.0 401 Unauthorized'); @@ -146,6 +145,8 @@ class Ipxe_AuthController extends Zend_Controller_Action $this->error = "session"; } + header('Content-Type: text/html'); + //$this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); } @@ -162,15 +163,6 @@ 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))); - -// echo $result; $this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); } @@ -185,15 +177,6 @@ class Ipxe_AuthController extends Zend_Controller_Action }else{ $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))); - -// echo $result; $this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); } @@ -211,16 +194,6 @@ 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))); -// -// 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 7e5f930..b1c088a 100644 --- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml +++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml @@ -92,7 +92,7 @@ MENU VSHIFT 7 menu color border 37;40 #00000000 #00000000 std menu color title 1 #ee004a99 #00000000 all menu color unsel 37;40 #ff4f75aa #00000000 all -menu color hotkey 1;37;40 #ffff8b00 #ff8093a1 std +#menu color hotkey 1;37;40 #ffff8b00 #ff8093a1 std menu color sel 7;37;40 #ff1c2a33 #667799bb all #menu color hotsel 1;7;37;40 #ffff8b00 #667799bb all #menu color disabled 1;37;40 #ffff8b00 #ff8093a1 std |