summaryrefslogtreecommitdiffstats
path: root/application/modules/fbgui/controllers
diff options
context:
space:
mode:
authorSimon2011-04-14 13:40:00 +0200
committerSimon2011-04-14 13:40:00 +0200
commitb42e6ae08b53a650cc2c4564cc9fc19a13c412d1 (patch)
treeddcf203e5c8c075f3cd5d31a501723aacd91c33e /application/modules/fbgui/controllers
parentTicket #207 - Graph wird beim verlinken angezeigt (diff)
parentfix (diff)
downloadpbs2-b42e6ae08b53a650cc2c4564cc9fc19a13c412d1.tar.gz
pbs2-b42e6ae08b53a650cc2c4564cc9fc19a13c412d1.tar.xz
pbs2-b42e6ae08b53a650cc2c4564cc9fc19a13c412d1.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/fbgui/controllers')
-rw-r--r--application/modules/fbgui/controllers/IndexController.php20
1 files changed, 12 insertions, 8 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index ae23d86..6941e47 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -12,13 +12,17 @@ class Fbgui_IndexController extends Zend_Controller_Action
$membershipMapper->find($userIDsNamespace['membershipID'],$this->membership);
}
+ public function errorAction()
+ {
+ $result = $this->_request->getParam('serialresult');
+ if($result != ""){
+ $pbsNotifier = new Pbs_Notifier();
+ $this->view->notification = $pbsNotifier->notify('serial',$result);
+ }
+ }
+
public function indexAction()
- {
- $params = $this->_request->getParam('postdata');
- if(isset($_SESSION['postdata'])){
- $_POST = ($_SESSION['postdata']);
- }
-
+ {
if(isset($_POST['bootisoID']) || isset($_POST['serialnumber'])){
// Create a session
$n = new Pbs_Session();
@@ -32,7 +36,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
elseif(isset($_POST['serialnumber'])){
$results = $bootisomapper->findBy(array('serialnumber' => $_POST['serialnumber']),true);
if(count($results) == 0){
- echo 'Your serialnumber is not known by the system';
+ $this->_redirect('/fbgui/index/error/serialresult/noserial');
}
$bootiso->setOptions($results[0]);
$bootiso->setID($results[0]['bootisoID']);
@@ -103,7 +107,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
}
}
else{
- echo "<h1>Not Welcome</h1>";
+ $this->_redirect('/fbgui/index/error/serialresult/noserial');
}
}