WICHTIG findBy Methode geändert & alles angepasst, siehe Ticket

10 files changed, 17 insertions, 17 deletions

diff --git a/application/modules/dev/controllers/AuthController.php b/application/modules/dev/controllers/AuthController.php
index 078a4cf..3ff1dd3 100644
--- a/application/modules/dev/controllers/AuthController.php
+++ b/application/modules/dev/controllers/AuthController.php
@@ -49,7 +49,7 @@ class dev_AuthController extends Zend_Controller_Action
 
         		            if ($result->isValid()) {
         		            	$this->personmapper = new Application_Model_PersonMapper();
-        		            	$result = $this->personmapper->findBy('email', Zend_Auth::getInstance()->getIdentity());
+        		            	$result = $this->personmapper->findBy(array('email' => Zend_Auth::getInstance()->getIdentity()),true);
         		            	$person = new Application_Model_Person($result[0]);
         		            	$person->setID($result[0]['personID']);
         		            	$date = new DateTime();
@@ -143,7 +143,7 @@ class dev_AuthController extends Zend_Controller_Action
 		} else if(isset($_GET['recoveryid'])) {
 			$recoveryid = $_GET['recoveryid'];
 			$passwordRecoveryMapper = new Application_Model_PasswordRecoveryMapper();
-			$passwordRecovery = $passwordRecoveryMapper->findBy("recoveryID", $recoveryid);
+			$passwordRecovery = $passwordRecoveryMapper->findBy(array("recoveryID" => $recoveryid),true);
 			if(count($passwordRecovery) > 0) {
 				$passwordRecoveryObject = new Application_Model_PasswordRecovery();
 				$passwordRecoveryObject->setID($passwordRecovery[0]['personID']);
@@ -209,7 +209,7 @@ class dev_AuthController extends Zend_Controller_Action
 	{
 		if($_POST['confirmdelete']) {
 			$auth = Zend_Auth::getInstance();
-			$result = $this->personmapper->findBy('email', $auth->getIdentity());
+			$result = $this->personmapper->findBy(array('email' => $auth->getIdentity()), true);
 			$person = $result[0];
 			$personID = $person["personID"];
 			if (isset($personID)){
diff --git a/application/modules/dev/controllers/BootmenuController.php b/application/modules/dev/controllers/BootmenuController.php
index 2d2a1df..0f867d1 100644
--- a/application/modules/dev/controllers/BootmenuController.php
+++ b/application/modules/dev/controllers/BootmenuController.php
@@ -31,7 +31,7 @@ class dev_BootmenuController extends Zend_Controller_Action
 	    		$this->view->bootmenulist = $bootmenumapper->fetchAll();
 		    	$bootmenuentries = array();
 		    	foreach ($this->view->bootmenulist as $bootmenu){
-		    		  $bootmenuentries[$bootmenu->getID()] = $bootmenuentriesmapper->findBy('bootmenuID',$bootmenu->getID());
+		    		  $bootmenuentries[$bootmenu->getID()] = $bootmenuentriesmapper->findBy(array('bootmenuID' => $bootmenu->getID()));
 		    		  $bootmenu->setGroupID("[".$bootmenu->getGroupID()."] ".$groupmapper->find($bootmenu->getGroupID())->getTitle());
 		    		  $bootmenu->setMembershipID("[".$bootmenu->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootmenu->getMembershipID())->getPersonID())->getFirstname());
 		    	}	
diff --git a/application/modules/dev/controllers/FilterController.php b/application/modules/dev/controllers/FilterController.php
index 4644d0e..497c7b0 100644
--- a/application/modules/dev/controllers/FilterController.php
+++ b/application/modules/dev/controllers/FilterController.php
@@ -354,7 +354,7 @@ class dev_FilterController extends Zend_Controller_Action
 			if(!$testFilter){			
 				$poolentry = new Application_Model_PoolEntries();
 				$poolentrymapper = new Application_Model_PoolEntriesMapper();
-				$poolentry = $poolentrymapper->findby('clientID',$client->getID());
+				$poolentry = $poolentrymapper->findby(array('clientID' => $client->getID()),true);
 				$poolentry = $poolentry[0];		
 			
 				$poolID = $poolentry['poolID'];
diff --git a/application/modules/dev/controllers/GroupController.php b/application/modules/dev/controllers/GroupController.php
index 2770fd7..11f4a9e 100644
--- a/application/modules/dev/controllers/GroupController.php
+++ b/application/modules/dev/controllers/GroupController.php
@@ -110,7 +110,7 @@ class dev_GroupController extends Zend_Controller_Action
 	{
 		$groupID = $this->_request->getParam('groupID');
 		if($groupID) {
-			$groupRequests = $this->groupRequestMapper->findBy('groupID', $groupID);
+			$groupRequests = $this->groupRequestMapper->findBy(array('groupID' => $groupID),true);
 			if(isset($groupRequests)) {
 				foreach($groupRequests as $groupRequest) {
 					$person = $this->personmapper->find($groupRequest['personID']);
diff --git a/application/modules/dev/controllers/PersonController.php b/application/modules/dev/controllers/PersonController.php
index 40e51af..a403038 100644
--- a/application/modules/dev/controllers/PersonController.php
+++ b/application/modules/dev/controllers/PersonController.php
@@ -13,7 +13,7 @@ class dev_PersonController extends Zend_Controller_Action
 	public function init() {
 		if (Zend_Auth::getInstance()->hasIdentity()) {
 			$this->personmapper = new Application_Model_PersonMapper();
-			$result = $this->personmapper->findBy('email', Zend_Auth::getInstance()->getIdentity());
+			$result = $this->personmapper->findBy(array('email' => Zend_Auth::getInstance()->getIdentity()),true);
 			$this->person = new Application_Model_Person($result[0]);
 			$this->person->setID($result[0]['personID']);
 			$this->groupMapper = new Application_Model_GroupMapper();
@@ -85,7 +85,7 @@ class dev_PersonController extends Zend_Controller_Action
 	{
 		$this->view->person = $this->person;
 		$allgroups = $this->groupMapper->fetchAll();
-		$groupRequests = $this->groupRequestMapper->findBy('personID', $this->person->getID());
+		$groupRequests = $this->groupRequestMapper->findBy(array('personID' => $this->person->getID()),true);
 		$count = 0;
 		foreach($allgroups as $group) {
 			foreach($groupRequests as $groupRequest) {
diff --git a/application/modules/dev/controllers/ResourceController.php b/application/modules/dev/controllers/ResourceController.php
index 4e92ce3..9ae7582 100644
--- a/application/modules/dev/controllers/ResourceController.php
+++ b/application/modules/dev/controllers/ResourceController.php
@@ -13,7 +13,7 @@ class dev_ResourceController extends Zend_Controller_Action
 		$alphasessionID = $this->_request->getParam('alpha');
 		$session = new Application_Model_Session();
 		$sm = new Application_Model_SessionMapper();
-		$result = $sm->findBy('alphasessionID',$alphasessionID);
+		$result = $sm->findBy(array('alphasessionID' => $alphasessionID), true);
 		# print_a($result);
 		$this->thisSession = $session->setOptions($result[0]);
 		$this->thisSession->setID($result[0]['sessionID']);
diff --git a/application/modules/dev/controllers/RoleController.php b/application/modules/dev/controllers/RoleController.php
index 65989b6..0c3a2b8 100644
--- a/application/modules/dev/controllers/RoleController.php
+++ b/application/modules/dev/controllers/RoleController.php
@@ -21,7 +21,7 @@ class dev_RoleController extends Zend_Controller_Action
 	{
 		$roleNamespace = Zend_Session::namespaceGet('role');
 		if(isset($roleNamespace['groupID'])) {
-			$roleList = $this->roleMapper->findBy('groupID', $roleNamespace['groupID']);
+			$roleList = $this->roleMapper->findBy(array('groupID' => $roleNamespace['groupID']),true);
 			$this->view->groupID = $roleNamespace['groupID'];
 			$this->view->roleList = $roleList;
 		} else {
@@ -101,7 +101,7 @@ class dev_RoleController extends Zend_Controller_Action
 	{
 		$roleID = $this->_request->getParam('roleID');
 		if($roleID) {
-			$rightroles = $this->rightRolesMapper->findBy('roleID', $roleID);
+			$rightroles = $this->rightRolesMapper->findBy(array('roleID' => $roleID),true);
 			if(count($rightroles) > 0) {
 				foreach($rightroles as $rightrole) {
 					$right = $this->rightMapper->find($rightrole['rightID']);
@@ -145,7 +145,7 @@ class dev_RoleController extends Zend_Controller_Action
 	{
 		$roleID = $this->_request->getParam('roleID');
 		if(isset($roleID)) {
-			$rightroles = $this->rightRolesMapper->findBy('roleID', $roleID);
+			$rightroles = $this->rightRolesMapper->findBy(array('roleID' => $roleID),true);
 			$rights = $this->rightMapper->fetchAll();
 			if(count($rightroles) > 0) {
 				if(count($rights) > 0) {
@@ -239,11 +239,11 @@ class dev_RoleController extends Zend_Controller_Action
 				return;
 			} else {
 				$personMapper = new Application_Model_PersonMapper();
-				$result = $personMapper->findBy('email', Zend_Auth::getInstance()->getIdentity());
+				$result = $personMapper->findBy(array('email' => Zend_Auth::getInstance()->getIdentity()),true);
 				$person = new Application_Model_Person($result[0]);
 				$person->setID($result[0]['personID']);
 				$membershipMapper = new Application_Model_MembershipMapper();
-				$memberships = $membershipMapper->findBy("personID",$person->getID());
+				$memberships = $membershipMapper->findBy(array("personID" => $person->getID(), true));
 				$groupMapper = new Application_Model_GroupMapper();
 				if(isset($memberships)) {
 					foreach($memberships as $membership) {
diff --git a/application/modules/dev/controllers/SessionController.php b/application/modules/dev/controllers/SessionController.php
index 9686d1d..87a7e9c 100644
--- a/application/modules/dev/controllers/SessionController.php
+++ b/application/modules/dev/controllers/SessionController.php
@@ -50,7 +50,7 @@ class dev_SessionController extends Zend_Controller_Action
 				try{
 					$uniqid = $this->getUniqueCode(10);
 					$sm = new Application_Model_SessionMapper();
-					while(count($sm->findBy('alphasessionID',$uniqid))>0){
+					while(count($sm->findBy(array('alphasessionID' => $uniqid),true))>0){
 						$uniqid = $this->getUniqueCode(16);
 					}
 
diff --git a/application/modules/dev/views/scripts/filter/index.phtml b/application/modules/dev/views/scripts/filter/index.phtml
index df97000..b555318 100644
--- a/application/modules/dev/views/scripts/filter/index.phtml
+++ b/application/modules/dev/views/scripts/filter/index.phtml
@@ -51,7 +51,7 @@
 			<?php
 			$fe = new Application_Model_FilterEntriesMapper();
 				#	print_a($erg = $fe->findBy('filterID',$filter->getID()));
-			$erg = $fe->findBy('filterID',$filter->getID());
+			$erg = $fe->findBy(array('filterID' => $filter->getID()),true);
 			?>
 			<?php if (count($erg)>0): ?>
 			<tr class=detail>
diff --git a/application/modules/dev/views/scripts/pool/index.phtml b/application/modules/dev/views/scripts/pool/index.phtml
index 06764d0..cd49048 100644
--- a/application/modules/dev/views/scripts/pool/index.phtml
+++ b/application/modules/dev/views/scripts/pool/index.phtml
@@ -48,7 +48,7 @@
 		</tr>
 		<?php		
 		$poolentriesMapper = new Application_Model_PoolEntriesMapper();
-		$clients = $poolentriesMapper->findBy('poolID',$pool->getID());		
+		$clients = $poolentriesMapper->findBy(array('poolID' => $pool->getID()),true);		
 		?>
 		<?php if (count($clients)>0): ?>
 		<tr class=detail>