summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Neves2012-06-27 12:03:49 +0200
committerMichael Neves2012-06-27 12:03:49 +0200
commit4258502628ad386d3de0f364751961935301ffdd (patch)
tree877f06f50b3d203ac40ae189bda3249f58aa7176
parentrelative urls removed from vesamenu (diff)
downloadpbs2-4258502628ad386d3de0f364751961935301ffdd.tar.gz
pbs2-4258502628ad386d3de0f364751961935301ffdd.tar.xz
pbs2-4258502628ad386d3de0f364751961935301ffdd.zip
ipxe login redirects
-rw-r--r--application/modules/ipxe/controllers/AuthController.php30
1 files changed, 16 insertions, 14 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index b56982f..d600548 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -116,13 +116,14 @@ class Ipxe_AuthController extends Zend_Controller_Action {
}
if(!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])) {
- header('WWW-Authenticate: Basic realm=""');
- header('HTTP/1.0 401 Unauthorized');
- $result = "#!ipxe\n";
- $result .= "set filename ".$this->httpmode."://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/login\n";
- header("Content-Length: ".(strlen($result)));
- echo $result;
- exit;
+ $this->_redirect($this->httpmode."://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/login");
+// header('WWW-Authenticate: Basic realm=""');
+// header('HTTP/1.0 401 Unauthorized');
+// $result = "#!ipxe\n";
+// $result .= "set filename ".$this->httpmode."://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/login\n";
+// header("Content-Length: ".(strlen($result)));
+// echo $result;
+// exit;
}
$email = $_SERVER['PHP_AUTH_USER'];
@@ -156,13 +157,14 @@ class Ipxe_AuthController extends Zend_Controller_Action {
$this->error = "session";
}
-
- header('Content-Type: text/plain');
- $result = "#!ipxe\n";
- $result .= "set filename ".$this->httpmode."://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/".$this->error."\n";
- header("Content-Length: ".(strlen($result)));
- echo $result;
- exit;
+ $this->_redirect($this->httpmode."://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/".$this->error);
+
+// header('Content-Type: text/plain');
+// $result = "#!ipxe\n";
+// $result .= "set filename ".$this->httpmode."://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/".$this->error."\n";
+// header("Content-Length: ".(strlen($result)));
+// echo $result;
+// exit;