summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/modules/ipxe/controllers/AuthController.php7
-rw-r--r--application/modules/ipxe/views/scripts/resource/getvesamenu.phtml2
-rw-r--r--public/index.php7
3 files changed, 10 insertions, 6 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index aaa4d0e..e9c5d60 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -84,7 +84,7 @@ class Ipxe_AuthController extends Zend_Controller_Action
$result .= "imgfree\n";
if(isset($this->session)){
$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 .= "show dns\n";
+ $result .= "prompt\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";
}
@@ -145,7 +145,10 @@ class Ipxe_AuthController extends Zend_Controller_Action
$this->error = "session";
}
- header('Content-Type: text/html');
+ header('Content-Type: text/plain');
+ $result = "blub";
+ header("Content-Length: ".(strlen($result)));
+ echo $result;
//$this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error);
diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index b1c088a..4909f89 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -92,7 +92,7 @@ MENU VSHIFT 7
menu color border 37;40 #00000000 #00000000 std
menu color title 1 #ee004a99 #00000000 all
menu color unsel 37;40 #ff4f75aa #00000000 all
-#menu color hotkey 1;37;40 #ffff8b00 #ff8093a1 std
+menu color hotkey 1;37;40 #ffff8b00 #00000000 std
menu color sel 7;37;40 #ff1c2a33 #667799bb all
#menu color hotsel 1;7;37;40 #ffff8b00 #667799bb all
#menu color disabled 1;37;40 #ffff8b00 #ff8093a1 std
diff --git a/public/index.php b/public/index.php
index b5ec528..fe1701f 100644
--- a/public/index.php
+++ b/public/index.php
@@ -35,9 +35,10 @@ APPLICATION_PATH . '/configs/application.ini'
// Set Session lifetime
if(stristr($_SERVER['HTTP_USER_AGENT'],'prebootGUI'))
Zend_Session::setOptions(array('cookie_lifetime' => null));
-else
- Zend_Session::setOptions(array('cookie_lifetime' => '3600'));
-
+else{
+ Zend_Session::setOptions(array('cookie_lifetime' => null));
+ Zend_Session::setOptions(array('gc_maxlifetime' => '1800'));
+}
// Run bootstrap
$application->bootstrap()
->run();