Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

1 files changed, 19 insertions, 9 deletions

diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php
index 3768af9..c00d759 100644
--- a/application/modules/user/controllers/SessionController.php
+++ b/application/modules/user/controllers/SessionController.php
@@ -39,21 +39,31 @@ class User_SessionController extends Zend_Controller_Action
 			$sessions = $sessionMapper->findBy(array('bootisoID',$bootiso->getID()));		
 			foreach($sessions as $session){
 				#echo $session->getBootosID();
-				if($session->getBootosID() != '')
-					$session->setBootosID("[".$session->getBootosID()."] ".$bootosMapper->find($session->getBootosID())->getTitle());
-						
-				if($session->getBootmenuentryID() != '')
-					$session->setBootmenuentryID("[".$session->getBootmenuentryID()."] ".$bootmenuentriesMapper->find($session->getBootmenuentryID())->getTitle());
+				if($session->getBootosID() != ''){
+					$bo = $bootosMapper->find($session->getBootosID());
+					if($bo != null)
+						$session->setBootosID("[".$session->getBootosID()."] ".$bo->getTitle());
+				}
+					
+				if($session->getBootmenuentryID() != ''){
+					$bm = $bootmenuentriesMapper->find($session->getBootmenuentryID());
+					if($bm != null)						
+						$session->setBootmenuentryID("[".$session->getBootmenuentryID()."] ".$bm->getTitle());
+					
+				}
 				
-				if($session->getBootisoID() != '')
-					$session->setBootisoID("[".$session->getBootisoID()."] ".$bootisoMapper->find($session->getBootisoID())->getTitle());
+				if($session->getBootisoID() != ''){
+					$bi = $bootisoMapper->find($session->getBootisoID());
+					if($bi != null)
+						$session->setBootisoID("[".$session->getBootisoID()."] ".$bi->getTitle());
+				}
 					
 				if($session->getMembershipID() != ''){
 					$personID = $membershipMapper->find($session->getMembershipID())->getPersonID();
 					$p = new Application_Model_Person();
 					$personMapper->find($personID,$p);
-					$session->setMembershipID("[".$session->getMembershipID()."] ".$p->getFirstname()." ".$p->getName());
-						
+					if($p != null)
+						$session->setMembershipID("[".$session->getMembershipID()."] ".$p->getFirstname()." ".$p->getName());					
 				}				
 				$session->setTime(date(Zend_Registry::get('dateformat'),$session->getTime()));
 				$mySessions[] =$session;