From 4258502628ad386d3de0f364751961935301ffdd Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Wed, 27 Jun 2012 12:03:49 +0200
Subject: ipxe login redirects

---
 .../modules/ipxe/controllers/AuthController.php    | 30 ++++++++++++----------
 1 file 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;
 
 
 
-- 
cgit v1.2.3-55-g7522