Ticket #6700: mythweb-6700-use_hostname_for_preview_pixmaps.patch

mythweb/modules/tv/classes/Program.php

@@ -515 +515 @@
         if ($height == 0)
             $height = floor($width / $this->getAspect());
 
-        return root."tv/get_pixmap/{$this->chanid}/{$this->recstartts}/$width/$height/$secs_in/$filename.{$width}x{$height}x$secs_in.png";
+        return root."tv/get_pixmap/{$this->hostname}/{$this->chanid}/{$this->recstartts}/$width/$height/$secs_in/$filename.{$width}x{$height}x$secs_in.png";
     }
 
 /**
@@ -523 +523 @@
  *
  * @todo, this should get put into a "recording" class or something like that.
 /**/
-    public static function get_preview_pixmap($chanid, $starttime, $width=160, $height=120, $secs_in=null) {
+    public static function get_preview_pixmap($hostname, $chanid, $starttime, $width=160, $height=120, $secs_in=null) {
     // We have to calulate $secs_in from the db
         if (is_null($secs_in))
             $secs_in = _or(get_backend_setting('PreviewPixmapOffset'), 64)
                        + _or(get_backend_setting('RecordPreRoll'), 0);
 
-        return MythBackend::find()->httpRequest('GetPreviewImage', array('ChanId'      => $chanid,
+        return MythBackend::find($hostname)->httpRequest('GetPreviewImage', array('ChanId'      => $chanid,
                                                                          'StartTime'   => unix2mythtime($starttime),
                                                                          'Height'      => $height,
                                                                          'Width'       => $width,

mythweb/modules/tv/get_pixmap.php

@@ -13 +13 @@
  *
 /**/
 
-    $chanid     = $Path[2];
-    $starttime  = $Path[3];
-    $width      = $Path[4];
-    $height     = $Path[5];
-    $seconds_in = $Path[6];
+    $hostname   = $Path[2];
+    $chanid     = $Path[3];
+    $starttime  = $Path[4];
+    $width      = $Path[5];
+    $height     = $Path[6];
+    $seconds_in = $Path[7];
 
     if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
         if (strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $starttime) {
@@ -26 +27 @@
         }
     }
 
-    $data = Program::get_preview_pixmap($chanid, $starttime, $width, $height, $seconds_in);
+    $data = Program::get_preview_pixmap($hostname, $chanid, $starttime, $width, $height, $seconds_in);
     if (strlen($data)) {
         header('Pragma: public', true);
         header('Content-Type: image/png');