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

1 files changed, 18 insertions, 1 deletions

diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index 201b452..71a8c7d 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -276,10 +276,23 @@ class user_PersonController extends Zend_Controller_Action
 		$this->view->deleteOtherRight = Pbs_Acl::checkRight('pdo');
 		$this->view->userIDsNamespace = $this->userIDsNamespace;
 
+		$this->view->personList = $this->personmapper->fetchAll();
+		
+		// Search
+		$search = $this->_request->getParam('search');
+		$mySearch = new Pbs_Search();
+		$mySearch->setSearchTerm($search);
+		$mySearch->setModule('person');
+		if($search != ''){
+			$this->view->search = $mySearch->getSearchTerm();
+			$this->view->personList = $mySearch->search($this->view->personList);
+		}
+		$this->view->searchform = $mySearch->searchForm();
+
 		// Pagination
 		$pagination = new Pbs_Pagination();
 		$pagination->setPerPage(5);
-		$pagination->setElement($this->personmapper->fetchAll());
+		$pagination->setElement($this->view->personList);
 		$pagination->setRequestPage($this->_request->getParam('page'));
 		$pagination->setPageUrl('/user/person/showall'.((isset($this->view->search))?'/search/'.$this->view->search:''));
 
@@ -288,6 +301,10 @@ class user_PersonController extends Zend_Controller_Action
 		$this->view->page 		= $pagination->getRequestPage();
 	}
 
+	public function searchAction(){
+		$this->_redirect('/user/person/showall/search/'.($_GET['search']));
+	}
+
 	public function showAction()
 	{
 		if(!Pbs_Acl::checkRight('psood')) {