--- template/default/prog_detail.html.orig 2011-11-19 08:02:18.000000000 +0100 +++ template/default/prog_detail.html 2020-10-30 12:33:45.004941151 +0100 @@ -90,7 +90,7 @@
- +
--- vdradmind.pl.orig 2014-08-05 07:34:58.000000000 +0200 +++ vdradmind.pl 2021-04-04 16:34:58.138620865 +0200 @@ -245,7 +245,7 @@ $CONFIG{CMD_LINES} = 20; # -$CONFIG{GUI_POPUP_WIDTH} = 500; +$CONFIG{GUI_POPUP_WIDTH} = 550; $CONFIG{GUI_POPUP_HEIGHT} = 250; # @@ -877,6 +877,20 @@ } } +sub GetChannelUniqIdByNumber { + my $vdr_id = shift; + + if ($vdr_id) { + for (@{$CHAN{$CHAN_FULL}->{channels}}) { + if ($_->{vdr_id} == $vdr_id) { + return ($_->{uniq_id}); + } + } + } else { + return (0); + } +} + sub include { my $file = shift; if ($file) { @@ -1532,6 +1546,7 @@ $FileWithPath = "$USER_CSS"; } elsif ($File =~ "^epg/") { $File =~ s/^epg\///; + $File =~ tr/:/-/; $FileWithPath = $CONFIG{EPGIMAGES} . "/" . $File; } @@ -3763,7 +3778,7 @@ } } - $CONFIG{GUI_POPUP_WIDTH} = 500 unless ($CONFIG{GUI_POPUP_WIDTH} =~ /\d+/); + $CONFIG{GUI_POPUP_WIDTH} = 550 unless ($CONFIG{GUI_POPUP_WIDTH} =~ /\d+/); $CONFIG{GUI_POPUP_HEIGHT} = 250 unless ($CONFIG{GUI_POPUP_HEIGHT} =~ /\d+/); } @@ -3958,8 +3973,10 @@ # find epgimages if ($CONFIG{EPGIMAGES} && -d $CONFIG{EPGIMAGES}) { - for my $epgimage (<$CONFIG{EPGIMAGES}/$epg_id\[\._\]*>) { + my $uniq_id = GetChannelUniqIdByNumber($vdr_id); + for my $epgimage (<$CONFIG{EPGIMAGES}/${uniq_id}_${epg_id}\[\._\]*>) { $epgimage =~ s/.*\///g; + $epgimage =~ tr/-/:/; push(@epgimages, { image => "epg/" . $epgimage }); } }