Ticket #1232: mythweb.recorded.3.diff

mythweb/themes/wml/tv/list.php

@@ -110 +110 @@
             if (($page * $page_size) < count($Channels)) echo ' <a href="'.root.'tv/list?listbycallsign=y&amp;page='.($page + 1).$prev_query.'">next &gt;</a>';
             echo "<br />";
 
+            $displayed_channels = array();
             foreach (array_keys($Channels) as $key) {
 
                 $row++;
@@ -124 +125 @@
                     continue;
                 }
 
+                // Skip already-displayed channels
+                if ($displayed_channels[$Channels[$key]->channum])
+                    continue;
+                $displayed_channels[$Channels[$key]->channum] = 1;
+
                 echo "<a href='".root."tv/channel/".$Channels[$key]->chanid."'>".$Channels[$key]->callsign."</a><br /> ";
 
                 // Count this channel

mythweb/themes/default/tv/list.php

@@ -100 +100 @@
 
         $timeslot_anchor    = 0;
         $channel_count      = 0;
+        $displayed_channels = array();
 
     // Go through each channel and load/print its info - use references to avoid "copy" overhead
 
@@ -111 +112 @@
             if ($channel->visible == 0) {
                 continue;
             }
+        // Skip already-displayed channels
+            if ($displayed_channels[$channel->channum])
+                continue;
+            $displayed_channels[$channel->channum] = 1;
         // Display the timeslot bar?
             if ($channel_count % timeslotbar_skip == 0) {
             // Update the timeslot anchor

mythweb/themes/default/tv/search.php

@@ -115 +115 @@
     <td><?php echo $show->description ?></td>
     <td><?php echo $show->channel->channum.' - '.$show->channel->name ?></td>
     <td nowrap><?php
-            echo '<br /><a href="'.root.'tv/detail/'.$show->chanid.'/'.$show->starttime.'">'.
+            echo '<a href="'.root.'tv/detail/'.$show->chanid.'/'.$show->starttime.'">'.
                 strftime($_SESSION['date_search'], $show->starttime) . '</a>';
             if( $show->extra_showings )
                 foreach( $show->extra_showings as $showtime )

mythweb/themes/default/header.php

@@ -131 +131 @@
                             <input type="checkbox" class="radio" id="search_hd" name="search_hd" value="1"<?php echo $_SESSION['search']['search_hd'] ? ' CHECKED' : '' ?>>
                             <a onclick="get_element('search_hd').checked=get_element('search_hd').checked ? false : true;"><?php echo t('HD Only') ?></a>
                         </div>
+                        <div>
+                            <input type="checkbox" class="radio" id="nodups" name="nodups" value="1"<?php echo $_SESSION['search']['nodups'] ? ' CHECKED' : '' ?>>
+                            <a onclick="get_element('nodups').checked=get_element('nodups').checked ? false : true;"><?php echo t('Fold Showings') ?></a>
+                        </div>
                     </div>
 
                     <hr />

mythweb/themes/wap/tv/list.php

@@ -60 +60 @@
 
         // Go through each channel and load/print its info - use references to avoid "copy" overhead
         $channel_count = 0;
+        $displayed_channels = array();
         foreach (array_keys($Channels) as $key) {
         // Ignore channels with no number
             if (strlen($Channels[$key]->channum) < 1)
                 continue;
+        // Skip already-displayed channels
+            if ($displayed_channels[$Channels[$key]->channum])
+                continue;
+            $displayed_channels[$Channels[$key]->channum] = 1;
         // Count this channel
             $channel_count++;
         // Grab the reference

mythweb/includes/programs.php

@@ -379 +376 @@
         // No channel data?  Load it
             global $Channels;
             if (!is_array($Channels) || !count($Channels))
-                load_all_channels($this->chanid);
+                load_all_channels();
         // Now we really should scan the $Channel array and add a link to this program's channel
             foreach (array_keys($Channels) as $key) {
                 if ($Channels[$key]->chanid == $this->chanid) {

mythweb/includes/channels.php

@@ -31 +31 @@
         else
             $sql = 'SELECT * FROM channel WHERE';
         $sql .= ' channel.visible=1';
-    // Group and sort
-        $sql .= ' GROUP BY channel.channum ORDER BY '
+    // Sort.
+        $sql .= ' ORDER BY '
                 .(sortby_channum ? '' : 'channel.callsign, ')
                 .'(channel.channum + 0), channel.chanid';
     // Query

mythweb/includes/recordings.php

@@ -123 +123 @@
         // No channel data?  Load it
             global $Channels;
             if (!is_array($Channels) || !count($Channels))
-                load_all_channels($this->chanid);
+                load_all_channels();
         // Now we really should scan the $Channel array and add a link to this recording's channel
             foreach (array_keys($Channels) as $key) {
                 if ($Channels[$key]->chanid == $this->chanid) {

mythweb/languages/English.php

@@ -230 +230 @@
     'Edit MythWeb and some MythTV settings.'     => '',
     'Exact Match'                                => '',
     'HD Only'                                    => '',
+    'Fold Showings'                              => '',
     'Manual'                                     => '',
     'MythMusic on the web.'                      => '',
     'MythVideo on the web.'                      => '',

mythweb/modules/tv/schedules_manual.php

@@ -172 +172 @@
     function channel_select($chanid) {
         global $Channels;
         echo '<select name="channel">';
+        $seen = array();
         foreach ($Channels as $channel) {
         // Ignore invisible channels
             if ($channel->visible == 0)
                 continue;
+        // Group by channum
+            if ($seen[$channel->channum])
+                continue;
+            $seen[$channel->channum] = $channel;
+
         // Print the option
             echo '<option value="'.$channel->chanid.'"';
         // Selected?

mythweb/modules/tv/search.php

@@ -164 +164 @@
         if (empty($Results))
             $Results = array();
 
+    // Group $Results by channum
+        $seen = array();
+        foreach( $Results as $dex => $row ) {
+            $uniquer = $row->programid . $row->starttime . $row->channel->channum;
+            if( isset($seen[$uniquer]) ) {
+                unset( $Results[$dex] );
+            } else {
+                $seen[$uniquer] = $dex;
+            }
+        }
+
     // Remove dups from the results if requested
         if ($nodups) {
             $seen = array();        // program ids already seen
             foreach( $Results as $dex => $row ) {
-                $uniquer = $row->programid . $row->chanid;
+                $uniquer = $row->programid . $row->channel->channum;
                 if( $seen[$uniquer] ) {
                     // add a new field to the old row
-                    $Results[$seen[$uniquer]]->extra_showings[] =
-                                $row->starttime;
+                    if ($row->starttime != $Results[$seen[$uniquer]]->starttime &&
+                            (!is_array($Results[$seen[$uniquer]]->extra_showings) ||
+                            !in_array($row->starttime,
+                            $Results[$seen[$uniquer]]->extra_showings))) {
+                        $Results[$seen[$uniquer]]->extra_showings[] =
+                            $row->starttime;
+                    }
                     unset( $Results[$dex] );
                 } else {
                     $seen[$uniquer] = $dex;

mythweb/modules/tv/recorded.php

@@ -13 +13 @@
  *
 /**/
 
+// Populate the $Channels array
+    load_all_channels();
+
 // Make sure the recordings directory exists
     if (file_exists('data/recordings')) {
     // File is not a directory or a symlink