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

1 files changed, 4 insertions, 3 deletions

diff --git a/application/modules/user/controllers/ClientController.php b/application/modules/user/controllers/ClientController.php
index 87e764d..9fe4b03 100644
--- a/application/modules/user/controllers/ClientController.php
+++ b/application/modules/user/controllers/ClientController.php
@@ -53,15 +53,16 @@ class User_ClientController extends Zend_Controller_Action
 		$search = $this->_request->getParam('search');
 		$mySearch = new Pbs_Search();
 		$mySearch->setSearchTerm($search);
+		$mySearch->setModule('client');
 		$this->view->searchform = $mySearch->searchForm();
 		if($search != ''){
-			$this->view->search = $search;			
+			$this->view->search = $mySearch->getSearchTerm();			
 			$clientsInGroup = $mySearch->search($clientsInGroup);			
 		}
 		
 		// Pagination
 		$pagination = new Pbs_Pagination();	
-		$pagination->setPerPage(10);		
+		$pagination->setPerPage(10);	
 		$pagination->setElement($clientsInGroup);
 		$pagination->setRequestPage($this->_request->getParam('page'));		
 		$pagination->setPageUrl('/user/client/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
@@ -73,7 +74,7 @@ class User_ClientController extends Zend_Controller_Action
 
 	}
 	public function searchAction(){
-		$this->_redirect('/user/client/index/search/'.$_GET['search']);
+		$this->_redirect('/user/client/index/search/'.($_GET['search']));
 	}
 
 	public function addclientAction()