Ticket #848: mythweb.oldrecorded.diff

File mythweb.oldrecorded.diff, 3.3 KB (added by Robert Tsai <rtsai1111>, 14 years ago)
  • includes/programs.php

     
    116116                 .' UNIX_TIMESTAMP(program.endtime) AS endtime_unix,'
    117117                 .' CONCAT(repeat('.escape(star_character).', program.stars * '.escape(max_stars).'), IF((program.stars * '.escape(max_stars).' * 10) % 10, "&frac12;", "")) AS starstring,'
    118118                 .' IFNULL(programrating.system, "") AS rater,'
    119                  .' IFNULL(programrating.rating, "") AS rating'
    120                  .' FROM program LEFT JOIN programrating USING (chanid, starttime)'
     119                 .' IFNULL(programrating.rating, "") AS rating,'
     120                 .' oldrecorded.recstatus'
     121                 .' FROM (program LEFT JOIN oldrecorded USING (seriesid, programid))'
     122                 .' LEFT JOIN programrating USING (chanid, starttime)'
    121123                 .' WHERE';
    122124    // Only loading a single channel worth of information
    123125        if ($chanid > 0)
     
    309311            $this->auto_expire  = ($progflags & 0x04) ? true : false;    // FL_AUTOEXP   = 0x04
    310312            $this->is_editing   = ($progflags & 0x08) ? true : false;    // FL_EDITING   = 0x08
    311313            $this->bookmark     = ($progflags & 0x10) ? true : false;    // FL_BOOKMARK  = 0x10
    312         // Turn recstatus into a word
    313             if (isset($this->recstatus) && $GLOBALS['RecStatus_Types'][$this->recstatus])
    314                 $this->recstatus = $GLOBALS['RecStatus_Types'][$this->recstatus];
    315314        // Add a generic "will record" variable, too
    316315            $this->will_record = ($this->rectype && $this->rectype != rectype_dontrec) ? true : false;
    317316        }
     
    343342            $this->colorcode               = $data['colorcode'];
    344343            $this->syndicatedepisodenumber = $data['syndicatedepisodenumber'];
    345344            $this->title_pronounce         = $data['title_pronounce'];
     345            $this->recstatus               = $data['recstatus'];
    346346
    347347            if ($program_data['tsdefault']) {
    348348                $this->timestretch = $program_data['tsdefault'];
     
    350350                $this->timestretch = 1.0;
    351351            }
    352352        }
     353
     354    // Turn recstatus into a word
     355        if (isset($this->recstatus) && $GLOBALS['RecStatus_Types'][$this->recstatus])
     356            $this->recstatus = $GLOBALS['RecStatus_Types'][$this->recstatus];
     357
    353358    // No longer a null column, so check for blank entries
    354359        if ($this->airdate == '0000-00-00')
    355360            $this->airdate = NULL;
  • includes/css.php

     
    4747    status.
    4848*/
    4949    function recstatus_class(&$item) {
    50         if ($item->recordid && !strcasecmp(get_class($item), 'program')) {
     50        if ($item->recstatus && !strcasecmp(get_class($item), 'program')) {
    5151            switch ($item->recstatus) {
    5252                case 'ForceRecord':
    5353                    return 'record_override_record';
     
    5858                    return 'record_conflicting';
    5959                case 'PreviousRecording':
    6060                case 'CurrentRecording':
     61                case 'Recorded':
    6162                    return 'record_duplicate';
    6263                case 'ManualOverride':
    6364                case 'Cancelled':