Index: mythweb/themes/wml/tv/list.php
===================================================================
--- mythweb/themes/wml/tv/list.php (revision 8911)
+++ mythweb/themes/wml/tv/list.php (working copy)
@@ -110,6 +110,7 @@
if (($page * $page_size) < count($Channels)) echo ' next >';
echo "
";
+ $displayed_channels = array();
foreach (array_keys($Channels) as $key) {
$row++;
@@ -124,6 +125,11 @@
continue;
}
+ // Skip already-displayed channels
+ if ($displayed_channels[$Channels[$key]->channum])
+ continue;
+ $displayed_channels[$Channels[$key]->channum] = 1;
+
echo "".$Channels[$key]->callsign."
";
// Count this channel
Index: mythweb/themes/default/tv/list.php
===================================================================
--- mythweb/themes/default/tv/list.php (revision 8911)
+++ mythweb/themes/default/tv/list.php (working copy)
@@ -100,6 +100,7 @@
$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,6 +112,10 @@
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
Index: mythweb/themes/default/tv/search.php
===================================================================
--- mythweb/themes/default/tv/search.php (revision 8911)
+++ mythweb/themes/default/tv/search.php (working copy)
@@ -115,7 +115,7 @@
description ?> |
channel->channum.' - '.$show->channel->name ?> |
'.
+ echo ''.
strftime($_SESSION['date_search'], $show->starttime) . '';
if( $show->extra_showings )
foreach( $show->extra_showings as $showtime )
Index: mythweb/themes/default/header.php
===================================================================
--- mythweb/themes/default/header.php (revision 8911)
+++ mythweb/themes/default/header.php (working copy)
@@ -131,6 +131,10 @@
>
+
Index: mythweb/themes/wap/tv/list.php
===================================================================
--- mythweb/themes/wap/tv/list.php (revision 8911)
+++ mythweb/themes/wap/tv/list.php (working copy)
@@ -60,10 +60,15 @@
// 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
Index: mythweb/includes/programs.php
===================================================================
--- mythweb/includes/programs.php (revision 8911)
+++ mythweb/includes/programs.php (working copy)
@@ -379,7 +376,7 @@
// 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) {
Index: mythweb/includes/channels.php
===================================================================
--- mythweb/includes/channels.php (revision 8911)
+++ mythweb/includes/channels.php (working copy)
@@ -31,8 +31,8 @@
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
Index: mythweb/includes/recordings.php
===================================================================
--- mythweb/includes/recordings.php (revision 8911)
+++ mythweb/includes/recordings.php (working copy)
@@ -123,7 +123,7 @@
// 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) {
Index: mythweb/languages/English.php
===================================================================
--- mythweb/languages/English.php (revision 8911)
+++ mythweb/languages/English.php (working copy)
@@ -230,6 +230,7 @@
'Edit MythWeb and some MythTV settings.' => '',
'Exact Match' => '',
'HD Only' => '',
+ 'Fold Showings' => '',
'Manual' => '',
'MythMusic on the web.' => '',
'MythVideo on the web.' => '',
Index: mythweb/modules/tv/schedules_manual.php
===================================================================
--- mythweb/modules/tv/schedules_manual.php (revision 8911)
+++ mythweb/modules/tv/schedules_manual.php (working copy)
@@ -172,10 +172,16 @@
function channel_select($chanid) {
global $Channels;
echo ' |