diff -ur mythplugins_old/mythweb/modules/_shared/lang/Czech.lang mythplugins/mythweb/modules/_shared/lang/Czech.lang
--- mythplugins_old/mythweb/modules/_shared/lang/Czech.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/Czech.lang	2006-08-30 14:29:43.000000000 -0700
@@ -294,6 +294,7 @@
 "Number of shows"
 "Number of timeslots"
 "Only display favourite channels"
+"Only match commercial-free channels"
 "Only match HD programs"
 "Only New Episodes"
     Jen nové díly
diff -ur mythplugins_old/mythweb/modules/_shared/lang/Danish.lang mythplugins/mythweb/modules/_shared/lang/Danish.lang
--- mythplugins_old/mythweb/modules/_shared/lang/Danish.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/Danish.lang	2006-08-30 14:29:43.000000000 -0700
@@ -370,6 +370,7 @@
 "Number of timeslots"
 "Only display favourite channels"
     Vis kun favorit kanaler
+"Only match commercial-free channels"
 "Only match HD programs"
 "Only New Episodes"
     Kun Nye Afsnit
diff -ur mythplugins_old/mythweb/modules/_shared/lang/Dutch.lang mythplugins/mythweb/modules/_shared/lang/Dutch.lang
--- mythplugins_old/mythweb/modules/_shared/lang/Dutch.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/Dutch.lang	2006-08-30 14:29:43.000000000 -0700
@@ -423,6 +423,7 @@
 "Number of timeslots"
 "Only display favourite channels"
     Enkel favoriete zenders laten zien
+"Only match commercial-free channels"
 "Only match HD programs"
 "Only New Episodes"
     Enkel Nieuwe Afleveringen
diff -ur mythplugins_old/mythweb/modules/_shared/lang/English_GB.lang mythplugins/mythweb/modules/_shared/lang/English_GB.lang
--- mythplugins_old/mythweb/modules/_shared/lang/English_GB.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/English_GB.lang	2006-08-30 14:29:43.000000000 -0700
@@ -247,6 +247,7 @@
 "Number of shows"
 "Number of timeslots"
 "Only display favourite channels"
+"Only match commercial-free channels"
 "Only match HD programs"
     Only match HD programmes
 "Only New Episodes"
diff -ur mythplugins_old/mythweb/modules/_shared/lang/English.lang mythplugins/mythweb/modules/_shared/lang/English.lang
--- mythplugins_old/mythweb/modules/_shared/lang/English.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/English.lang	2006-08-30 14:29:43.000000000 -0700
@@ -236,6 +236,7 @@
 "Number of shows"
 "Number of timeslots"
 "Only display favourite channels"
+"Only match commercial-free channels"
 "Only match HD programs"
 "Only New Episodes"
 "or"
diff -ur mythplugins_old/mythweb/modules/_shared/lang/Finnish.lang mythplugins/mythweb/modules/_shared/lang/Finnish.lang
--- mythplugins_old/mythweb/modules/_shared/lang/Finnish.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/Finnish.lang	2006-08-30 14:29:43.000000000 -0700
@@ -408,6 +408,7 @@
 "Number of timeslots"
 "Only display favourite channels"
     Vain Suosikkikanavat
+"Only match commercial-free channels"
 "Only match HD programs"
 "Only New Episodes"
     Vain Uudet Jaksot
diff -ur mythplugins_old/mythweb/modules/_shared/lang/French.lang mythplugins/mythweb/modules/_shared/lang/French.lang
--- mythplugins_old/mythweb/modules/_shared/lang/French.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/French.lang	2006-08-30 14:29:43.000000000 -0700
@@ -344,6 +344,7 @@
 "Number of timeslots"
 "Only display favourite channels"
     Afficher seulement vos cha�nes favorites
+"Only match commercial-free channels"
 "Only match HD programs"
 "Only New Episodes"
     Seulement les nouveaux &eacute;pisodes
diff -ur mythplugins_old/mythweb/modules/_shared/lang/German.lang mythplugins/mythweb/modules/_shared/lang/German.lang
--- mythplugins_old/mythweb/modules/_shared/lang/German.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/German.lang	2006-08-30 14:29:43.000000000 -0700
@@ -421,6 +421,7 @@
 "Number of timeslots"
 "Only display favourite channels"
     Nur Favoriten anzeigen
+"Only match commercial-free channels"
 "Only match HD programs"
 "Only New Episodes"
     Nur neue Folgen
diff -ur mythplugins_old/mythweb/modules/_shared/lang/Japanese.lang mythplugins/mythweb/modules/_shared/lang/Japanese.lang
--- mythplugins_old/mythweb/modules/_shared/lang/Japanese.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/Japanese.lang	2006-08-30 14:29:43.000000000 -0700
@@ -392,6 +392,7 @@
 "Number of timeslots"
 "Only display favourite channels"
     お気に入りのチャンネルのみ表示する
+"Only match commercial-free channels"
 "Only match HD programs"
 "Only New Episodes"
     新しい番組のみ
diff -ur mythplugins_old/mythweb/modules/_shared/lang/Slovenian.lang mythplugins/mythweb/modules/_shared/lang/Slovenian.lang
--- mythplugins_old/mythweb/modules/_shared/lang/Slovenian.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/Slovenian.lang	2006-08-30 14:29:43.000000000 -0700
@@ -338,6 +338,7 @@
 "Number of timeslots"
 "Only display favourite channels"
     Prikaži samo priljubljene kanale
+"Only match commercial-free channels"
 "Only match HD programs"
 "Only New Episodes"
     Samo eno oddajo
diff -ur mythplugins_old/mythweb/modules/_shared/lang/Spanish.lang mythplugins/mythweb/modules/_shared/lang/Spanish.lang
--- mythplugins_old/mythweb/modules/_shared/lang/Spanish.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/Spanish.lang	2006-08-30 14:29:43.000000000 -0700
@@ -461,6 +461,7 @@
     Número de bloques horarios
 "Only display favourite channels"
     Mostrar sólo canales favoritos
+"Only match commercial-free channels"
 "Only match HD programs"
     Sólo programas HD
 "Only New Episodes"
diff -ur mythplugins_old/mythweb/modules/_shared/lang/Swedish.lang mythplugins/mythweb/modules/_shared/lang/Swedish.lang
--- mythplugins_old/mythweb/modules/_shared/lang/Swedish.lang	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/_shared/lang/Swedish.lang	2006-08-30 14:29:43.000000000 -0700
@@ -424,6 +424,7 @@
 "Number of timeslots"
 "Only display favourite channels"
     Visa endast favoritkanaler
+"Only match commercial-free channels"
 "Only match HD programs"
 "Only New Episodes"
     Endast nya avsnitt
diff -ur mythplugins_old/mythweb/modules/tv/search.php mythplugins/mythweb/modules/tv/search.php
--- mythplugins_old/mythweb/modules/tv/search.php	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/tv/search.php	2006-08-30 14:18:53.000000000 -0700
@@ -54,6 +54,7 @@
         $_SESSION['search']['stars_gt']      = floatVal($_REQUEST['stars_gt']);
         $_SESSION['search']['stars_lt']      = floatVal($_REQUEST['stars_lt']);
         $_SESSION['search']['hd']            = $_REQUEST['hd'] ? true : false;
+        $_SESSION['search']['commfree']            = $_REQUEST['commfree'] ? true : false;
         $_SESSION['search']['airdate_start'] = trim($_REQUEST['airdate_start']);
         $_SESSION['search']['airdate_end']   = trim($_REQUEST['airdate_end']);
         $_SESSION['search']['starttime']     = trim($_REQUEST['starttime']);
@@ -204,6 +205,9 @@
         // HDTV only?
             if ($_SESSION['search']['hd'])
                 $extra_query[] = 'program.hdtv=1';
+        // Commercial-free channels only?
+            if ($_SESSION['search']['commfree'])
+                $extra_query[] = 'channel.commfree=1';
         // Build the actual search query
             $query = '';
             foreach ($_SESSION['search']['as'] as $i => $string) {
diff -ur mythplugins_old/mythweb/modules/tv/tmpl/default/search.php mythplugins/mythweb/modules/tv/tmpl/default/search.php
--- mythplugins_old/mythweb/modules/tv/tmpl/default/search.php	2006-08-30 14:10:57.000000000 -0700
+++ mythplugins/mythweb/modules/tv/tmpl/default/search.php	2006-08-30 14:18:29.000000000 -0700
@@ -59,6 +59,10 @@
         <input type="checkbox" name="hd" id="hd" value="1"<?php
             if ($_SESSION['search']['hd']) echo ' CHECKED' ?>>
         <label for="hd"><?php echo t('Only match HD programs') ?></label>
+        <p>
+        <input type="checkbox" name="commfree" id="commfree" value="1"<?php
+            if ($_SESSION['search']['commfree']) echo ' CHECKED' ?>>
+        <label for="commfree"><?php echo t('Only match commercial-free channels') ?></label>
         </p>
         <p>
         Showings between:<br />
