diff options
| author | michael pereira | 2011-10-21 15:46:56 +0200 |
|---|---|---|
| committer | michael pereira | 2011-10-21 15:46:56 +0200 |
| commit | 846da4a1bfe415a47b72649f911d26a2d5058931 (patch) | |
| tree | c606335f52c0f6a2dcfae8da63ef80789ea7d5c0 /application/modules | |
| parent | com32 debug (diff) | |
| download | pbs2-846da4a1bfe415a47b72649f911d26a2d5058931.tar.gz pbs2-846da4a1bfe415a47b72649f911d26a2d5058931.tar.xz pbs2-846da4a1bfe415a47b72649f911d26a2d5058931.zip | |
com32 debug
Diffstat (limited to 'application/modules')
| -rw-r--r-- | application/modules/ipxe/controllers/AuthController.php | 44 | ||||
| -rw-r--r-- | application/modules/ipxe/views/scripts/resource/getvesamenu.phtml | 8 |
2 files changed, 25 insertions, 27 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php index 31f3407..8d2284f 100644 --- a/application/modules/ipxe/controllers/AuthController.php +++ b/application/modules/ipxe/controllers/AuthController.php @@ -91,7 +91,7 @@ class Ipxe_AuthController extends Zend_Controller_Action echo $result; } - + public function loginAction() { $alpha = $this->_request->getParam('alpha'); @@ -100,10 +100,9 @@ class Ipxe_AuthController extends Zend_Controller_Action if (isset($login)){ header('Content-Type: text/plain'); $result = "#!ipxe\n"; - $result .= "shell\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."\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."\n"; header("Content-Length: ".(strlen($result))); echo $result; exit; @@ -184,17 +183,16 @@ class Ipxe_AuthController extends Zend_Controller_Action $this->error = "session"; } - header('Content-Type: text/plain'); +// header('Content-Type: text/plain'); - $result = "#!ipxe\n"; - $result .= "imgfree\n"; - $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$alpha."/error/$this->error\n"; - - header("Content-Length: ".(strlen($result))); +// $result = "#!ipxe\n"; +// $result .= "imgfree\n"; +// $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$alpha."/error/$this->error\n"; +// header("Content-Length: ".(strlen($result))); - echo $result; +// echo $result; -// $this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); + $this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); } public function setgroupAction(){ @@ -210,17 +208,17 @@ class Ipxe_AuthController extends Zend_Controller_Action $this->error = "session"; } - header('Content-Type: text/plain'); - - $result = "#!ipxe\n"; - $result .= "imgfree\n"; - $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$alpha."/error/$this->error\n"; - - header("Content-Length: ".(strlen($result))); - - echo $result; +// header('Content-Type: text/plain'); +// +// $result = "#!ipxe\n"; +// $result .= "imgfree\n"; +// $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$alpha."/error/$this->error\n"; +// +// header("Content-Length: ".(strlen($result))); +// +// echo $result; -// $this->_redirect('/ipxe/resource/getvesamenuconfig/alpha/'.$alpha.'/error/'.$this->error); + $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 e8f942f..40a8520 100644 --- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml +++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml @@ -128,8 +128,8 @@ MENU MSGCOLOR #ff1c2a33 #00000000 none title ( "Select Membership:" ); if(isset($this->memberships)){ foreach($this->memberships as $membership){ - uriboot ($membership['group']." as ".$membership['role'], "/ipxe/auth/setgroup/membershipid/".$membership['membershipID']."/alpha/$this->alphaID", ''); -// uriboot ($membership['group']." as ".$membership['role'], "vesamenu.c32", "/ipxe/auth/setgroup/membershipid/".$membership['membershipID']."/alpha/$this->alphaID"); +// uriboot ($membership['group']." as ".$membership['role'], "/ipxe/auth/setgroup/membershipid/".$membership['membershipID']."/alpha/$this->alphaID", ''); + uriboot ($membership['group']." as ".$membership['role'], "vesamenu.c32", "/ipxe/auth/setgroup/membershipid/".$membership['membershipID']."/alpha/$this->alphaID"); } uriboot ( "Return to Group Bootmenu", "/ipxe/auth/logout/alpha/$this->alphaID", "" ); }else{ @@ -165,8 +165,8 @@ MENU MSGCOLOR #ff1c2a33 #00000000 none uriboot ( "Login", "/ipxe/auth/login/alpha/$this->alphaID/login/true", "" ); texthelp("Login to get your own Bootmenu."); }else{ - uriboot ( "Switch Group From $this->group", "/ipxe/auth/switchgroup/alpha/$this->alphaID", "" ); -// uriboot ( "Switch Group From $this->group", "vesamenu.c32", "/ipxe/auth/switchgroup/alpha/$this->alphaID" ); +// uriboot ( "Switch Group From $this->group", "/ipxe/auth/switchgroup/alpha/$this->alphaID", "" ); + uriboot ( "Switch Group From $this->group", "vesamenu.c32", "/ipxe/auth/switchgroup/alpha/$this->alphaID" ); uriboot ( "Return to Group Bootmenu $this->group", "/ipxe/auth/logout/alpha/$this->alphaID", "" ); } |