summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
authormichael pereira2011-10-28 13:34:43 +0200
committermichael pereira2011-10-28 13:34:43 +0200
commitd76578347090b17e4f5118c5579a091dfc810bc8 (patch)
tree558e7cd94b4f15c10457efb9a2000005b4643e7b /application/modules
parentlogin (diff)
downloadpbs2-d76578347090b17e4f5118c5579a091dfc810bc8.tar.gz
pbs2-d76578347090b17e4f5118c5579a091dfc810bc8.tar.xz
pbs2-d76578347090b17e4f5118c5579a091dfc810bc8.zip
login
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/ipxe/controllers/AuthController.php3
-rw-r--r--application/modules/ipxe/views/scripts/resource/getvesamenu.phtml10
2 files changed, 9 insertions, 4 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index baabcb1..abc3e77 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -114,6 +114,8 @@ class Ipxe_AuthController extends Zend_Controller_Action
if (isset($login)){
header('Content-Type: text/plain');
+ header('WWW-Authenticate: Basic realm=""');
+ header('HTTP/1.0 401 Unauthorized');
$result = "#!ipxe\n";
$result .= "login\n";
$result .= "chain http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."\n";
@@ -124,7 +126,6 @@ class Ipxe_AuthController extends Zend_Controller_Action
if(!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])){
header('Content-Type: text/plain');
- $result = "#!ipxe\n";
$result .= "imgfree\n";
$result .= "module http://".$_SERVER['HTTP_HOST']."/ipxe/auth/login/alpha/".$alpha."/error/login\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 f07fb6a..ae50098 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -36,6 +36,10 @@
order.");
}
+ function separator(){
+ echo "MENU SEPARATOR\n";
+ }
+
function texthelp ( $texthelp ){
echo "TEXT HELP\n";
echo $texthelp."\n";
@@ -92,10 +96,10 @@ 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 #00000000 std
+menu color hotkey 1 #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
+menu color disabled 1;37;40 #ffffffff #ffcacac8 std
#menu color scrollbar 37;40 #40000000 #ee000000 std
#menu color tabmsg 37;40 #ffff8b00 #ff8093a1 std
#menu color cmdmark 1;37;40 #ffff8b00 #ff8093a1 std
@@ -157,7 +161,7 @@ MENU MSGCOLOR #ff1c2a33 #00000000 none
nobootmenu();
}
- comment ("", "");
+ separator();
comment ("info", "More Options:");
if(!$this->loggedin){