merges

12 files changed, 128 insertions, 118 deletions

diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index b48806b..8c840ea 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -99,9 +99,9 @@ class Fbgui_IndexController extends Zend_Controller_Action
 		echo "<h1>Downloading</h1>";
 		echo "<script>\n";
 		echo "fbgui.setCallbackOnFinished('foo();');\n";
-		echo "fbgui.startDownload('http://132.230.4.27/dev/resource/getkernel/alpha/".$_SESSION['alphasessionID']."/file/kernel');\n";
-		echo "fbgui.startDownload('http://132.230.4.27/dev/resource/getinitramfs/alpha/".$_SESSION['alphasessionID']."/file/initramfs');\n";
-		echo "fbgui.startDownload('http://132.230.4.27/dev/resource/getkcl/alpha/".$_SESSION['alphasessionID']."/file/kcl');\n";
+		echo "fbgui.startDownload('http://132.230.4.27/resource/getkernel/alpha/".$_SESSION['alphasessionID']."/file/kernel');\n";
+		echo "fbgui.startDownload('http://132.230.4.27/resource/getinitramfs/alpha/".$_SESSION['alphasessionID']."/file/initramfs');\n";
+		echo "fbgui.startDownload('http://132.230.4.27/resource/getkcl/alpha/".$_SESSION['alphasessionID']."/file/kcl');\n";
 		echo "function foo(){
 		  fbgui.quit();
 		}";
@@ -110,4 +110,3 @@ class Fbgui_IndexController extends Zend_Controller_Action
 	}
 
 }
-
diff --git a/application/modules/fbgui/views/scripts/index/start.phtml b/application/modules/fbgui/views/scripts/index/start.phtml
index c341e02..a59dd3e 100644
--- a/application/modules/fbgui/views/scripts/index/start.phtml
+++ b/application/modules/fbgui/views/scripts/index/start.phtml
@@ -85,6 +85,17 @@
     window.setTimeout(rotate, 100);
   }
   window.setTimeout(rotate, 100);
+
+
+function updateProgress(p, s, u){
+  if (p >= 0 && p <= 100)
+    $("#progressbar").progressbar({ value: p });
+  else
+    $("#progressbar").progressbar({ value: 0 });
+}
+  $(document).ready(function() {
+    $("#progressbar").progressbar({ value: 0 });
+  });
 </script> 
 
 
@@ -99,3 +110,5 @@
   <div class="bar8"></div> 
 </div>
 <a href='/fbgui'>back</a>
+
+<div id="progressbar" style="height: 15px;"></div>
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php
index 63a5e38..a6fbe9e 100644
--- a/application/modules/user/controllers/BootisoController.php
+++ b/application/modules/user/controllers/BootisoController.php
@@ -79,21 +79,19 @@ class user_BootisoController extends Zend_Controller_Action
     	
     	$this->view->bootisolist = array_reverse($this->view->bootisolist);
     	
-    	// Pagination
-    	$perpage 	= 2;
-		$req_page 	= $this->_request->getParam('page');
-		$all 		= count($this->view->bootisolist);
-		$numpages 	= ceil($all/$perpage);		
-		if($req_page < 0 || !is_numeric($req_page) )
-			$req_page = 0;
-		if($req_page >= $numpages)
-			$req_page = $numpages-1;
-		$startitem 	= $req_page * $perpage;		
+    	
+	    // Pagination
+    	$pagination = new Pbs_Pagination();	
+		$pagination->setPerPage(2);		
+		$pagination->setElement($this->view->bootisolist);
+		$pagination->setRequestPage($this->_request->getParam('page'));		
+		$pagination->setPageUrl('/user/bootiso/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
+		$this->view->bootisolist = $pagination->getElements();		
 		
-		$pagination = new Pbs_Pagination();	
-		$this->view->pagination = $pagination->pagination('/user/bootiso/index',$req_page,$numpages);
-		$this->view->page = $req_page;
-		$this->view->bootisolist = array_slice($this->view->bootisolist,$startitem,$perpage);    	
+		$this->view->pagination = $pagination->pagination($pageurl);
+		$this->view->page 		= $pagination->getRequestPage();
+		$this->view->bootisolist= $this->view->bootisolist; 	
+ 	
     	
     	
     	$prebootMapper = new Application_Model_PreBootMapper(); 
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 2356515..7843b3f 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -89,23 +89,18 @@ class user_BootmenuController extends Zend_Controller_Action
 	    }	
 	    
 	    // Pagination
-			$perpage 	= 2;
-			$req_page 	= $this->_request->getParam('page');
-			$all 		= count($bootmenu);
-			$numpages 	= ceil($all/$perpage);		
-			if($req_page < 0 || !is_numeric($req_page) )
-				$req_page = 0;
-			if($req_page >= $numpages)
-				$req_page = $numpages-1;
-			$startitem 	= $req_page * $perpage;		
+	    $pagination = new Pbs_Pagination();	
+		$pagination->setPerPage(2);		
+		$pagination->setElement($bootmenu);
+		$pagination->setRequestPage($this->_request->getParam('page'));		
+		$pagination->setPageUrl('/user/bootmenu/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
+		$bootmenu = $pagination->getElements();		
 		
-			$pagination = new Pbs_Pagination();	
-			$this->view->pagination = $pagination->pagination('/user/bootmenu/index',$req_page,$numpages);
-			$this->view->page = $req_page;
-			$this->view->bootmenulist = array_slice($bootmenu,$startitem,$perpage);
-	    	
-	    	
-	    	$this->view->bootmenuentrylist = $bootmenuentries;
+		$this->view->pagination = $pagination->pagination($pageurl);
+		$this->view->page 		= $pagination->getRequestPage();
+		$this->view->bootmenulist = $bootmenu; 
+	    
+	    $this->view->bootmenuentrylist = $bootmenuentries;
 	    	
     }
 
diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php
index 69f3140..8f602fe 100644
--- a/application/modules/user/controllers/BootosController.php
+++ b/application/modules/user/controllers/BootosController.php
@@ -66,22 +66,17 @@ class user_BootosController extends Zend_Controller_Action
     	$this->view->bootoslist = $this->bootosMapper->findBy(array("groupID" => $groupID));
     	$this->view->update = array();
     	
-    	
     	// Pagination
-    	$perpage 	= 5;
-		$req_page 	= $this->_request->getParam('page');
-		$all 		= count($this->view->bootoslist);
-		$numpages 	= ceil($all/$perpage);		
-		if($req_page < 0 || !is_numeric($req_page) )
-			$req_page = 0;
-		if($req_page >= $numpages)
-			$req_page = $numpages-1;
-		$startitem 	= $req_page * $perpage;		
+	    $pagination = new Pbs_Pagination();	
+		$pagination->setPerPage(5);		
+		$pagination->setElement($this->view->bootoslist);
+		$pagination->setRequestPage($this->_request->getParam('page'));		
+		$pagination->setPageUrl('/user/bootos/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
+		$this->view->bootoslist = $pagination->getElements();		
 		
-		$pagination = new Pbs_Pagination();	
-		$this->view->pagination = $pagination->pagination('/user/bootos/index',$req_page,$numpages);
-		$this->view->page = $req_page;
-		$this->view->bootoslist = array_slice($this->view->bootoslist,$startitem,$perpage);    	
+		$this->view->pagination = $pagination->pagination($pageurl);
+		$this->view->page 		= $pagination->getRequestPage();
+		$this->view->bootoslist = $this->view->bootoslist;    	 	
     	
     	
     	$update = $this->_request->getParam('checkupdate');
diff --git a/application/modules/user/controllers/ClientController.php b/application/modules/user/controllers/ClientController.php
index e26075b..87e764d 100644
--- a/application/modules/user/controllers/ClientController.php
+++ b/application/modules/user/controllers/ClientController.php
@@ -49,23 +49,32 @@ class User_ClientController extends Zend_Controller_Action
 		$clientMapper = new Application_Model_ClientMapper();
 		$clientsInGroup = $clientMapper->findBy(array('groupID' => $this->membership->getGroupID()),true);
 		
+		// Search
+		$search = $this->_request->getParam('search');
+		$mySearch = new Pbs_Search();
+		$mySearch->setSearchTerm($search);
+		$this->view->searchform = $mySearch->searchForm();
+		if($search != ''){
+			$this->view->search = $search;			
+			$clientsInGroup = $mySearch->search($clientsInGroup);			
+		}
 		
-		$perpage 	= 10;
-		$req_page 	= $this->_request->getParam('page');
-		$all 		= count($clientsInGroup);
-		$numpages 	= ceil($all/$perpage);		
-		if($req_page < 0 || !is_numeric($req_page) )
-			$req_page = 0;
-		if($req_page >= $numpages)
-			$req_page = $numpages-1;
-		$startitem 	= $req_page * $perpage;		
-		
+		// Pagination
 		$pagination = new Pbs_Pagination();	
-		$this->view->pagination = $pagination->pagination('/user/client/index',$req_page,$numpages);
-		$this->view->page = $req_page;
-		$this->view->clients = array_slice($clientsInGroup,$startitem,$perpage);
+		$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:''));
+		$clientsInGroup = $pagination->getElements();		
+		
+		$this->view->pagination = $pagination->pagination($pageurl);
+		$this->view->page 		= $pagination->getRequestPage();
+		$this->view->clients 	= $clientsInGroup;
 
 	}
+	public function searchAction(){
+		$this->_redirect('/user/client/index/search/'.$_GET['search']);
+	}
 
 	public function addclientAction()
 	{
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index f00d1bc..83ff804 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -66,22 +66,17 @@ class user_ConfigController extends Zend_Controller_Action
     		$config->setGroupID("[".$config->getGroupID()."] ".$groupMapper->find($config->getGroupID())->getTitle());
     	}
     	
-    	
     	// Pagination
-    	$perpage 	= 5;
-		$req_page 	= $this->_request->getParam('page');
-		$all 		= count($this->view->configlist);
-		$numpages 	= ceil($all/$perpage);		
-		if($req_page < 0 || !is_numeric($req_page) )
-			$req_page = 0;
-		if($req_page >= $numpages)
-			$req_page = $numpages-1;
-		$startitem 	= $req_page * $perpage;		
+	    $pagination = new Pbs_Pagination();	
+		$pagination->setPerPage(2);		
+		$pagination->setElement($this->view->configlist);
+		$pagination->setRequestPage($this->_request->getParam('page'));		
+		$pagination->setPageUrl('/user/config/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
+		$this->view->configlist = $pagination->getElements();		
 		
-		$pagination = new Pbs_Pagination();	
-		$this->view->pagination = $pagination->pagination('/user/config/index',$req_page,$numpages);
-		$this->view->page = $req_page;
-		$this->view->configlist = array_slice($this->view->configlist,$startitem,$perpage); 
+		$this->view->pagination = $pagination->pagination($pageurl);
+		$this->view->page 		= $pagination->getRequestPage();
+		$this->view->configlist = $this->view->configlist;    	 	    	
     		     	
     }
 
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index 83ccdc4..d4ddeae 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -55,21 +55,19 @@ class User_FilterController extends Zend_Controller_Action
 			$ff->setID($filter['filterID']);
 			$allFilter[] = $ff;
 		}
-		$perpage 	= 2;
-		$req_page 	= $this->_request->getParam('page');
-		$all 		= count($allFilter);
-		$numpages 	= ceil($all/$perpage);		
-		if($req_page < 0 || !is_numeric($req_page) )
-			$req_page = 0;
-		if($req_page >= $numpages)
-			$req_page = $numpages-1;
-		$startitem 	= $req_page * $perpage;		
 		
-		$pagination = new Pbs_Pagination();	
-		$this->view->pagination = $pagination->pagination('/user/filter/index',$req_page,$numpages);
-		$this->view->page = $req_page;
-	
-		$this->view->filters = array_slice($allFilter,$startitem,$perpage);
+		// Pagination
+	    $pagination = new Pbs_Pagination();	
+		$pagination->setPerPage(2);		
+		$pagination->setElement($allFilter);
+		$pagination->setRequestPage($this->_request->getParam('page'));		
+		$pagination->setPageUrl('/user/filter/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
+		$allFilter = $pagination->getElements();		
+		
+		$this->view->pagination = $pagination->pagination($pageurl);
+		$this->view->page 		= $pagination->getRequestPage();
+		$this->view->filters = $allFilter;    	 		
+		
 	}
 
 	public function addfilterAction()
@@ -79,8 +77,10 @@ class User_FilterController extends Zend_Controller_Action
 			$this->_redirect('/user');
 			
 		$bmmapper = new Application_Model_BootMenuMapper();
+
 		$result = $bmmapper->findBy(array('groupID' => $this->membership->getGroupID()),true);	
 		print_a($result);
+
 		
 		foreach($result as $rr){
 			$bm = new Application_Model_BootMenu();
@@ -301,7 +301,7 @@ class User_FilterController extends Zend_Controller_Action
 													'data' => $_POST,
 													'page' => $this->page));
 				if ($addform->isValid($_POST)) {
-					print_a('valid');
+					# print_a('valid');
 					$newfilterenty = new Application_Model_FilterEntries();
 					$newfilterenty->setFilterID($filterID);
 					$newfilterenty->setFiltertypeID($_POST['filtertypeID']);
diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php
index 7bf3446..e5fea8c 100644
--- a/application/modules/user/controllers/PoolController.php
+++ b/application/modules/user/controllers/PoolController.php
@@ -64,20 +64,19 @@ class User_PoolController extends Zend_Controller_Action
 			$ff->setID($pool['poolID']);
 			$yourpools[] = $ff;
 		}
-		$perpage 	= 4;
-		$req_page 	= $this->_request->getParam('page');
-		$all 		= count($yourpools);
-		$numpages 	= ceil($all/$perpage);		
-		if($req_page < 0 || !is_numeric($req_page) )
-			$req_page = 0;
-		if($req_page >= $numpages)
-			$req_page = $numpages-1;
-		$startitem 	= $req_page * $perpage;		
 		
-		$pagination = new Pbs_Pagination();	
-		$this->view->pagination = $pagination->pagination('/user/pool/index',$req_page,$numpages);
-		$this->view->page = $req_page;
-		$this->view->pools = array_slice($yourpools,$startitem,$perpage);
+		// Pagination
+	    $pagination = new Pbs_Pagination();	
+		$pagination->setPerPage(4);		
+		$pagination->setElement($yourpools);
+		$pagination->setRequestPage($this->_request->getParam('page'));		
+		$pagination->setPageUrl('/user/pool/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
+		$yourpools = $pagination->getElements();		
+		
+		$this->view->pagination = $pagination->pagination($pageurl);
+		$this->view->page 		= $pagination->getRequestPage();
+		$this->view->pools		= $yourpools;    	 			
+		
 
 		// Get all Clients from this group
 		$clientmapper = new Application_Model_ClientMapper();
diff --git a/application/modules/user/controllers/PrebootController.php b/application/modules/user/controllers/PrebootController.php
index 73e838d..6944e27 100644
--- a/application/modules/user/controllers/PrebootController.php
+++ b/application/modules/user/controllers/PrebootController.php
@@ -65,20 +65,16 @@ class User_PrebootController extends Zend_Controller_Action
     	$this->view->prebootlist = $this->prebootMapper->findBy(array("groupID" => $groupID));
     	
     	// Pagination
-    	$perpage 	= 2;
-		$req_page 	= $this->_request->getParam('page');
-		$all 		= count($this->view->prebootlist);
-		$numpages 	= ceil($all/$perpage);		
-		if($req_page < 0 || !is_numeric($req_page) )
-			$req_page = 0;
-		if($req_page >= $numpages)
-			$req_page = $numpages-1;
-		$startitem 	= $req_page * $perpage;		
+	    $pagination = new Pbs_Pagination();	
+		$pagination->setPerPage(2);		
+		$pagination->setElement($this->view->prebootlist);
+		$pagination->setRequestPage($this->_request->getParam('page'));		
+		$pagination->setPageUrl('/user/preboot/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
+		$this->view->prebootlist = $pagination->getElements();		
 		
-		$pagination = new Pbs_Pagination();	
-		$this->view->pagination = $pagination->pagination('/user/preboot/index',$req_page,$numpages);
-		$this->view->page = $req_page;
-		$this->view->prebootlist = array_slice($this->view->prebootlist,$startitem,$perpage);    	
+		$this->view->pagination = $pagination->pagination($pageurl);
+		$this->view->page 		= $pagination->getRequestPage();
+		$this->view->prebootlist= $this->view->prebootlist;    	 			
     	
     	
     	
diff --git a/application/modules/user/forms/Filter.php b/application/modules/user/forms/Filter.php
index a7a2555..0676ba8 100644
--- a/application/modules/user/forms/Filter.php
+++ b/application/modules/user/forms/Filter.php
@@ -9,23 +9,33 @@ class user_Form_Filter extends Zend_Form
     {		
         $this->setName("Add Filter");
 		$this->setMethod('post');
-
+		
+		if(Pbs_Acl::checkRight('fefp')){
+			$edit = 'true';
+		}
+		else{
+			$edit = null;
+		}
+		
         $this->addElement('text', 'title', array(
 			'filters' => array('StringTrim'),
 			'validators' => array(
 				array('StringLength', false, array(0, 50)),
 			),
 			'required' => true,
+			'readOnly' => $edit,
 			'label' => 'Title:',
 		));
  		$this->addElement('textarea', 'description', array(
 			'filters' => array('StringTrim'),
 			'required' => false,
+			'readOnly' => $edit,
 			'label' => 'Description:',
 		));
 		
 		$bootmenufield = $this->createElement('select','bootmenuID');
-        $bootmenufield ->setLabel('Bootmenu:');
+        $bootmenufield->setLabel('Bootmenu:');
+        $bootmenufield->setAttrib('readOnly', $edit);
 
         if(count($this->bootmenus)>0){
         	foreach($this->bootmenus as $g){        		
diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml
index 62c698c..5a75741 100644
--- a/application/modules/user/views/scripts/client/index.phtml
+++ b/application/modules/user/views/scripts/client/index.phtml
@@ -1,5 +1,6 @@
 <h1>Clients</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+<?php echo $this->searchform; ?>
 <?php echo $this->formButton('createbootos', 'Create Client', array(
 							'onclick' => 'self.location="/user/client/addclient/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>