diff options
| author | michael pereira | 2011-07-19 21:03:08 +0200 |
|---|---|---|
| committer | michael pereira | 2011-07-19 21:03:08 +0200 |
| commit | a42a7f6c86e2956b269b21b76909c6adc2bb2d36 (patch) | |
| tree | 85d348aa8de8f50e8699c91d579788def8bcb1b8 /application/modules/ipxe/controllers | |
| parent | menu structure (diff) | |
| download | pbs2-a42a7f6c86e2956b269b21b76909c6adc2bb2d36.tar.gz pbs2-a42a7f6c86e2956b269b21b76909c6adc2bb2d36.tar.xz pbs2-a42a7f6c86e2956b269b21b76909c6adc2bb2d36.zip | |
menu structire
Diffstat (limited to 'application/modules/ipxe/controllers')
| -rw-r--r-- | application/modules/ipxe/controllers/AuthController.php | 4 | ||||
| -rw-r--r-- | application/modules/ipxe/controllers/ResourceController.php | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php index bedd202..e0bca26 100644 --- a/application/modules/ipxe/controllers/AuthController.php +++ b/application/modules/ipxe/controllers/AuthController.php @@ -72,11 +72,13 @@ class Ipxe_AuthController extends Zend_Controller_Action $result .= "imgfree\n"; if(isset($login)){ $result .= "login\n"; + $result .= "chain 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/".$login; }else{ $login = false; + $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenu/alpha/".$session->getAlphasessionID()." http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/".$login; } - $result .= "chain 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/".$login; + header("Content-Length: ".(strlen($result))); diff --git a/application/modules/ipxe/controllers/ResourceController.php b/application/modules/ipxe/controllers/ResourceController.php index ed317ce..52c7ccb 100644 --- a/application/modules/ipxe/controllers/ResourceController.php +++ b/application/modules/ipxe/controllers/ResourceController.php @@ -71,12 +71,15 @@ class Ipxe_ResourceController extends Zend_Controller_Action public function getvesamenuconfigAction(){ - if(!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])){ - header('WWW-Authenticate: Basic realm=""'); - header('HTTP/1.0 401 Unauthorized'); - exit; - } - + $login = $this->_request->getParam('login'); + + if($login){ + if(!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])){ + header('WWW-Authenticate: Basic realm=""'); + header('HTTP/1.0 401 Unauthorized'); + exit; + } + } header('Content-Type: text/html'); $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $_SERVER['HTTP_USER_AGENT']) == 'IE') ? 'inline' : 'attachment'; header('Content-Disposition: ' . $content_disp . '; filename="vesamenu.conf"'); @@ -87,7 +90,7 @@ class Ipxe_ResourceController extends Zend_Controller_Action $vesamenuView->addScriptPath(APPLICATION_PATH.'/modules/ipxe/views/scripts/resource/'); $vesamenuView->username = $_SERVER['PHP_AUTH_USER']; $vesamenuView->password = $_SERVER['PHP_AUTH_PW']; - $vesamenuView->login = $this->_request->getParam('login'); + $vesamenuView->login = $login; $vesamenuView->host = $_SERVER['HTTP_HOST']; $_SESSION['alphasessionID'] = $this->thisSession->getAlphasessionID(); |