Ticket #4212: mythweb_video.patch

objects/Video.php

@@ -65 +65 @@
         }
         $this->childid      = $video['childid'];
     // Figure out the URL
         $this->url = '#';
         if (file_exists('data/video/'))
+       {
+           $mythvideo_dir_ar = split(":", $mythvideo_dir);
+           $i = 1;
+           foreach ($mythvideo_dir_ar as &$path) {
+               $path = '#^' . $path . '/?#';
+               $video_path[$i - 1] = "video$i/";
+               $i++;
+           }
+           unset($path);
+           $video_path[0] = 'video/';
+
             $this->url = root . implode('/', array_map('rawurlencode',
                                              array_map('utf8tolocal',
-                                             explode('/',
-                                             'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
-                                       ))));
+                                             explode('/', 'data/' . 
+                                               preg_replace($mythvideo_dir_ar, $video_path, $this->filename) ))));
+//                                             preg_replace('#^'.$mythvideo_dir.'/?#', 'video/', $this->filename) ))));
+       }
         $genre = $db->query('SELECT videometadatagenre.idgenre
                                FROM videometadatagenre
                               WHERE videometadatagenre.idvideo = ?',
                             $this->intid
                             );