diff options
| author | Alib <aliboba@free.fr> | 2010-03-26 15:46:56 +0100 |
|---|---|---|
| committer | Alib <aliboba@free.fr> | 2010-03-26 15:46:56 +0100 |
| commit | fa50884934964b9b74a93555a9d89d19f977ee9d (patch) | |
| tree | 2f1936e1c71dedee2e362965bfce316225304655 | |
| parent | 33bbf60beffb3af4c9cff68235adc90589178470 (diff) | |
| parent | a1ef98c9e01b067876d2b209ecc64b582978b0ae (diff) | |
| download | istreamdev-fa50884934964b9b74a93555a9d89d19f977ee9d.tar.gz istreamdev-fa50884934964b9b74a93555a9d89d19f977ee9d.tar.bz2 | |
Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery
| -rwxr-xr-x | bin/vdr.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bin/vdr.php b/bin/vdr.php index 1701ed4..f89646d 100755 --- a/bin/vdr.php +++ b/bin/vdr.php @@ -387,7 +387,7 @@ function vdrgetfullepgat($channel, $at, $programs) // Close chan if(ereg("^c", $epgin[$i])) { - if ($programscounter && $validchan) + if ($validchan) { // Add new entry in the right category $chancat = vdrgetchancat($chanentry['name']); @@ -437,7 +437,8 @@ function vdrgetfullepgat($channel, $at, $programs) $validepg = 1; break; case "day": - if (($endtime > $at) && ($starttime < ($at + 3600*24))) + $dayendtime = $at - ($at % (3600*24)) + (3600*24); + if (($endtime > $at) && ($starttime < $dayendtime)) $validepg = 1; else $validepg = 0; @@ -524,6 +525,11 @@ function vdrgetepg($channel, $time, $day, $programs, $extended) case "day": // Get all day $requesteddate = $currentdate - ($currentdate % (3600*24)) + ($day * (3600*24)) - 3600; + if ($time != "") + { + $requestedtime = ((int) substr($time, 0, 2) * 3600) + ((int) substr($time, 2) * 60); + $requesteddate += $requestedtime; + } break; default: |