summaryrefslogtreecommitdiffstats
path: root/library/Pbs/Filter.php
diff options
context:
space:
mode:
authorSimon2011-03-28 11:37:40 +0200
committerSimon2011-03-28 11:37:40 +0200
commit1ca4c8d26c9a0c70d29f6a9a9c9ad2c305f036b9 (patch)
tree6e9470932bec04075808b595335f8916f2ce9983 /library/Pbs/Filter.php
parentFilter auf das Recht 'nur filterpriorität ändern' vorbereitet (diff)
downloadpbs2-1ca4c8d26c9a0c70d29f6a9a9c9ad2c305f036b9.tar.gz
pbs2-1ca4c8d26c9a0c70d29f6a9a9c9ad2c305f036b9.tar.xz
pbs2-1ca4c8d26c9a0c70d29f6a9a9c9ad2c305f036b9.zip
Filter anders gelöst, fbgui startbutton geändert
Diffstat (limited to 'library/Pbs/Filter.php')
-rw-r--r--library/Pbs/Filter.php142
1 files changed, 77 insertions, 65 deletions
diff --git a/library/Pbs/Filter.php b/library/Pbs/Filter.php
index 5b5e523..753bdf7 100644
--- a/library/Pbs/Filter.php
+++ b/library/Pbs/Filter.php
@@ -59,6 +59,12 @@ class Pbs_Filter{
$sessionarray = $sessionmapper->findBy('alphasessionID',$_SESSION['alphasessionID']);
$session->setOptions($sessionarray[0]);
$session->setID($sessionarray['sessionID']);
+
+ $bootisoMapper = new Application_Model_BootisoMapper();
+ $bootiso = new Application_Model_BootIso();
+ $bootisoMapper->find($session->getBootisoID(),$bootiso);
+ $groupID = $bootiso->getGroupID();
+
#########################################################
// IP Adress
$filtertypID = 1;
@@ -66,17 +72,15 @@ class Pbs_Filter{
if(!$testFilter){
$ipAdress = $session->getIp();
}
- $ipAdress = str_replace(".","",$this->fillIP($ipAdress));
-
- $select = $db->select()
- ->from(array('pbs_filterentries')
- )
- ->where('filtertypeID = ?',$filtertypID)
- ->where('REPLACE(filtervalue,".","") <= ?',$ipAdress)
- ->where('? <= REPLACE(filtervalue2,".","")',$ipAdress);
-
- $stmt = $select->query();
- $result = $stmt->fetchAll();
+ $ipAdress = str_replace(".","",$this->fillIP($ipAdress));
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ REPLACE(fe.filtervalue,'.','') <= '".$ipAdress."' AND
+ '".$ipAdress."' <= REPLACE(fe.filtervalue2,'.','') AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+
+ $result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
}
@@ -96,10 +100,13 @@ class Pbs_Filter{
}
try{
$macAdress = $this->fillMac($macAdress);
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue <= '".$macAdress."' AND
- '".$macAdress."' <= filtervalue2");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue <= '".$macAdress."' AND
+ '".$macAdress."' <= fe.filtervalue2 AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -123,9 +130,11 @@ class Pbs_Filter{
}
try{
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$poolID." ");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$poolID." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
if(count($result)>0){
foreach($result as $r){
@@ -146,9 +155,12 @@ class Pbs_Filter{
$clientID = $session->getClientID();
}
try{
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$clientID." ");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$clientID." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -166,9 +178,11 @@ class Pbs_Filter{
$bootisoID = $session->getBootisoID();
}
try{
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$bootisoID." ");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$bootisoID." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -188,9 +202,11 @@ class Pbs_Filter{
$membershipID = $this->membership->getID();
}
try{
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$membershipID." ");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$membershipID." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -208,20 +224,16 @@ class Pbs_Filter{
if(!$testFilter){
// get membership from the session
//TODO: GET GROUP from SESSION
- $groupID = $this->membership->getGroupID();
+ $membergroupID = $this->membership->getGroupID();
}
- }
- else{
- $bootisoMapper = new Application_Model_BootisoMapper();
- $bootiso = new Application_Model_BootIso();
- $bootisoMapper->find($session->getBootisoID(),$bootiso);
- $groupID = $bootiso->getGroupID();
- }
+ }
if(isset($groupID)){
try{
- $stmt = $db->query("SELECT * FROM pbs_filterentries WHERE
- filtertypeID = ".$filtertypID." AND
- filtervalue = ".$groupID." ");
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$membergroupID." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -245,10 +257,12 @@ class Pbs_Filter{
$nowShort = str_replace(":","",$nowShort);
try{
- $stmt = $db->query('SELECT * FROM pbs_filterentries WHERE
- filtertypeID = '.$filtertypID.' AND
- REPLACE(filtervalue,":","") <= '.$nowShort.' AND
- REPLACE(filtervalue2,":","") >= '.$nowShort.' ');
+ $stmt = $db->query('SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = '.$filtertypID.' AND
+ REPLACE(fe.filtervalue,":","") <= '.$nowShort.' AND
+ REPLACE(fe.filtervalue2,":","") >= '.$nowShort." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -270,13 +284,13 @@ class Pbs_Filter{
}
try{
- $select = $db->select()
- ->from(array('pbs_filterentries')
- )
- ->where('filtertypeID = ?',$filtertypID)
- ->where('`filtervalue` = ?',$hardwarehash);
- $stmt = $select->query();
- $result = $stmt->fetchAll();
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue = ".$hardwarehash." AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+ $result = $stmt->fetchAll();
+
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
}
@@ -293,14 +307,13 @@ class Pbs_Filter{
}
try{
- $select = $db->select()
- ->from(array('pbs_filterentries')
- )
- ->where('filtertypeID = ?',$filtertypID)
- ->where('filtervalue = ? ',$weekday);
-
- $stmt = $select->query();
- $result = $stmt->fetchAll();
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ fe.filtervalue <= ".$weekday." AND
+ ".$weekday." <= fe.filtervalue2 AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+ $result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
}
@@ -317,14 +330,13 @@ class Pbs_Filter{
}
try{
- $select = $db->select()
- ->from(array('pbs_filterentries')
- )
- ->where('filtertypeID = ?',$filtertypID)
- ->where('REPLACE(filtervalue,".","") <= ? AND ? <= REPLACE(filtervalue2,".","")',$date);
-
- $stmt = $select->query();
- $result = $stmt->fetchAll();
+ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE
+ fe.filtertypeID = ".$filtertypID." AND
+ REPLACE(fe.filtervalue,'.','') <= ".$date." AND
+ ".$date." <= REPLACE(fe.filtervalue2,'.','') <= AND
+ fe.filterID = f.filterID AND
+ f.groupID = '".$groupID."'");
+ $result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
}