From fdfd52073ab48324e0c734faef7b862e7f7172f4 Mon Sep 17 00:00:00 2001
From: Simon
Date: Fri, 15 Apr 2011 14:02:19 +0200
Subject: Ticket #210 - FBgui mit Tastatur bedienbar, inklusive Login

---
 .../modules/fbgui/controllers/IndexController.php  | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'application/modules/fbgui/controllers')

diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index aba88db..119c810 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -25,11 +25,9 @@ class Fbgui_IndexController extends Zend_Controller_Action
     {     
 		$mySession = new Zend_Session_Namespace('pbs');
 		
-		if(!isset($mySession->postdata))
+		if(count($mySession->postdata)<=0)
 			$mySession->postdata = $_POST;
 		
-		print_a($mySession->postdata);
-		
 		$d = new Pbs_Debug();
 		$d->debug(array('FBGuiIndexController',$_SERVER['REMOTE_ADDR'],implode("\t",$mySession->postdata)));
 			
@@ -104,14 +102,18 @@ class Fbgui_IndexController extends Zend_Controller_Action
 				$bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper();
 				$res = $bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID),false);
 				$this->view->entries = $res;
-				if (!Zend_Auth::getInstance()->hasIdentity()) {
-					#echo "<a href='/fbgui/auth/login/'>Goto Login to get your Bootmenu</a>";
-					$pbsNotifier = new Pbs_Notifier();
-					$this->view->notification = $pbsNotifier->notify("This is not your Bootmenu. You have to login to get your own Bootmenu.<br />Click here to <a href='/fbgui/auth/login/'>login</a>",'info');
+				#print_a(Zend_Auth::getInstance()->hasIdentity(),$bm->MembershipID ,$this->membership->getID());
+				if (!Zend_Auth::getInstance()->hasIdentity()) {					
+					#$pbsNotifier = new Pbs_Notifier();
+					#$this->view->notification = $pbsNotifier->notify("This is not your Bootmenu. You have to login to get your own Bootmenu.<br />Click here to <a href='/fbgui/auth/login/'>login</a>",'info');
+					$this->view->loginmenu = true;
 				}
-				if(Zend_Auth::getInstance()->hasIdentity() && $bm->MembershipID != $this->membership->getID() ){					
+				if(Zend_Auth::getInstance()->hasIdentity()){		
+					if($bm->MembershipID != '' && $bm->MembershipID == $this->membership->getID()){}
+					else{
 					$pbsNotifier = new Pbs_Notifier();
-					$this->view->notification = $pbsNotifier->notify("This is not your Bootmenu. There is currently a BootMenu with a higher priority active.",'info');					
+					$this->view->notification = $pbsNotifier->notify("This is not your Bootmenu. There is currently a BootMenu with a higher priority active.",'info');
+					}
 				}
 			}
 			else{
@@ -129,7 +131,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
 			}
 		}
 		else{
-    		$this->_redirect('/fbgui/index/error/serialresult/noserial');
+    		#$this->_redirect('/fbgui/index/error/serialresult/noserial');
     	}    	
     	
     }
-- 
cgit v1.2.3-55-g7522