From 8b0c22d1bf77630dc28eb40f5a62e21e0a2ff0a6 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Sun, 30 Oct 2011 22:48:29 +0100
Subject: login

---
 .../modules/ipxe/controllers/AuthController.php     | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'application/modules/ipxe/controllers/AuthController.php')

diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index 4d11298..ecbce01 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -103,17 +103,6 @@ class Ipxe_AuthController extends Zend_Controller_Action
 		$login = $this->_request->getParam('login');
 		$error = $this->_request->getParam('error');
 		
-		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 .= "imgfree\n";
-			$result .= "module http://".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."/error/login\n";
-			header("Content-Length: ".(strlen($result)));
-			echo $result;
-			exit;
-		}
-		
 		if (isset($error)){
 			header('Content-Type: text/plain');
 			$result = "error";
@@ -132,6 +121,16 @@ class Ipxe_AuthController extends Zend_Controller_Action
 			exit;
 		}
 		
+		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 .= "imgfree\n";
+			$result .= "module http://".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."/error/login\n";
+			header("Content-Length: ".(strlen($result)));
+			echo $result;
+			exit;
+		}
 		
 		$email = $_SERVER['PHP_AUTH_USER'];
   		$password = $_SERVER['PHP_AUTH_PW'];
-- 
cgit v1.2.3-55-g7522