diff options
| author | michael pereira | 2011-09-20 17:05:02 +0200 |
|---|---|---|
| committer | michael pereira | 2011-09-20 17:05:02 +0200 |
| commit | ae4ffe939172fc99cddb720bac584b4ffe85f55f (patch) | |
| tree | ef390148dd304a10227ae4ee89250a5f7154b725 /application | |
| parent | vesamenu (diff) | |
| download | pbs2-ae4ffe939172fc99cddb720bac584b4ffe85f55f.tar.gz pbs2-ae4ffe939172fc99cddb720bac584b4ffe85f55f.tar.xz pbs2-ae4ffe939172fc99cddb720bac584b4ffe85f55f.zip | |
vesamenu
Diffstat (limited to 'application')
3 files changed, 8 insertions, 9 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php index 5ee0717..3b63b44 100644 --- a/application/modules/ipxe/controllers/AuthController.php +++ b/application/modules/ipxe/controllers/AuthController.php @@ -75,8 +75,8 @@ class Ipxe_AuthController extends Zend_Controller_Action $result .= "kernel http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenu/alpha/".$session->getAlphasessionID()." http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/true\n"; }else{ $result .= "set 209:string http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/false\n"; - $result .= "set 210:string http://".$_SERVER['HTTP_HOST']."/media/\n"; - $result .= "chain \${210:string}pxelinux.0\n"; + $result .= "set 210:string http://".$_SERVER['HTTP_HOST']."/"; + $result .= "chain \${210:string}ipxe/resource/getpxelinux/alpha/".$session->getAlphasessionID(); } header("Content-Length: ".(strlen($result))); diff --git a/application/modules/ipxe/controllers/ResourceController.php b/application/modules/ipxe/controllers/ResourceController.php index 7c68ec9..feb85d2 100644 --- a/application/modules/ipxe/controllers/ResourceController.php +++ b/application/modules/ipxe/controllers/ResourceController.php @@ -52,16 +52,15 @@ class Ipxe_ResourceController extends Zend_Controller_Action public function getvesamenuAction(){ if(is_dir("../resources/ipxe/")){ -// header('Content-Type: application/octet-stream'); -// $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $_SERVER['HTTP_USER_AGENT']) == 'IE') ? 'inline' : 'attachment'; -// header('Content-Disposition: ' . $content_disp . '; filename="vesamenu.c32"'); -// header('Pragma: no-cache'); -// header('Expires: 0'); + header('Content-Type: application/octet-stream'); + $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $_SERVER['HTTP_USER_AGENT']) == 'IE') ? 'inline' : 'attachment'; + header('Content-Disposition: ' . $content_disp . '; filename="vesamenu.c32"'); + header('Pragma: no-cache'); + header('Expires: 0'); chdir("../resources/ipxe/"); header("Content-Length: ".filesize(getcwd()."/vesamenu.c32")); - echo filesize(getcwd()."/vesamenu.c32"); passthru( "cat vesamenu.c32"); }else{ diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml index f985103..63d81f4 100644 --- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml +++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml @@ -58,7 +58,7 @@ ?> TIMEOUT 100 PROMPT 0 -DEFAULT <?php echo "http://$this->host/ipxe/resource/getvesamenu/alpha/$this->alphaID/file/vesamenu.c32\n"; ?> +DEFAULT <?php echo "http://$this->host/ipxe/resource/getvesamenu/alpha/$this->alphaID\n"; ?> MENU BACKGROUND http://pbs2.mp.openslx.org/media/img/pbs2.png MENU WIDTH 78 |