From d1520be1f6ee33a13a34b8b2d8eefee51d29ee59 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Wed, 21 Sep 2011 18:28:16 +0200
Subject: kleiner fix

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

(limited to 'application/modules')

diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index ceeaf73..5434a59 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -72,14 +72,10 @@ class Ipxe_AuthController extends Zend_Controller_Action
 			$result .= "imgfree\n";
 			if($login){
 				$result .= "login\n";
-				$result .= "kernel http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/true\n";
+				$result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/true\n";
 			}else{
-				$result .= "kernel http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/false\n";
+				$result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/false\n";
 			}
-     		
-			$result .= "module http://".$_SERVER['HTTP_HOST']."/ipxe/pbs2.png\n";
-			$result .= "boot\n";
-			
 			
 			header("Content-Length: ".(strlen($result)));
 		
diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index 7b5504e..b116c04 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -40,8 +40,8 @@
     echo "label failed\n";
     echo "  menu label Authentication Failed\n";
     echo "  menu disable\n";
-    uriboot ( "Try again", "http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/true", "" );
-    uriboot ( "Return to Group Bootmenu", "http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/false", "" );
+    uriboot ( "Try again", "/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/true", "" );
+    uriboot ( "Return to Group Bootmenu", "/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/false", "" );
   }
   
   function authenticated ($username, $password) {
@@ -59,7 +59,7 @@
 TIMEOUT 100
 PROMPT 0
 
-MENU BACKGROUND pbs2.png
+MENU BACKGROUND <?php echo "http://$this->host/ipxe/pbs2.png"; ?>
 MENU WIDTH 78
 MENU MARGIN 9
 MENU PASSWORDMARGIN 9
@@ -121,11 +121,11 @@ MENU MSGCOLOR                            #ff1c2a33 #00000000 none
   			}
   		}
   		if($this->login)
-  			uriboot ( "Return to Group Bootmenu", "http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/false", "" );
+  			uriboot ( "Return to Group Bootmenu", "/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/false", "" );
   	}
 
   	if(!$this->login){
-  		uriboot ( "Login", "http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/true", "" );
+  		uriboot ( "Login", "/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/true", "" );
   		texthelp("Login to get your own Bootmenu.");
   	}
   	
-- 
cgit v1.2.3-55-g7522