Ticket #1252: mythweb.nodups.diff

mythweb/themes/default/header.php

@@ -132 +132 @@
                             <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>
+                            <input type="checkbox" class="radio" id="fold_dups" name="fold_dups" value="1"<?php echo $_SESSION['search']['fold_dups'] ? ' CHECKED' : '' ?>>
+                            <a onclick="get_element('fold_dups').checked=get_element('fold_dups').checked ? false : true;"><?php echo t('Fold Showings') ?></a>
                         </div>
                     </div>
 

mythweb/modules/tv/search.php

@@ -51 +51 @@
         $_SESSION['search']['search_exact'] = _or($_GET['search_exact'], $_POST['search_exact']);
     if ($_GET['search_hd'] || $_POST['search_hd'])
         $_SESSION['search']['search_hd'] = _or($_GET['search_hd'], $_POST['search_hd']);
+    if ($_GET['fold_dups'] || $_POST['fold_dups'])
+        $_SESSION['search']['fold_dups'] = _or($_GET['fold_dups'], $_POST['fold_dups']);
 
-// Flags that apply in all cases
-    $nodups = _or($_GET['nodups'], $_POST['nodups']);
-
 // Start the query
     $search_name = '';
     $query       = array();
@@ -76 +75 @@
     // Find the query
         if ($Canned_Searches[$search_name]) {
             $query = array($Canned_Searches[$search_name]);
-        // default nodups on here, unless explicitly set
-            if (!empty($nodups))
-                $nodups = true;
         }
         else
             add_warning("Unknown canned query: $search_name");
@@ -176 +172 @@
         }
 
     // Remove dups from the results if requested
-        if ($nodups) {
+        if ($_SESSION['search']['fold_dups']) {
             $seen = array();        // program ids already seen
             foreach( $Results as $dex => $row ) {
                 $uniquer = $row->programid . $row->channel->channum;