From f755b6a457f96e9489a8dc89e35dea6882927f42 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 11 Mar 2011 08:57:39 +0100 Subject: MacAdressenFilterung gefixxt, Fomular Buttons eingebaut, debug code entfernt --- application/controllers/FilterController.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'application/controllers') diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php index 9141e10..02b468d 100644 --- a/application/controllers/FilterController.php +++ b/application/controllers/FilterController.php @@ -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'); @@ -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']; @@ -567,6 +566,10 @@ class FilterController extends Zend_Controller_Action 'clients' => $clients, )); + $filterevaluate->populate(array( + 'mac' => '6er tupel', + 'time'=>date('d.m.Y H:i')) + ); $this->view->filterevaluate = $filterevaluate; } -- cgit v1.2.3-55-g7522