Ticket #964: livetv-mythweb.patch

mythweb/languages/English.php

@@ -279 +279 @@
     'SI Units?'                       => '',
     'Scheduled Popup'                 => '',
     'Show descriptions on new line'   => '',
+    'Show LiveTV recordings under All recordings category' => '',
     'Status Bar'                      => '',
     'Weather Icons'                   => '',
     'format help'                     => '',

mythweb/modules/settings/session.php

@@ -33 +33 @@
         if ($_POST['weathericonset'])       $_SESSION['weathericonset']       = $_POST['weathericonset'];
     // Recorded Programs
         $_SESSION['recorded_descunder'] = $_POST['recorded_descunder'] ? true : false;
+        $_SESSION['recorded_hidelivetv'] = $_POST['recorded_hidelivetv'] ? true : false;
     // Guide Settings
         $_SESSION['guide_favonly'] = $_POST['guide_favonly'] ? true : false;
     // Change language?  Make sure we load the new translation file, too.

mythweb/themes/default/settings/session.php

@@ -42 +42 @@
     <td class="command_border_b" align="right"><?php echo t('Show descriptions on new line') ?>:</td>
     <td class="command_border_b"><input class="radio" type="checkbox" title="Nice for very long descriptions on the recorded screen." name="recorded_descunder"<?php if ($_SESSION['recorded_descunder']) echo ' CHECKED' ?>></td>
 </tr><tr>
+    <td class="command_border_b" align="right"><?php echo t('Show LiveTV recordings under All recordings category') ?>:</td>
+    <td class="command_border_b"><input class="radio" type="checkbox" title="Show LiveTV recordings" name="recorded_hidelivetv"<?php if ($_SESSION['recorded_hidelivetv']) echo ' CHECKED' ?>></td>
+</tr><tr>
     <td colspan="2"><?php echo t('Guide Settings') ?>:</td>
 </tr><tr>
     <td class="command_border_b" align="right"><?php echo t('Only display favourite channels') ?>:</td>

mythweb/themes/default/tv/recorded.php

@@ -162 +162 @@
         ?>
     </select></td>
 <?php
-if (count($Groups) > 1) { ?>
+if ((count($Groups) > 1) || $_SESSION['recorded_hidelivetv']) { ?>
     <td><?php echo t('Show group') ?>:</td>
     <td><select name="recgroup" onchange="get_element('program_titles').submit()">
         <option value=""><?php echo t('All recordings') ?></option><?php
@@ -220 +220 @@
     $prev_group = '';
     $cur_group  = '';
 
-    foreach ($All_Shows as $show) {
-
-    // Print a dividing row if grouping changes
-        switch ($group_field) {
+    foreach ($All_Shows as $show)
+    {
+                if (($_GET['recgroup'] == "") && ($_GET['title'] == "") && ($_SESSION['recorded_hidelivetv']) && ($show->recgroup == "LiveTV"))
+                {
+                        continue;
+                }
+        // Print a dividing row if grouping changes
+        switch ($group_field)
+        {
             case 'airdate':
                 $cur_group = strftime($_SESSION['date_listing_jump'], $show->starttime);
                 break;
@@ -317 +327 @@
         $row_section[$row] = $section;
     // Increment row last
         $row++;
+        }
     }
+
 ?>
 
 </table>