diff options
| -rw-r--r-- | application/modules/ipxe/controllers/AuthController.php | 13 | ||||
| -rw-r--r-- | application/modules/ipxe/views/scripts/resource/getvesamenu.phtml | 12 |
2 files changed, 11 insertions, 14 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php index de0656c..ab0f48f 100644 --- a/application/modules/ipxe/controllers/AuthController.php +++ b/application/modules/ipxe/controllers/AuthController.php @@ -69,19 +69,16 @@ class Ipxe_AuthController extends Zend_Controller_Action header('Content-Type: text/plain'); $result = "#!ipxe\n"; -// $result .= "imgfree\n"; + $result .= "imgfree\n"; if($login){ $result .= "login\n"; - $result .= "set 209:string http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/true\n"; - $result .= "set 210:string http://".$_SERVER['HTTP_HOST']."/\n"; - $result .= "chain \${210:string}ipxe/resource/getpxelinux/alpha/".$session->getAlphasessionID()."/file/pxelinux.0\n"; + $result .= "set 209:string http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/true\n"; }else{ $result .= "set 209:string http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/false\n"; - $result .= "set 210:string http://".$_SERVER['HTTP_HOST']."/\n"; - $result .= "chain \${210:string}ipxe/resource/getpxelinux/alpha/".$session->getAlphasessionID()."/file/pxelinux.0\n"; } -// \${username:uristring}:\${password:uristring}@ - + + $result .= "set 210:string http://".$_SERVER['HTTP_HOST']."/ipxe/\n"; + $result .= "chain \${210:string}pxelinux.0\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 f985103..50b96e6 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", "/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", "" ); + uriboot ( "Try again", "http://$this->host/ipxe/gpxecmd.c32", "chain 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/gpxecmd.c32", "chain http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/false" ); } function authenticated ($username, $password) { @@ -58,9 +58,9 @@ ?> TIMEOUT 100 PROMPT 0 -DEFAULT <?php echo "http://$this->host/ipxe/resource/getvesamenu/alpha/$this->alphaID/file/vesamenu.c32\n"; ?> +DEFAULT <?php echo "http://$this->host/ipxe/vesamenu.c32\n"; ?> -MENU BACKGROUND http://pbs2.mp.openslx.org/media/img/pbs2.png +MENU BACKGROUND <?php echo "http://$this->host/ipxe/pbs2.png\n"; ?> MENU WIDTH 78 MENU MARGIN 9 MENU PASSWORDMARGIN 9 @@ -122,11 +122,11 @@ MENU MSGCOLOR #ff1c2a33 #00000000 none } } if($this->login) - uriboot ( "Return to Group Bootmenu", "/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/false", "" ); + uriboot ( "Return to Group Bootmenu", "http://$this->host/ipxe/gpxecmd.c32", "http://$this->host/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", "http://$this->host/ipxe/gpxecmd.c32", "http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/true" ); texthelp("Login to get your own Bootmenu."); } |