Ticket #1232: mythweb.recorded.3.diff
File mythweb.recorded.3.diff, 9.8 KB (added by , 18 years ago) |
---|
-
mythweb/themes/wml/tv/list.php
110 110 if (($page * $page_size) < count($Channels)) echo ' <a href="'.root.'tv/list?listbycallsign=y&page='.($page + 1).$prev_query.'">next ></a>'; 111 111 echo "<br />"; 112 112 113 $displayed_channels = array(); 113 114 foreach (array_keys($Channels) as $key) { 114 115 115 116 $row++; … … 124 125 continue; 125 126 } 126 127 128 // Skip already-displayed channels 129 if ($displayed_channels[$Channels[$key]->channum]) 130 continue; 131 $displayed_channels[$Channels[$key]->channum] = 1; 132 127 133 echo "<a href='".root."tv/channel/".$Channels[$key]->chanid."'>".$Channels[$key]->callsign."</a><br /> "; 128 134 129 135 // Count this channel -
mythweb/themes/default/tv/list.php
100 100 101 101 $timeslot_anchor = 0; 102 102 $channel_count = 0; 103 $displayed_channels = array(); 103 104 104 105 // Go through each channel and load/print its info - use references to avoid "copy" overhead 105 106 … … 111 112 if ($channel->visible == 0) { 112 113 continue; 113 114 } 115 // Skip already-displayed channels 116 if ($displayed_channels[$channel->channum]) 117 continue; 118 $displayed_channels[$channel->channum] = 1; 114 119 // Display the timeslot bar? 115 120 if ($channel_count % timeslotbar_skip == 0) { 116 121 // Update the timeslot anchor -
mythweb/themes/default/tv/search.php
115 115 <td><?php echo $show->description ?></td> 116 116 <td><?php echo $show->channel->channum.' - '.$show->channel->name ?></td> 117 117 <td nowrap><?php 118 echo '< br /><a href="'.root.'tv/detail/'.$show->chanid.'/'.$show->starttime.'">'.118 echo '<a href="'.root.'tv/detail/'.$show->chanid.'/'.$show->starttime.'">'. 119 119 strftime($_SESSION['date_search'], $show->starttime) . '</a>'; 120 120 if( $show->extra_showings ) 121 121 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' : '' ?>> 132 132 <a onclick="get_element('search_hd').checked=get_element('search_hd').checked ? false : true;"><?php echo t('HD Only') ?></a> 133 133 </div> 134 <div> 135 <input type="checkbox" class="radio" id="nodups" name="nodups" value="1"<?php echo $_SESSION['search']['nodups'] ? ' CHECKED' : '' ?>> 136 <a onclick="get_element('nodups').checked=get_element('nodups').checked ? false : true;"><?php echo t('Fold Showings') ?></a> 137 </div> 134 138 </div> 135 139 136 140 <hr /> -
mythweb/themes/wap/tv/list.php
60 60 61 61 // Go through each channel and load/print its info - use references to avoid "copy" overhead 62 62 $channel_count = 0; 63 $displayed_channels = array(); 63 64 foreach (array_keys($Channels) as $key) { 64 65 // Ignore channels with no number 65 66 if (strlen($Channels[$key]->channum) < 1) 66 67 continue; 68 // Skip already-displayed channels 69 if ($displayed_channels[$Channels[$key]->channum]) 70 continue; 71 $displayed_channels[$Channels[$key]->channum] = 1; 67 72 // Count this channel 68 73 $channel_count++; 69 74 // Grab the reference -
mythweb/includes/programs.php
379 376 // No channel data? Load it 380 377 global $Channels; 381 378 if (!is_array($Channels) || !count($Channels)) 382 load_all_channels( $this->chanid);379 load_all_channels(); 383 380 // Now we really should scan the $Channel array and add a link to this program's channel 384 381 foreach (array_keys($Channels) as $key) { 385 382 if ($Channels[$key]->chanid == $this->chanid) { -
mythweb/includes/channels.php
31 31 else 32 32 $sql = 'SELECT * FROM channel WHERE'; 33 33 $sql .= ' channel.visible=1'; 34 // Group and sort35 $sql .= ' GROUP BY channel.channumORDER BY '34 // Sort. 35 $sql .= ' ORDER BY ' 36 36 .(sortby_channum ? '' : 'channel.callsign, ') 37 37 .'(channel.channum + 0), channel.chanid'; 38 38 // Query -
mythweb/includes/recordings.php
123 123 // No channel data? Load it 124 124 global $Channels; 125 125 if (!is_array($Channels) || !count($Channels)) 126 load_all_channels( $this->chanid);126 load_all_channels(); 127 127 // Now we really should scan the $Channel array and add a link to this recording's channel 128 128 foreach (array_keys($Channels) as $key) { 129 129 if ($Channels[$key]->chanid == $this->chanid) { -
mythweb/languages/English.php
230 230 'Edit MythWeb and some MythTV settings.' => '', 231 231 'Exact Match' => '', 232 232 'HD Only' => '', 233 'Fold Showings' => '', 233 234 'Manual' => '', 234 235 'MythMusic on the web.' => '', 235 236 'MythVideo on the web.' => '', -
mythweb/modules/tv/schedules_manual.php
172 172 function channel_select($chanid) { 173 173 global $Channels; 174 174 echo '<select name="channel">'; 175 $seen = array(); 175 176 foreach ($Channels as $channel) { 176 177 // Ignore invisible channels 177 178 if ($channel->visible == 0) 178 179 continue; 180 // Group by channum 181 if ($seen[$channel->channum]) 182 continue; 183 $seen[$channel->channum] = $channel; 184 179 185 // Print the option 180 186 echo '<option value="'.$channel->chanid.'"'; 181 187 // Selected? -
mythweb/modules/tv/search.php
164 164 if (empty($Results)) 165 165 $Results = array(); 166 166 167 // Group $Results by channum 168 $seen = array(); 169 foreach( $Results as $dex => $row ) { 170 $uniquer = $row->programid . $row->starttime . $row->channel->channum; 171 if( isset($seen[$uniquer]) ) { 172 unset( $Results[$dex] ); 173 } else { 174 $seen[$uniquer] = $dex; 175 } 176 } 177 167 178 // Remove dups from the results if requested 168 179 if ($nodups) { 169 180 $seen = array(); // program ids already seen 170 181 foreach( $Results as $dex => $row ) { 171 $uniquer = $row->programid . $row->chan id;182 $uniquer = $row->programid . $row->channel->channum; 172 183 if( $seen[$uniquer] ) { 173 184 // add a new field to the old row 174 $Results[$seen[$uniquer]]->extra_showings[] = 175 $row->starttime; 185 if ($row->starttime != $Results[$seen[$uniquer]]->starttime && 186 (!is_array($Results[$seen[$uniquer]]->extra_showings) || 187 !in_array($row->starttime, 188 $Results[$seen[$uniquer]]->extra_showings))) { 189 $Results[$seen[$uniquer]]->extra_showings[] = 190 $row->starttime; 191 } 176 192 unset( $Results[$dex] ); 177 193 } else { 178 194 $seen[$uniquer] = $dex; -
mythweb/modules/tv/recorded.php
13 13 * 14 14 /**/ 15 15 16 // Populate the $Channels array 17 load_all_channels(); 18 16 19 // Make sure the recordings directory exists 17 20 if (file_exists('data/recordings')) { 18 21 // File is not a directory or a symlink