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

2 files changed, 3 insertions, 3 deletions

diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php
index 91b6dbd..b2fe874 100644
--- a/application/modules/user/controllers/SessionController.php
+++ b/application/modules/user/controllers/SessionController.php
@@ -44,9 +44,9 @@ class User_SessionController extends Zend_Controller_Action
 		$membershipMapper = new Application_Model_MembershipMapper();
 		$personMapper = new Application_Model_PersonMapper();
 
-		$bootisos = $bootisoMapper->findBy(array('groupID',$this->membership->getGroupID()));
+		$bootisos = $bootisoMapper->findBy(array('groupID'=>$this->membership->getGroupID()));
 		foreach($bootisos as $bootiso){
-			$sessions = $sessionMapper->findBy(array('bootisoID',$bootiso->getID()));
+			$sessions = $sessionMapper->findBy(array('bootisoID'=>$bootiso->getID()));
 			foreach($sessions as $session){
 				#echo $session->getBootosID();
 				if($session->getBootosID() != ''){
diff --git a/library/Pbs/Session.php b/library/Pbs/Session.php
index b2b3ed5..7686077 100644
--- a/library/Pbs/Session.php
+++ b/library/Pbs/Session.php
@@ -28,7 +28,7 @@ class Pbs_Session{
 	}
 	public function createClient(Application_Model_Client $client){		
 		$clientmapper = new Application_Model_ClientMapper();
-		$result = $clientmapper->findBy(array('macadress' => $client->getMacadress()),true);	
+		$result = $clientmapper->findBy(array('macadress' => $client->getMacadress(),'groupID'=>$client->getGroupID()),true);	
 		if(count($result)>0){
 			$client->setOptions($result[0]);
 			$client->setID($result[0]['clientID']);