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

1 files changed, 14 insertions, 0 deletions

diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php
index a6fbe9e..877cb65 100644
--- a/application/modules/user/controllers/BootisoController.php
+++ b/application/modules/user/controllers/BootisoController.php
@@ -79,6 +79,16 @@ class user_BootisoController extends Zend_Controller_Action
     	
     	$this->view->bootisolist = array_reverse($this->view->bootisolist);
     	
+    	// Search
+		$search = $this->_request->getParam('search');
+		$mySearch = new Pbs_Search();
+		$mySearch->setSearchTerm($search);
+		$mySearch->setModule('bootiso');
+		$this->view->searchform = $mySearch->searchForm();
+		if($search != ''){
+			$this->view->search = $mySearch->getSearchTerm();			
+			$this->view->bootisolist = $mySearch->search($this->view->bootisolist);			
+		}
     	
 	    // Pagination
     	$pagination = new Pbs_Pagination();	
@@ -105,6 +115,10 @@ class user_BootisoController extends Zend_Controller_Action
     
     }
     
+    public function searchAction(){
+		$this->_redirect('/user/bootiso/index/search/'.($_GET['search']));
+	}
+    
     public function downloadbootisoAction()
     {
     	$this->_helper->layout->disableLayout();