From a6728371a278703860bf44910d58e950ed641f60 Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Wed, 27 Jun 2012 12:29:50 +0200
Subject: getvesamenu httpmode and host

---
 .../ipxe/views/scripts/resource/getvesamenu.phtml  | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index 88be86f..e3c2bf6 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -46,25 +46,25 @@
 	echo "ENDTEXT\n";
   }
   
-  function nomembership ($alphaID) {
+  function nomembership ($alphaID, $httpmode, $host) {
     title ("You have no memberships");
-    uriboot ( "Return to Group Bootmenu", "$this->httpmode://$this->host/ipxe/auth/logout/alpha/$alphaID", "" );
+    uriboot ( "Return to Group Bootmenu", "$httpmode://$host/ipxe/auth/logout/alpha/$alphaID", "" );
   }
   
-  function retry ($alphaID) {
+  function retry ($alphaID, $httpmode, $host) {
     title ("Authentication Failed");
-    uriboot ( "Try again", "$this->httpmode://$this->host/ipxe/auth/login/alpha/$alphaID/login/true", "" );
-    uriboot ( "Return to Group Bootmenu", "$this->httpmode://$this->host/ipxe/auth/logout/alpha/$alphaID", "" );
+    uriboot ( "Try again", "$httpmode://$host/ipxe/auth/login/alpha/$alphaID/login/true", "" );
+    uriboot ( "Return to Group Bootmenu", "$httpmode://$host/ipxe/auth/logout/alpha/$alphaID", "" );
   }
   
-  function sessionerror ($serialnumber,$mac) {
+  function sessionerror ($serialnumber, $mac, $httpmode, $host) {
     title ("A Session Error occured");
-    uriboot ( "Reconnect", "$this->httpmode://$this->host/ipxe/auth/serial/serialnumber/$serialnumber/mac/$mac", "" );
+    uriboot ( "Reconnect", "$httpmode://$host/ipxe/auth/serial/serialnumber/$serialnumber/mac/$mac", "" );
   }
   
-  function serialerror ($serialnumber,$mac) {
+  function serialerror ($serialnumber, $mac, $httpmode, $host) {
     title ("The Serial was not found. Press Tab to change the Serial or contact an Admin");
-    uriboot ( "Reconnect", "$this->httpmode://$this->host/ipxe/auth/serial/serialnumber/$serialnumber/mac/$mac", "" );
+    uriboot ( "Reconnect", "$httpmode://$host/ipxe/auth/serial/serialnumber/$serialnumber/mac/$mac", "" );
   }
   
   function nobootmenu () {
@@ -123,13 +123,13 @@ MENU MSGCOLOR                            #ff1c2a33 #00000000 none
   if(isset($this->error)){
 	  switch($this->error){
 	  	case "serial": 
-	  		serialerror($this->serialnumber, $this->mac);
+	  		serialerror($this->serialnumber, $this->mac, $this->httpmode, $this->host);
 	  		break;
 	  	case "session":
-	  		sessionerror($this->serialnumber, $this->mac);
+	  		sessionerror($this->serialnumber, $this->mac, $this->httpmode, $this->host);
 	  		break;
 	  	case "login":
-	  		retry($this->alphaID);
+	  		retry($this->alphaID, $this->httpmode, $this->host);
 	  		break;
 	  }
   }else{
@@ -144,7 +144,7 @@ MENU MSGCOLOR                            #ff1c2a33 #00000000 none
 	  		comment ("login", "Logged-In as $this->firstname $this->name");
 	  		uriboot ( "Logout (Return to Group Bootmenu)", "$this->httpmode://$this->host/ipxe/auth/logout/alpha/$this->alphaID", "");
 	  	}else{
-	  		nomembership($this->alphaID);
+	  		nomembership($this->alphaID, $this->httpmode, $this->host);
 	  	}
 	  }else{
 
-- 
cgit v1.2.3-55-g7522