diff options
| author | michael pereira | 2011-04-26 14:58:09 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-26 14:58:09 +0200 |
| commit | 2c119f5d840aa9afc1c7a746a5b6166fb6602a11 (patch) | |
| tree | f0535d47642ba65c440b9f79872751ce04212071 | |
| parent | fix (diff) | |
| parent | noserial fehler anzeige (diff) | |
| download | pbs2-2c119f5d840aa9afc1c7a746a5b6166fb6602a11.tar.gz pbs2-2c119f5d840aa9afc1c7a746a5b6166fb6602a11.tar.xz pbs2-2c119f5d840aa9afc1c7a746a5b6166fb6602a11.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
| -rw-r--r-- | application/controllers/IndexController.php | 4 | ||||
| -rw-r--r-- | application/modules/fbgui/controllers/IndexController.php | 6 | ||||
| -rw-r--r-- | application/modules/user/layouts/user.phtml | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php index 5120d6f..8ad2fc4 100644 --- a/application/controllers/IndexController.php +++ b/application/controllers/IndexController.php @@ -26,8 +26,8 @@ class IndexController extends Zend_Controller_Action $mySession->postdata = $_POST; } - $d = new Pbs_Debug(); - $d->debug(array('MainIndexController',$_SERVER['REMOTE_ADDR'],implode("\t",$mySession->postdata))); + // $d = new Pbs_Debug(); + // $d->debug(array('MainIndexController',$_SERVER['REMOTE_ADDR'],implode("\t",$mySession->postdata))); $this->_redirect("/fbgui/index/index"); } diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php index 1401be3..1860297 100644 --- a/application/modules/fbgui/controllers/IndexController.php +++ b/application/modules/fbgui/controllers/IndexController.php @@ -47,8 +47,8 @@ class Fbgui_IndexController extends Zend_Controller_Action $this->view->notification = $pbsNotifier->notify('You have no membership, therefore you have no own BootMenu','info'); } - $d = new Pbs_Debug(); - $d->debug(array('FBGuiIndexController',$_SERVER['REMOTE_ADDR'],implode("\t",$mySession->postdata))); + // $d = new Pbs_Debug(); + // $d->debug(array('FBGuiIndexController',$_SERVER['REMOTE_ADDR'],implode("\t",$mySession->postdata))); if(isset($mySession->postdata['bootisoID']) || isset($mySession->postdata['serialnumber'])){ // Create a session @@ -63,7 +63,7 @@ class Fbgui_IndexController extends Zend_Controller_Action elseif(isset($mySession->postdata['serialnumber'])){ $results = $bootisomapper->findBy(array('serialnumber' => $mySession->postdata['serialnumber']),true); if(count($results) == 0){ - $this->_redirect('/fbgui/index/error/serialresult/noserial2'); + $this->_redirect('/fbgui/index/error/serialresult/noserial'); } $bootiso->setOptions($results[0]); $bootiso->setID($results[0]['bootisoID']); diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml index 672877b..5942725 100644 --- a/application/modules/user/layouts/user.phtml +++ b/application/modules/user/layouts/user.phtml @@ -23,8 +23,7 @@ echo $this->headScript()."\n"; </div> <div id="sidepannel-top" class='portletNavigationTree'> <ul class='navTreeLevel0'> - <li class='navTreeItem'><a href='/'><<</a></li> - <li class='navTreeItem'><a href='/user/'>user</a></li> + <li class='navTreeItem'><a href='/user/'>Home</a></li> <li> <ul class='navTreeLevel1'> <?php if(Zend_Auth::getInstance()->hasIdentity()) { |