From 1677ce1908152787220c1674d718bb03fecedec6 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 22 Mar 2011 10:27:02 +0100
Subject: fbgui oberfläche angepasst
---
.../modules/fbgui/controllers/IndexController.php | 24 ++++++++--------------
1 file changed, 9 insertions(+), 15 deletions(-)
(limited to 'application/modules/fbgui/controllers/IndexController.php')
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 "Downloading
";
echo "";
--
cgit v1.2.3-55-g7522
From 78baedaea33bb0cee31b09cb779ed4505e42dea1 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 22 Mar 2011 11:35:21 +0100
Subject: quick fix der fbgui
---
application/modules/fbgui/controllers/IndexController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'application/modules/fbgui/controllers/IndexController.php')
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 55dc846..9886719 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -102,8 +102,8 @@ class Fbgui_IndexController extends Zend_Controller_Action
echo "Downloading
";
echo "";
--
cgit v1.2.3-55-g7522
From 1ae5d33096a93ca65f56bb79ca95cc46a3ad65ff Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 22 Mar 2011 11:39:35 +0100
Subject: quickfix v2
---
application/modules/fbgui/controllers/IndexController.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'application/modules/fbgui/controllers/IndexController.php')
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 9886719..c4f531f 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -101,9 +101,9 @@ class Fbgui_IndexController extends Zend_Controller_Action
$sessionMapper->save($session);
echo "Downloading
";
echo "";
--
cgit v1.2.3-55-g7522
From 7346511014f3cf5250d81dcd18c66149f2fbaa59 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 22 Mar 2011 11:48:48 +0100
Subject: FBGui nutzt nun Session bzw Cookies
---
application/controllers/IndexController.php | 2 +-
application/modules/fbgui/controllers/IndexController.php | 10 +---------
2 files changed, 2 insertions(+), 10 deletions(-)
(limited to 'application/modules/fbgui/controllers/IndexController.php')
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 79a6d99..d26f8d4 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/postdata/'.json_encode($_POST)) ;
+ $this->_redirect('/fbgui/index/index');
}
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index c4f531f..f2b7f7e 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -15,15 +15,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
if(isset($_SESSION['postdata'])){
$_POST = ($_SESSION['postdata']);
unset($_SESSION['postdata']);
- }
- elseif($params != ''){
- print_a(json_decode($this->_request->getParam('postdata')));
- $data = array();
- $data = json_decode($this->_request->getParam('postdata'));
- $_POST['bootisoID'] = $data->bootisoID;
- $_POST['mac'] = $data->mac;
- $_POST['hardwarehash'] = $data->hardwarehash;
- }
+ }
if(isset($_POST['bootisoID']) || isset($_POST['serialnumber'])){
// Create a session
--
cgit v1.2.3-55-g7522