diff options
| author | Simon | 2011-03-11 08:57:39 +0100 |
|---|---|---|
| committer | Simon | 2011-03-11 08:57:39 +0100 |
| commit | f755b6a457f96e9489a8dc89e35dea6882927f42 (patch) | |
| tree | 6ee4ec99c11f7d94a8ea7350da4ccc489cefb9ae /application/controllers/FilterController.php | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-f755b6a457f96e9489a8dc89e35dea6882927f42.tar.gz pbs2-f755b6a457f96e9489a8dc89e35dea6882927f42.tar.xz pbs2-f755b6a457f96e9489a8dc89e35dea6882927f42.zip | |
MacAdressenFilterung gefixxt, Fomular Buttons eingebaut, debug code entfernt
Diffstat (limited to 'application/controllers/FilterController.php')
| -rw-r--r-- | application/controllers/FilterController.php | 11 |
1 files changed, 7 insertions, 4 deletions
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; } |