summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/ipxe/controllers/AuthController.php6
-rw-r--r--application/modules/ipxe/views/scripts/resource/getvesamenu.phtml2
2 files changed, 4 insertions, 4 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index f4d9481..90a5d1c 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -95,14 +95,14 @@ class Ipxe_AuthController extends Zend_Controller_Action
public function loginAction()
{
$alpha = $this->_request->getParam('alpha');
- $login = $this->_request->getParam('login') == 'true';
+ $login = $this->_request->getParam('login');
- if ($login){
+ if (isset($login)){
header('Content-Type: text/plain');
$result = "#!ipxe\n";
$result .= "imgfree\n";
$result .= "login\n";
- $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."/login/false\n";
+ $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."\n";
header("Content-Length: ".(strlen($result)));
echo $result;
exit;
diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index 2f373a6..dd0e9ef 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -49,7 +49,7 @@
function retry ($alphaID) {
comment ("failed", "Authentication Failed");
- uriboot ( "Try again", "/ipxe/auth/login/alpha/$alphaID", "" );
+ uriboot ( "Try again", "/ipxe/auth/login/alpha/$alphaID/login/true", "" );
uriboot ( "Return to Group Bootmenu", "/ipxe/auth/logout/alpha/$alphaID", "" );
}