summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorSimon2011-03-28 15:50:14 +0200
committerSimon2011-03-28 15:50:14 +0200
commit2b95fee316bb22ccd727b6ba1ce4b7d42f85727d (patch)
tree2e3dccc4d83a75ef1c1293e6ea952e122b6e9efc /library
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-2b95fee316bb22ccd727b6ba1ce4b7d42f85727d.tar.gz
pbs2-2b95fee316bb22ccd727b6ba1ce4b7d42f85727d.tar.xz
pbs2-2b95fee316bb22ccd727b6ba1ce4b7d42f85727d.zip
Zeitformat im Filtertype korrigiert
Diffstat (limited to 'library')
-rw-r--r--library/Pbs/Filter.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/library/Pbs/Filter.php b/library/Pbs/Filter.php
index 753bdf7..81ec205 100644
--- a/library/Pbs/Filter.php
+++ b/library/Pbs/Filter.php
@@ -248,10 +248,10 @@ class Pbs_Filter{
// Time
$filtertypID = 7;
if(!$testFilter){
- $nowShort = date("h:i");
+ $nowShort = date("H:i");
}
else{
- $nowShort = date("h:i",$time);
+ $nowShort = date("H:i",$time);
}
$nowShort = str_replace(":","",$nowShort);
@@ -262,7 +262,7 @@ class Pbs_Filter{
REPLACE(fe.filtervalue,":","") <= '.$nowShort.' AND
REPLACE(fe.filtervalue2,":","") >= '.$nowShort." AND
fe.filterID = f.filterID AND
- f.groupID = '".$groupID."'");
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -323,7 +323,7 @@ class Pbs_Filter{
if($debuglevel >= 3)
print_a('weekday',$result,$set[$filtertypID]);
#########################################################
- // weekday
+ // date
$filtertypID = 11;
if(!$testFilter){
$date = date('d.m.Y');
@@ -344,7 +344,7 @@ class Pbs_Filter{
catch(Exception $e){}
if($debuglevel >= 3)
- print_a('weekday',$result,$set[$filtertypID]);
+ print_a('date',$result,$set[$filtertypID]);
########################################
// ErgebnisSet auswerten
if($debuglevel >= 2)