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

1 files changed, 17 insertions, 13 deletions

diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index 9141e10..7b05b0e 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -34,10 +34,10 @@ class FilterController extends Zend_Controller_Action
 		//TODO get bootmenu by group
 		$bootmenus = $bmmapper->fetchAll();
         if (!isset($_POST["add"])){		
-    		$addfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus));    		
+    		$addfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus));    		
 			$this->view->addfilterform = $addfilterform;			
 		}else {
-			$addfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus),$_POST);
+			$addfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus),$_POST);
 			if ($addfilterform->isValid($_POST)) {			
 				try{
 					$newfilter = new Application_Model_Filter($_POST);
@@ -88,7 +88,7 @@ class FilterController extends Zend_Controller_Action
         			$filtermapper->find($filterID,$filter);		
         			$filter2 = $filter->toArray();
         
-        			$editfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus));  
+        			$editfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Edit Filter','bootmenus'=>$bootmenus));  
         			$editfilterform->populate($filter2);
         			$this->view->editfilterform = $editfilterform;
         		
@@ -96,7 +96,7 @@ class FilterController extends Zend_Controller_Action
         			try{
         				$filterID = $this->_request->getParam('filterID');	
         				
-        				$editfilterform = new Application_Form_FilterAdd(array('bootmenus'=>$bootmenus),$_POST);
+        				$editfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Edit Filter','bootmenus'=>$bootmenus),$_POST);
         				//TODO: ACL integrieren				
         				$_POST['groupID'] = 1;
         				$_POST['membershipID'] = 1;
@@ -122,13 +122,13 @@ class FilterController extends Zend_Controller_Action
         // TODO: ACL implementieren ob er editieren darf   
 		if (!isset($_POST["add"])){
 			try{
-				$editfilterform = new Application_Form_FilterEntriesAdd(array('filterID' => $this->_request->getParam('filterID')));
+				$editfilterform = new Application_Form_FilterEntriesAdd(array('buttontext' => 'Add Filterentry','filterID' => $this->_request->getParam('filterID')));
 				$this->view->editfilterform = $editfilterform;
 			}catch (Zend_Exception $e) {  
 				echo "Error message 2: " . $e->getMessage() . "\n";  
 			}
 		} else{
-			$editfilterform = new Application_Form_FilterEntriesAdd($_POST);			
+			$editfilterform = new Application_Form_FilterEntriesAdd(array('buttontext' => 'Add Filterentry'),$_POST);			
 			if ($editfilterform->isValid($_POST)) {							
 				$newfilterenty = new Application_Model_FilterEntries();
 				$newfilterenty->setFilterID($_POST['filterID']);
@@ -154,7 +154,6 @@ class FilterController extends Zend_Controller_Action
     public function editfilterentryAction()
     {
         if (!isset($_POST["add"])){
-			echo "case1";
 			try{
 				$filterentriesID = $this->_request->getParam('filterentriesID');
 				
@@ -165,7 +164,7 @@ class FilterController extends Zend_Controller_Action
 				$filterentriesmapper->find($filterentriesID,$filterentry);		
 			
 
-				$editfilterform = new Application_Form_FilterEntriesAdd();
+				$editfilterform = new Application_Form_FilterEntriesAdd(array('buttontext' => 'Edit Filterentry'));
 				$editfilterform->populate($filterentry->toArray());
 				$editfilterform->setFilterID($filterID);
 				$this->view->editfilterform = $editfilterform;
@@ -176,7 +175,7 @@ class FilterController extends Zend_Controller_Action
 		} else{
 			try{
 				$filterentriesID = $this->_request->getParam('filterentriesID');	
-				$editfilterform = new Application_Form_FilterEntriesAdd($_POST);	
+				$editfilterform = new Application_Form_FilterEntriesAdd(array('buttontext' => 'Edit Filterentry'),$_POST);	
 				if ($editfilterform->isValid($_POST)) {		
 					$newfilterenty = new Application_Model_FilterEntries($_POST);					
 					$newfilterenty->setID($filterentriesID);				
@@ -317,11 +316,11 @@ class FilterController extends Zend_Controller_Action
 				$macAdress = $client->getMacadress();
 			}
 			try{
-				$macAdress = str_replace(":","",$this->fillMac($ipAdress));			
+				$macAdress = $this->fillMac($macAdress);			
 				$stmt = $db->query("SELECT * FROM pbs_filterentries WHERE 
 								filtertypeID  = ".$filtertypID." AND
-								CONV(HEX('filtervalue'),16,10) <= CONV(HEX('".$macAdress."'),16,10) AND
-								CONV(HEX('".$macAdress."'),16,10) <= CONV(HEX('filtervalue2'),16,10)");
+								filtervalue <= '".$macAdress."' AND
+								'".$macAdress."' <= filtervalue2");
 				$result = $stmt->fetchAll();
 				foreach($result as $r){
 					$set[$filtertypID][] = $r['filterID'];	
@@ -530,7 +529,7 @@ class FilterController extends Zend_Controller_Action
 				$bm = new Application_Model_BootMenu();
 				$bmmapper = new Application_Model_BootMenuMapper();
 				$bmmapper->find($bootmenuID,$bm);
-				echo "<h1><a href='/bootmenu/index/bootmenuID/".$bootmenuID."'>Goto BootmenuID: ".$bootmenuID."</a></h1>";
+				echo "<h1><a href='/bootmenu/index/bootmenuid/".$bootmenuID."'>Goto BootmenuID: ".$bootmenuID."</a></h1>";
 			}
 			else{
 			echo "<h1>No Result :-(</h1>";
@@ -567,6 +566,11 @@ class FilterController extends Zend_Controller_Action
 					'clients'		=>	$clients,
 					
 			));
+		$filterevaluate->populate(array(
+							'ip'  => '132.230.5.6',
+							'mac' => '08:00:20:ae:fd:7e',
+							'time'=>date('d.m.Y H:i'))
+							);
         $this->view->filterevaluate = $filterevaluate;
     }