From 7af05732e2f961c7bd764f35e825d3bd1dde0577 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Thu, 27 Oct 2011 16:48:54 +0200
Subject: start label for vesamenu

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

(limited to 'application/modules')

diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index 76e6bd3..9ab1421 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -83,9 +83,9 @@ class Ipxe_AuthController extends Zend_Controller_Action
 		$result = "#!ipxe\n";
 		$result .= "imgfree\n";
 		if(isset($this->session)){
+			$result .= ":start\n";
 			$result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/$this->error\n";
-			$result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/$this->error\n";
-			
+			$result .= "goto start\n";			
 		}else{ 
 			$result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/serialnumer/$serialnumber/mac/$mac/error/$this->error\n";
 		}
diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index 4909f89..f07fb6a 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -44,13 +44,13 @@
   
   function nomembership ($alphaID) {
     comment ("failed", "You have no memberships");
-    uriboot ( "Return to Group Bootmenu", "/ipxe/auth/logout/alpha/$alphaID", "" );
+    uriboot ( "Return to Group Bootmenu", "/ipxe/vesamenu.c32", "/ipxe/auth/logout/alpha/$alphaID" );
   }
   
   function retry ($alphaID) {
     comment ("failed", "Authentication Failed");
     uriboot ( "Try again", "/ipxe/auth/login/alpha/$alphaID/login/true", "" );
-    uriboot ( "Return to Group Bootmenu", "/ipxe/auth/logout/alpha/$alphaID", "" );
+    uriboot ( "Return to Group Bootmenu", "/ipxe/vesamenu.c32", "/ipxe/auth/logout/alpha/$alphaID" );
   }
   
   function sessionerror ($serialnumber,$mac) {
-- 
cgit v1.2.3-55-g7522