menues ueberarbeitet

2 files changed, 10 insertions, 7 deletions

diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index 7eca400..931ea64 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -95,8 +95,9 @@ class Ipxe_AuthController extends Zend_Controller_Action
 	public function loginAction()
 	{
 		$alpha = $this->_request->getParam('alpha');
-			 	
-		if(!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])){
+		$login = $this->_request->getParam('login');
+		
+		if (isset($login)){
 			header('Content-Type: text/plain');
 			$result = "#!ipxe\n";
 			$result .= "imgfree\n";
@@ -104,12 +105,14 @@ class Ipxe_AuthController extends Zend_Controller_Action
 			$result .= "chain http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."\n";
 			header("Content-Length: ".(strlen($result)));
 			echo $result; 
-  			exit;
 		}
 		
-//		header('WWW-Authenticate: Basic realm=""');
-//		header('HTTP/1.0 401 Unauthorized');
-	 	
+		if(!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])){
+			header('WWW-Authenticate: Basic realm=""');
+			header('HTTP/1.0 401 Unauthorized');
+  			exit;
+		}
+
 		$email = $_SERVER['PHP_AUTH_USER'];
   		$password = $_SERVER['PHP_AUTH_PW'];
 	
diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index d54c030..74fbda4 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -160,7 +160,7 @@ MENU MSGCOLOR                            #ff1c2a33 #00000000 none
 	  	comment ("info", "More Options:");
 	  	
 	  	if(!$this->loggedin){
-	  		uriboot ( "Login", "/ipxe/auth/login/alpha/$this->alphaID", "" );
+	  		uriboot ( "Login", "/ipxe/auth/login/alpha/$this->alphaID/login/true", "" );
 	  		texthelp("Login to get your own Bootmenu.");
 	  	}else{
 	  		uriboot ( "Switch Group From $this->group", "/ipxe/auth/switchgroup/alpha/$this->alphaID", "" );