freeclients werden direkt mit sql gesucht

1 files changed, 17 insertions, 12 deletions

diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php
index 3d6a0f5..d85bfdc 100644
--- a/application/modules/user/controllers/PoolController.php
+++ b/application/modules/user/controllers/PoolController.php
@@ -78,8 +78,7 @@ class User_PoolController extends Zend_Controller_Action
 		// Search
 		$search = $this->_request->getParam('search');
 		$mySearch = new Pbs_Search();
-		$mySearch->setSearchTerm($search);
-		$mySearch->setModule('pool');
+		$mySearch->setSearchTerm($search)		->setModule('pool');
 		if($search != ''){
 			$this->view->search = $mySearch->getSearchTerm();
 			$yourpools = $mySearch->search($yourpools);
@@ -88,10 +87,10 @@ class User_PoolController extends Zend_Controller_Action
 
 		// Pagination
 		$pagination = new Pbs_Pagination();
-		$pagination->setPerPage(10);
-		$pagination->setElement($yourpools);
-		$pagination->setRequestPage($this->_request->getParam('page'));
-		$pagination->setPageUrl('/user/pool/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
+		$pagination->setPerPage(10)
+					->setElement($yourpools)
+					->setRequestPage($this->_request->getParam('page'))
+					->setPageUrl('/user/pool/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
 		$yourpools = $pagination->getElements();
 
 		$this->view->pagination = $pagination->pagination();
@@ -109,12 +108,18 @@ class User_PoolController extends Zend_Controller_Action
 		foreach($assignedclients as $c){
 			$assignedclientsArray[] = $c->toArray();
 		}
-
-		// extract the un-assigned clients from the clientlist of the group
-		$freeclients  = $this->arrayDiff($clientsArray,$assignedclientsArray);
 		
+		$db = Zend_Db_Table::getDefaultAdapter();        
+		// extract the un-assigned clients from the clientlist of the group
+		$stmt = $db->query("SELECT c.clientID, c.groupID, macadress,hardwarehash,created 
+							FROM pbs_poolentries pe RIGHT OUTER JOIN pbs_client c ON
+								c.clientID = pe.clientID
+								WHERE poolentriesID IS NULL
+								AND c.groupID = '".$this->membership->getGroupID()."'");				
+	
+		$freeclients  = $stmt->fetchAll();
 		// Format Time-String
-		foreach($freeclients as $k=>$cig){
+		foreach($freeclients as $k=>$cig){-
 			$freeclients[$k]['created'] = date(Zend_Registry::get('dateformat'),$cig['created']);
 		}
 		
@@ -217,8 +222,8 @@ class User_PoolController extends Zend_Controller_Action
 					print_a($pooldb->getGroupID(), $this->membership->getGroupID());
 					if($pooldb->getGroupID() == $this->membership->getGroupID()){
 						$pool = new Application_Model_Pool($_POST);
-						$pool->setID($poolID);
-						$pool->setGroupID($this->membership->getGroupID());
+						$pool->setID($poolID)
+	 						 ->setGroupID($this->membership->getGroupID());
 						$poolmapper->save($pool);
 						$this->_redirect('/user/pool/index/page/'.$this->page.'/modifyresult/ok');
 					}