From bc07ead96707b07fcc943a8ac2e9a9b378e9f4f7 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Wed, 26 Oct 2011 17:48:27 +0200
Subject: vesamenu.c32

---
 application/modules/ipxe/controllers/AuthController.php           | 3 +--
 application/modules/ipxe/views/scripts/resource/getvesamenu.phtml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'application/modules')

diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index 6fdfcbe..8a9c65b 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -100,7 +100,6 @@ class Ipxe_AuthController extends Zend_Controller_Action
 		if (isset($login)){
 			header('Content-Type: text/plain');
 			$result = "#!ipxe\n";
-			$result .= "imgfree\n";
 			$result .= "login\n";
 			$result .= "http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."\n";
 			header("Content-Length: ".(strlen($result)));
@@ -147,7 +146,7 @@ class Ipxe_AuthController extends Zend_Controller_Action
 			$this->error = "session";
 		}
 		
-		$this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error);
+		//$this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error);
 		
 	}   
 	
diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index 3408ec7..7e5f930 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -161,7 +161,7 @@ MENU MSGCOLOR                            #ff1c2a33 #00000000 none
 	  	comment ("info", "More Options:");
 	  	
 	  	if(!$this->loggedin){
-	  		uriboot ( "Login", "/ipxe/vesamenu.c32", "/ipxe/auth/login/alpha/$this->alphaID/login/true" );
+	  		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/vesamenu.c32", "/ipxe/auth/switchgroup/alpha/$this->alphaID" );
-- 
cgit v1.2.3-55-g7522