diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-11-16 16:23:31 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-11-16 16:23:31 +0000 |
| commit | 21548d0ce3fa4827d8052687485a70bc67956aaf (patch) | |
| tree | 641c446c78f8dcf32e8eea4cd9c7923ec85c1040 | |
| parent | da0a0b776fbe8fb9c4c1746f452148f0da0f4c8a (diff) | |
| download | xxv-21548d0ce3fa4827d8052687485a70bc67956aaf.tar.gz xxv-21548d0ce3fa4827d8052687485a70bc67956aaf.tar.bz2 | |
* xstyle/html - use also active charset
* EPG: Compare preview images at update
| -rw-r--r-- | html/widgets/wait.tmpl | 1 | ||||
| -rw-r--r-- | lib/XXV/MODULES/EPG.pm | 2 | ||||
| -rw-r--r-- | lib/XXV/OUTPUT/HTML/WAIT.pm | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/html/widgets/wait.tmpl b/html/widgets/wait.tmpl index 333fa91..4d0b2a5 100644 --- a/html/widgets/wait.tmpl +++ b/html/widgets/wait.tmpl @@ -4,6 +4,7 @@ <html> <head> <title>XXV</title> + <meta http-equiv="Content-Type" content="text/html; charset=<?% charset %?>"> <meta name="copyright" content="copyright 2004 Xpix"> <style type="text/css"> <!-- diff --git a/lib/XXV/MODULES/EPG.pm b/lib/XXV/MODULES/EPG.pm index f1d49a4..352dfaf 100644 --- a/lib/XXV/MODULES/EPG.pm +++ b/lib/XXV/MODULES/EPG.pm @@ -417,7 +417,7 @@ sub compareEpgData { if(ref $waiter); # First - read database - my $sql = qq|SELECT SQL_CACHE eventid, title, subtitle, length(description) as ldescription, duration, UNIX_TIMESTAMP(starttime) as starttime, UNIX_TIMESTAMP(vpstime) as vpstime, video, audio from EPG where vid = ? and channel_id = ? |; + my $sql = qq|SELECT SQL_CACHE eventid, title, subtitle, length(description) as ldescription, duration, UNIX_TIMESTAMP(starttime) as starttime, UNIX_TIMESTAMP(vpstime) as vpstime, video, audio, image from EPG where vid = ? and channel_id = ? |; my $sth = $self->{dbh}->prepare($sql); $sth->execute($vid, $channel) or return error sprintf("Couldn't execute query: %s.",$sth->errstr); diff --git a/lib/XXV/OUTPUT/HTML/WAIT.pm b/lib/XXV/OUTPUT/HTML/WAIT.pm index 8987e38..ede3cb7 100644 --- a/lib/XXV/OUTPUT/HTML/WAIT.pm +++ b/lib/XXV/OUTPUT/HTML/WAIT.pm @@ -62,9 +62,13 @@ sub new { $self->{steps} = $attr{'-steps'} || 10; + $self->{charset} = $attr{'-charset'} + || 'ISO-8859-1'; + $self->{pusher} = XXV::OUTPUT::HTML::PUSH->new( -cgi => $self->{cgi}, # The CGI Object from Lincoln Stein -handle => $self->{handle}, # The handle to printout the http Stuff + -charset => $self->{charset} ); $self->init(); |