Ticket #1054: mythweb.oldrecorded.2.diff

config/conf.php

@@ -96 +96 @@
     The following constants are defined for the recorded programs page
 
 */
-    define('show_recorded_pixmaps', true);
+    define('show_recorded_pixmaps', false);
 
 /*
 

includes/programs.php

@@ -128 +128 @@
                   FROM program
                        LEFT JOIN programrating USING (chanid, starttime)
                        LEFT JOIN oldrecorded
-                                 ON LENGTH(IFNULL(oldrecorded.seriesid, "")) > 0
-                                    AND LENGTH(IFNULL(oldrecorded.programid, "")) > 0
-                                    AND oldrecorded.programid = program.programid
-                                    AND oldrecorded.seriesid  = program.seriesid
+                                 ON oldrecorded.programid = program.programid
+                                    AND oldrecorded.seriesid = program.seriesid
+                                    AND (oldrecorded.recstatus = -3
+                                        OR ((LENGTH(IFNULL(oldrecorded.seriesid, "")) > 0
+                                        AND LENGTH(IFNULL(oldrecorded.programid, "")) > 0)))
                  WHERE';
     // Only loading a single channel worth of information
         if ($chanid > 0)
@@ -299 +300 @@
             #$this->inputid        = $data[19];
             $this->recpriority     = $data[20];
             $this->recstatus       = $data[21];
-            $this->conflicting     = ($this->recstatus == 'Conflict');   # conflicts with another scheduled recording?
-            $this->recording       = ($this->recstatus == 'WillRecord'); # scheduled to record?
             $this->recordid        = $data[22];
             $this->rectype         = $data[23];
             $this->dupin           = $data[24];
@@ -366 +365 @@
             }
         }
     // Turn recstatus into a word
-        if (isset($this->recstatus) && $GLOBALS['RecStatus_Types'][$this->recstatus])
+        if (isset($this->recstatus) && $GLOBALS['RecStatus_Types'][$this->recstatus]) {
+
             $this->recstatus = $GLOBALS['RecStatus_Types'][$this->recstatus];
+            $this->conflicting     = ($this->recstatus == 'Conflict');   # conflicts with another scheduled recording?
+            $this->recording       = ($this->recstatus == 'WillRecord'); # scheduled to record?
+        }
     // No longer a null column, so check for blank entries
         if ($this->airdate == '0000-00-00')
             $this->airdate = NULL;

modules/tv/upcoming.php

@@ -67 +67 @@
              || $_SESSION['scheduled_recordings']['disp_deactivated']
              || $_SESSION['scheduled_recordings']['disp_conflicts'])) {
         $_SESSION['scheduled_recordings'] = array('disp_scheduled'   => true,
-                                                  'disp_duplicates'  => true,
-                                                  'disp_deactivated' => true,
+                                                  'disp_duplicates'  => false,
+                                                  'disp_deactivated' => false,
                                                   'disp_conflicts'   => true
                                                  );
     }