summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xincludes/inc_files.php2
-rwxr-xr-xincludes/inc_stream.php12
-rwxr-xr-xincludes/inc_vdr.php5
3 files changed, 12 insertions, 7 deletions
diff --git a/includes/inc_files.php b/includes/inc_files.php
index a13478c..a968dce 100755
--- a/includes/inc_files.php
+++ b/includes/inc_files.php
@@ -44,7 +44,7 @@ function mediagetinfostream($stream = "")
if ($fileinfo['video']['resolution_y'] && $fileinfo['video']['resolution_x'])
$resy = ($fileinfo['video']['resolution_y'] * 180) / $fileinfo['video']['resolution_x'];
- exec("cp \"" .$file ."\" ram/stream-tb-tmp.jpg; " .$ffmpegpath ." -y -i ram/stream-tb-tmp.jpg -s 128x" .$resy ." ram/stream-tb.jpg");
+ exec("cp \"" .$file ."\" ram/stream-tb-tmp.jpg; " .$ffmpegpath ." -y -i ram/stream-tb-tmp.jpg -s 180x" .$resy ." ram/stream-tb.jpg");
}
else
{
diff --git a/includes/inc_stream.php b/includes/inc_stream.php
index b98b132..d6297e0 100755
--- a/includes/inc_stream.php
+++ b/includes/inc_stream.php
@@ -25,12 +25,14 @@ if (infostreamexist())
switch ($type)
{
case 1:
- $logopath = "logos/" .$realname .".png";
+ $channoslash = preg_replace("$/$", " ", $realname);
+ $logopath = "logos/" .$channoslash .".png";
if (!file_exists($logopath))
$logopath = "logos/nologoTV.png";
break;
case 2:
- $logopath = "logos/" .$realname .".png";
+ $channoslash = preg_replace("$/$", " ", $realname);
+ $logopath = "logos/" .$channslash .".png";
if (!file_exists($logopath))
$logopath = "logos/nologoREC.png";
break;
@@ -129,12 +131,14 @@ else
switch ($type)
{
case 1:
- $logopath = "logos/" .$realname .".png";
+ $channoslash = preg_replace("$/$", " ", $realname);
+ $logopath = "logos/" .$channoslash .".png";
if (!file_exists($logopath))
$logopath = "logos/nologoTV.png";
break;
case 2:
- $logopath = "logos/" .$realname .".png";
+ $channoslash = preg_replace("$/$", " ", $realname);
+ $logopath = "logos/" .$channoslash .".png";
if (!file_exists($logopath))
$logopath = "logos/nologoREC.png";
break;
diff --git a/includes/inc_vdr.php b/includes/inc_vdr.php
index d8ebf93..ac6be1d 100755
--- a/includes/inc_vdr.php
+++ b/includes/inc_vdr.php
@@ -248,10 +248,11 @@ function vdrlistchannels($category = "NULL")
print "<li class=\"withimage\">";
$chan2=addslashes($chan);
print " <a class=\"noeffect\" href=\"javascript:sendForm('$chan2');\">\r\n";
- if (!file_exists('logos/'.$chan.'.png'))
+ $channoslash = preg_replace("$/$", " ", $chan);
+ if (!file_exists('logos/'.$channoslash.'.png'))
print " <img src=\"logos/nologoTV.png\" />\r\n";
else
- print " <img src=\"logos/{$chan}.png\" />\r\n";
+ print " <img src=\"logos/{$channoslash}.png\" />\r\n";
print " <span class=\"name\">$chan</span>\r\n";
print " <span class=\"comment\">$epgtitle</span><span class=\"arrow\"></span></a>\r\n</li>\r\n";
print " <form name=\"$chan\" id=\"$chan\" method=\"post\" action=\"index.php\">";