summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
authorSimon2011-04-13 20:29:08 +0200
committerSimon2011-04-13 20:29:08 +0200
commitd2dd03c98e1abb2faefe6e1e2e6396548e0287e6 (patch)
treec9458d975cb5b30e19ceaf6811672a621cb17644 /application/modules
parentMembershipID wird gesetzt, Session wird nich doppelt erstellt (diff)
parentresource fix membership (diff)
downloadpbs2-d2dd03c98e1abb2faefe6e1e2e6396548e0287e6.tar.gz
pbs2-d2dd03c98e1abb2faefe6e1e2e6396548e0287e6.tar.xz
pbs2-d2dd03c98e1abb2faefe6e1e2e6396548e0287e6.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/fbgui/controllers/IndexController.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 6f6c065..72edc6f 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -75,14 +75,14 @@ class Fbgui_IndexController extends Zend_Controller_Action
$pbsFilter = new Pbs_Filter();
$bootmenuID = $pbsFilter->evaluate();
if($bootmenuID != null){
- /*
+
print_a('Debug Output',
'Session is now set',
'Your sessionID is '.$session->getID(),
'Your alphasessionID is '.$session->getAlphasessionID(),
'Your client is '.$session->getClientID(),
'goto bootmenu '.$bootmenuID);
- */
+
$bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper();
$res = $bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID),false);
$this->view->entries = $res;
@@ -91,14 +91,14 @@ class Fbgui_IndexController extends Zend_Controller_Action
}
}
else{
- /*
+
print_a('Debug Output',
'Session is now set',
'Your sessionID is '.$session->getID(),
'Your alphasessionID is '.$session->getAlphasessionID(),
'Your client is '.$session->getClientID(),
'there is no bootmenu for you');
- */
+
echo "<a href='/fbgui/auth/login/'>Goto Login to get your Bootmenu</a>";
}
}