Fixes #5195, this removes all uses of channel.commfree and replaces them with channel.commmethod, including searches.

git-svn-id: http://svn.mythtv.org/svn/trunk@17424 7dbf422c-18fa-0310-86e9-fd20926502f2

Author: kormoc

modules/tv/search.php

@@ -207,7 +207,7 @@
                 $extra_query[] = 'program.hdtv & 1';
         // Commercial-free channels only?
             if ($_SESSION['search']['commfree'])
-                $extra_query[] = 'channel.commfree=1';
+                $extra_query[] = 'channel.commmethod=-2';
         // Build the actual search query
             $query = '';
             foreach ($_SESSION['search']['as'] as $i => $string) {

modules/tv/set_channels.php

@@ -36,7 +36,7 @@
                                              colour        = ?,
                                              hue           = ?,
                                              recpriority   = ?,
-                                             commfree      = ?,
+                                             commmethod    = ?,
                                              useonairguide = ?,
                                              visible       = ?';
                 $query_params[] = $_POST['xmltvid_'.$chanid];
@@ -48,7 +48,7 @@
                 $query_params[] = $_POST['colour_'.$chanid];
                 $query_params[] = $_POST['hue_'.$chanid];
                 $query_params[] = $_POST['recpriority_'.$chanid];
-                $query_params[] = empty($_POST['commfree_'.$chanid])      ? 0 : 1;
+                $query_params[] = empty($_POST['commfree_'.$chanid])      ? -1 : -2;
                 $query_params[] = empty($_POST['useonairguide_'.$chanid]) ? 0 : 1;
                 $query_params[] = empty($_POST['visible_'.$chanid])       ? 0 : 1;
             // next, the fields that need to have a value, so we won't change them if they were emptied

modules/tv/tmpl/default/set_channels.php

@@ -51,7 +51,7 @@
     <td><input type="text" size="5"  name="colour_<?php       echo $channel['chanid'] ?>" id="colour_<?php       echo $channel['chanid'] ?>" value="<?php echo html_entities($channel['colour'])       ?>" style="text-align: center" /></td>
     <td><input type="text" size="5"  name="hue_<?php          echo $channel['chanid'] ?>" id="hue_<?php          echo $channel['chanid'] ?>" value="<?php echo html_entities($channel['hue'])          ?>" style="text-align: center" /></td>
     <td><input type="text" size="2"  name="recpriority_<?php  echo $channel['chanid'] ?>" id="recpriority_<?php  echo $channel['chanid'] ?>" value="<?php echo html_entities($channel['recpriority'])  ?>" style="text-align: center" /></td>
-    <td><input type="checkbox" name="commfree_<?php           echo $channel['chanid'] ?>" value="1"<?php if (!empty($channel['commfree']))      echo ' CHECKED' ?> /></td>
+    <td><input type="checkbox" name="commfree_<?php           echo $channel['chanid'] ?>" value="1"<?php if (!empty($channel['commmethod']) && $channel['commmethod'] == -2)      echo ' CHECKED' ?> /></td>
     <td><input type="checkbox" name="visible_<?php            echo $channel['chanid'] ?>" value="1"<?php if (!empty($channel['visible']))       echo ' CHECKED' ?> /></td>
     <td><input type="checkbox" name="useonairguide_<?php      echo $channel['chanid'] ?>" value="1"<?php if (!empty($channel['useonairguide'])) echo ' CHECKED' ?> /></td>
 </tr><?php