diff options
| author | Simon | 2011-03-22 10:27:02 +0100 |
|---|---|---|
| committer | Simon | 2011-03-22 10:27:02 +0100 |
| commit | 1677ce1908152787220c1674d718bb03fecedec6 (patch) | |
| tree | 0c024811673b2cb21a647eba945fbadd6a5d14b8 /application | |
| parent | fallback lösungen für fbgui hinzugefügt (diff) | |
| download | pbs2-1677ce1908152787220c1674d718bb03fecedec6.tar.gz pbs2-1677ce1908152787220c1674d718bb03fecedec6.tar.xz pbs2-1677ce1908152787220c1674d718bb03fecedec6.zip | |
fbgui oberfläche angepasst
Diffstat (limited to 'application')
| -rw-r--r-- | application/controllers/IndexController.php | 2 | ||||
| -rw-r--r-- | application/modules/fbgui/controllers/IndexController.php | 24 | ||||
| -rw-r--r-- | application/modules/fbgui/layouts/fbgui.phtml | 22 |
3 files changed, 11 insertions, 37 deletions
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php index 83fbe08..79a6d99 100644 --- a/application/controllers/IndexController.php +++ b/application/controllers/IndexController.php @@ -12,7 +12,7 @@ class IndexController extends Zend_Controller_Action { if(stristr($_SERVER['HTTP_USER_AGENT'],'prebootGUI')){ $_SESSION['postdata'] = $_POST; - $this->_redirect('/fbgui/index/index/data/'.json_encode($_POST)) ; + $this->_redirect('/fbgui/index/index/postdata/'.json_encode($_POST)) ; } diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php index 906de49..55dc846 100644 --- a/application/modules/fbgui/controllers/IndexController.php +++ b/application/modules/fbgui/controllers/IndexController.php @@ -10,28 +10,22 @@ class Fbgui_IndexController extends Zend_Controller_Action public function indexAction() { - $params = $this->_request->getParam('data'); - $keys = $this->_request->getParam('keys'); - $post = $this->_request->getParam('post'); + $params = $this->_request->getParam('postdata'); + if(isset($_SESSION['postdata'])){ $_POST = ($_SESSION['postdata']); unset($_SESSION['postdata']); } elseif($params != ''){ - print_a(json_decode($this->_request->getParam('data'))); + print_a(json_decode($this->_request->getParam('postdata'))); $data = array(); - $data = json_decode($this->_request->getParam('data')); + $data = json_decode($this->_request->getParam('postdata')); $_POST['bootisoID'] = $data->bootisoID; $_POST['mac'] = $data->mac; $_POST['hardwarehash'] = $data->hardwarehash; } - elseif($post != '' && $keys != ''){ - $keys = $keys; - $post = $post; - $_POST = array_combine ( $keys , $post ); - print_a($keys, $data,$_POST); - } - if(isset($_POST['bootisoID'])){ + + if(isset($_POST['bootisoID']) || isset($_POST['serialnumber'])){ // Create a session $n = new Pbs_Session(); @@ -107,9 +101,9 @@ class Fbgui_IndexController extends Zend_Controller_Action $sessionMapper->save($session); echo "<h1>Downloading</h1>"; echo "<script>\n"; - echo "fbgui.startDownload('http://132.230.2.27/dev/resource/getkernel/".$_SESSION['alphasessionID']."/file/kernel');\n"; - echo "fbgui.startDownload('http://132.230.2.27/dev/resource/getkernel/".$_SESSION['alphasessionID']."/file/initramfs');\n"; - echo "fbgui.startDownload('http://132.230.2.27/dev/resource/getkernel/".$_SESSION['alphasessionID']."/file/kcl');\n"; + echo "fbgui.startDownload('http://132.230.4.27/dev/resource/getkernel/".$_SESSION['alphasessionID']."/file/kernel');\n"; + echo "fbgui.startDownload('http://132.230.4.27/dev/resource/getkernel/".$_SESSION['alphasessionID']."/file/initramfs');\n"; + echo "fbgui.startDownload('http://132.230.4.27/dev/resource/getkernel/".$_SESSION['alphasessionID']."/file/kcl');\n"; echo "fbgui.getSession('".$_SESSION['alphasessionID']."');\n"; echo "</script>"; diff --git a/application/modules/fbgui/layouts/fbgui.phtml b/application/modules/fbgui/layouts/fbgui.phtml index e3b286a..335e3c5 100644 --- a/application/modules/fbgui/layouts/fbgui.phtml +++ b/application/modules/fbgui/layouts/fbgui.phtml @@ -27,27 +27,7 @@ echo $this->headScript()."\n"; <ul> <li>Controller: <ul> - <li><a href='/dev/person'>Person</a></li> - <li><a href='/dev/group'>Group</a></li> - <li><a href='/dev/role'>Role</a></li> - <li><a href='/dev/bootiso'>BootIso</a></li> - <li><a href='/dev/bootmenu'>BootMenu</a></li> - <li><a href='/dev/config'>Config</a></li> - <li><a href='/dev/bootos'>BootOs</a></li> - <li><a href='/dev/client'>Client</a></li> - <li><a href='/dev/filter'>Filter</a></li> - <li><a href='/dev/pool'>Pool</a></li> - <li><a href='/dev/session'>Session</a></li> - <?php if (!Zend_Auth::getInstance()->hasIdentity()) {?> - <li><a href='/dev/auth/login'>Login</a></li> - <li><a href='/dev/auth/register'>Register</a></li> - <?php - } else {?> - <li><a href='/dev/auth/delete'>Account Löschen</a></li> - <li><a href='/dev/auth/logout'>Logout</a></li> - <?php - } - ?> + </ul> </li> |