summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
authormichael pereira2011-10-28 14:22:35 +0200
committermichael pereira2011-10-28 14:22:35 +0200
commite7fc0e5d2050bd76752e6c17233e7093daab13da (patch)
tree4a039c343a3034963b36a46702c36ec5b724679c /application/modules
parentlogin (diff)
downloadpbs2-e7fc0e5d2050bd76752e6c17233e7093daab13da.tar.gz
pbs2-e7fc0e5d2050bd76752e6c17233e7093daab13da.tar.xz
pbs2-e7fc0e5d2050bd76752e6c17233e7093daab13da.zip
login
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/ipxe/controllers/AuthController.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index abc3e77..0c20d76 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -113,9 +113,7 @@ class Ipxe_AuthController extends Zend_Controller_Action
if (isset($login)){
- header('Content-Type: text/plain');
- header('WWW-Authenticate: Basic realm=""');
- header('HTTP/1.0 401 Unauthorized');
+header('Content-Type: text/plain');
$result = "#!ipxe\n";
$result .= "login\n";
$result .= "chain http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."\n";
@@ -125,7 +123,10 @@ class Ipxe_AuthController extends Zend_Controller_Action
}
if(!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])){
- header('Content-Type: text/plain');
+ header('Content-Type: text/plain');
+ header('WWW-Authenticate: Basic realm=""');
+ header('HTTP/1.0 401 Unauthorized');
+
$result .= "imgfree\n";
$result .= "module http://".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."/error/login\n";
header("Content-Length: ".(strlen($result)));