From 74cbc655e511529ad62b3e12b20eef6df65083de Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Thu, 15 Nov 2007 17:26:12 +0000
Subject: * TIMERS: Program wrong day by timer from event with vps at midnight

---
 lib/XXV/MODULES/TIMERS.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm
index e9fde8b..50f7442 100644
--- a/lib/XXV/MODULES/TIMERS.pm
+++ b/lib/XXV/MODULES/TIMERS.pm
@@ -488,7 +488,10 @@ SELECT SQL_CACHE
     channel_id,
     description as Summary,
     CONCAT_WS('~', title, subtitle) as File,
-    DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP(starttime) - ? ), '%d') as Day,
+    IF(? = 'y' and vpstime,
+      DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP(vpstime)), '%d'),
+      DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP(starttime) - ? ), '%d'))
+      as Day,
     DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP(starttime) - ? ), '%H%i') as Start,
     DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP(starttime) + duration + ? ), '%H%i') as Stop,
     DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP(vpstime)), '%H%i') as VpsStart,
@@ -498,7 +501,7 @@ FROM
 WHERE
     eventid = ?
 |);
-        $sth->execute($obj->{prevminutes} * 60, $obj->{prevminutes} * 60, $obj->{afterminutes} * 60, $epgid)
+        $sth->execute($obj->{usevpstime}, $obj->{prevminutes} * 60, $obj->{prevminutes} * 60, $obj->{afterminutes} * 60, $epgid)
             or return $console->err(sprintf(gettext("Event '%s' does not exist in the database!"),$epgid));
         $epg = $sth->fetchrow_hashref();
     }
-- 
cgit v1.2.3