Ticket #11970: mythweb-schedule-channel.patch

tv/classes/Schedule.php

@@ -205 +205 @@
             }
         // Data is a recordid -- load its contents
             if (!is_array($data) && $data > 0) {
-                $data = $db->query_assoc('SELECT *, IF(type='.rectype_always.',-1,chanid)         AS chanid,
+                $data = $db->query_assoc('SELECT *, 
                                                  UNIX_TIMESTAMP(startdate)+TIME_TO_SEC(starttime) AS starttime,
                                                  UNIX_TIMESTAMP(enddate)+TIME_TO_SEC(endtime)     AS endtime
                                             FROM record

tv/tmpl/default/schedules.php

@@ -95 +95 @@
             $urlstr = 'recordid='.$schedule->recordid;
 
             $css_class = ($schedule->type == rectype_dontrec ? 'deactivated' : 'scheduled');
-        // If this is an 'always on any channel' or 'find one' recording w/o a channel, set the channel name to 'Any'
-            if ($schedule->type == rectype_always || ($schedule->type == rectype_findone && !preg_match('/\\S/', $schedule->channel->channum)))
+        // If this is an 'always on any channel' or 'find one' recording without the 'This Channel' filter, set the channel name to 'Any'
+            if (($schedule->type == rectype_always || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) {
                 $schedule->channel->name = '[ '.t('Any').' ]';
+                $schedule->channel->channum = 0;
+            }
         // A program id counter for popup info
             if ($_SESSION["show_popup_info"]) {
                 static $program_id_counter = 0;

tv/tmpl/lite/schedules.php

@@ -53 +53 @@
             $urlstr = 'recordid='.$schedule->recordid;
 
             $css_class = ($schedule->type == rectype_dontrec ? 'deactivated' : 'scheduled');
-        // If this is an 'always on any channel' or 'find one' recording w/o a channel, set the channel name to 'Any'
-            if ($schedule->type == rectype_always || ($schedule->type == rectype_findone && !preg_match('/\\S/', $schedule->channel->channum)))
+        // If this is an 'always on any channel' or 'find one' recording without the 'This Channel' filter, set the channel name to 'Any'
+            if (($schedule->type == rectype_always || $schedule->type == rectype_findone) && !($schedule->filter & (1 << 10))) {
                 $schedule->channel->name = '[ '.t('Any').' ]';
+                $schedule->channel->channum = 0;
+            }
 
         // Print a dividing row if grouping changes
             if ($group_field == 'type')