Ticket #2281: commfree.diff

File commfree.diff, 8.3 KB (added by ryan.buschert@…, 18 years ago)
Line 
1diff -ur mythplugins_old/mythweb/modules/_shared/lang/Czech.lang mythplugins/mythweb/modules/_shared/lang/Czech.lang
2--- mythplugins_old/mythweb/modules/_shared/lang/Czech.lang     2006-08-30 14:10:57.000000000 -0700
3+++ mythplugins/mythweb/modules/_shared/lang/Czech.lang 2006-08-30 14:29:43.000000000 -0700
4@@ -294,6 +294,7 @@
5 "Number of shows"
6 "Number of timeslots"
7 "Only display favourite channels"
8+"Only match commercial-free channels"
9 "Only match HD programs"
10 "Only New Episodes"
11     Jen nové díly
12diff -ur mythplugins_old/mythweb/modules/_shared/lang/Danish.lang mythplugins/mythweb/modules/_shared/lang/Danish.lang
13--- mythplugins_old/mythweb/modules/_shared/lang/Danish.lang    2006-08-30 14:10:57.000000000 -0700
14+++ mythplugins/mythweb/modules/_shared/lang/Danish.lang        2006-08-30 14:29:43.000000000 -0700
15@@ -370,6 +370,7 @@
16 "Number of timeslots"
17 "Only display favourite channels"
18     Vis kun favorit kanaler
19+"Only match commercial-free channels"
20 "Only match HD programs"
21 "Only New Episodes"
22     Kun Nye Afsnit
23diff -ur mythplugins_old/mythweb/modules/_shared/lang/Dutch.lang mythplugins/mythweb/modules/_shared/lang/Dutch.lang
24--- mythplugins_old/mythweb/modules/_shared/lang/Dutch.lang     2006-08-30 14:10:57.000000000 -0700
25+++ mythplugins/mythweb/modules/_shared/lang/Dutch.lang 2006-08-30 14:29:43.000000000 -0700
26@@ -423,6 +423,7 @@
27 "Number of timeslots"
28 "Only display favourite channels"
29     Enkel favoriete zenders laten zien
30+"Only match commercial-free channels"
31 "Only match HD programs"
32 "Only New Episodes"
33     Enkel Nieuwe Afleveringen
34diff -ur mythplugins_old/mythweb/modules/_shared/lang/English_GB.lang mythplugins/mythweb/modules/_shared/lang/English_GB.lang
35--- mythplugins_old/mythweb/modules/_shared/lang/English_GB.lang        2006-08-30 14:10:57.000000000 -0700
36+++ mythplugins/mythweb/modules/_shared/lang/English_GB.lang    2006-08-30 14:29:43.000000000 -0700
37@@ -247,6 +247,7 @@
38 "Number of shows"
39 "Number of timeslots"
40 "Only display favourite channels"
41+"Only match commercial-free channels"
42 "Only match HD programs"
43     Only match HD programmes
44 "Only New Episodes"
45diff -ur mythplugins_old/mythweb/modules/_shared/lang/English.lang mythplugins/mythweb/modules/_shared/lang/English.lang
46--- mythplugins_old/mythweb/modules/_shared/lang/English.lang   2006-08-30 14:10:57.000000000 -0700
47+++ mythplugins/mythweb/modules/_shared/lang/English.lang       2006-08-30 14:29:43.000000000 -0700
48@@ -236,6 +236,7 @@
49 "Number of shows"
50 "Number of timeslots"
51 "Only display favourite channels"
52+"Only match commercial-free channels"
53 "Only match HD programs"
54 "Only New Episodes"
55 "or"
56diff -ur mythplugins_old/mythweb/modules/_shared/lang/Finnish.lang mythplugins/mythweb/modules/_shared/lang/Finnish.lang
57--- mythplugins_old/mythweb/modules/_shared/lang/Finnish.lang   2006-08-30 14:10:57.000000000 -0700
58+++ mythplugins/mythweb/modules/_shared/lang/Finnish.lang       2006-08-30 14:29:43.000000000 -0700
59@@ -408,6 +408,7 @@
60 "Number of timeslots"
61 "Only display favourite channels"
62     Vain Suosikkikanavat
63+"Only match commercial-free channels"
64 "Only match HD programs"
65 "Only New Episodes"
66     Vain Uudet Jaksot
67diff -ur mythplugins_old/mythweb/modules/_shared/lang/French.lang mythplugins/mythweb/modules/_shared/lang/French.lang
68--- mythplugins_old/mythweb/modules/_shared/lang/French.lang    2006-08-30 14:10:57.000000000 -0700
69+++ mythplugins/mythweb/modules/_shared/lang/French.lang        2006-08-30 14:29:43.000000000 -0700
70@@ -344,6 +344,7 @@
71 "Number of timeslots"
72 "Only display favourite channels"
73     Afficher seulement vos chaînes favorites
74+"Only match commercial-free channels"
75 "Only match HD programs"
76 "Only New Episodes"
77     Seulement les nouveaux épisodes
78diff -ur mythplugins_old/mythweb/modules/_shared/lang/German.lang mythplugins/mythweb/modules/_shared/lang/German.lang
79--- mythplugins_old/mythweb/modules/_shared/lang/German.lang    2006-08-30 14:10:57.000000000 -0700
80+++ mythplugins/mythweb/modules/_shared/lang/German.lang        2006-08-30 14:29:43.000000000 -0700
81@@ -421,6 +421,7 @@
82 "Number of timeslots"
83 "Only display favourite channels"
84     Nur Favoriten anzeigen
85+"Only match commercial-free channels"
86 "Only match HD programs"
87 "Only New Episodes"
88     Nur neue Folgen
89diff -ur mythplugins_old/mythweb/modules/_shared/lang/Japanese.lang mythplugins/mythweb/modules/_shared/lang/Japanese.lang
90--- mythplugins_old/mythweb/modules/_shared/lang/Japanese.lang  2006-08-30 14:10:57.000000000 -0700
91+++ mythplugins/mythweb/modules/_shared/lang/Japanese.lang      2006-08-30 14:29:43.000000000 -0700
92@@ -392,6 +392,7 @@
93 "Number of timeslots"
94 "Only display favourite channels"
95     ãŠæ°—に入りのチャンネルのみ衚瀺する
96+"Only match commercial-free channels"
97 "Only match HD programs"
98 "Only New Episodes"
99     æ–°ã—い番組のみ
100diff -ur mythplugins_old/mythweb/modules/_shared/lang/Slovenian.lang mythplugins/mythweb/modules/_shared/lang/Slovenian.lang
101--- mythplugins_old/mythweb/modules/_shared/lang/Slovenian.lang 2006-08-30 14:10:57.000000000 -0700
102+++ mythplugins/mythweb/modules/_shared/lang/Slovenian.lang     2006-08-30 14:29:43.000000000 -0700
103@@ -338,6 +338,7 @@
104 "Number of timeslots"
105 "Only display favourite channels"
106     PrikaÅŸi samo priljubljene kanale
107+"Only match commercial-free channels"
108 "Only match HD programs"
109 "Only New Episodes"
110     Samo eno oddajo
111diff -ur mythplugins_old/mythweb/modules/_shared/lang/Spanish.lang mythplugins/mythweb/modules/_shared/lang/Spanish.lang
112--- mythplugins_old/mythweb/modules/_shared/lang/Spanish.lang   2006-08-30 14:10:57.000000000 -0700
113+++ mythplugins/mythweb/modules/_shared/lang/Spanish.lang       2006-08-30 14:29:43.000000000 -0700
114@@ -461,6 +461,7 @@
115     Número de bloques horarios
116 "Only display favourite channels"
117     Mostrar sólo canales favoritos
118+"Only match commercial-free channels"
119 "Only match HD programs"
120     Sólo programas HD
121 "Only New Episodes"
122diff -ur mythplugins_old/mythweb/modules/_shared/lang/Swedish.lang mythplugins/mythweb/modules/_shared/lang/Swedish.lang
123--- mythplugins_old/mythweb/modules/_shared/lang/Swedish.lang   2006-08-30 14:10:57.000000000 -0700
124+++ mythplugins/mythweb/modules/_shared/lang/Swedish.lang       2006-08-30 14:29:43.000000000 -0700
125@@ -424,6 +424,7 @@
126 "Number of timeslots"
127 "Only display favourite channels"
128     Visa endast favoritkanaler
129+"Only match commercial-free channels"
130 "Only match HD programs"
131 "Only New Episodes"
132     Endast nya avsnitt
133diff -ur mythplugins_old/mythweb/modules/tv/search.php mythplugins/mythweb/modules/tv/search.php
134--- mythplugins_old/mythweb/modules/tv/search.php       2006-08-30 14:10:57.000000000 -0700
135+++ mythplugins/mythweb/modules/tv/search.php   2006-08-30 14:18:53.000000000 -0700
136@@ -54,6 +54,7 @@
137         $_SESSION['search']['stars_gt']      = floatVal($_REQUEST['stars_gt']);
138         $_SESSION['search']['stars_lt']      = floatVal($_REQUEST['stars_lt']);
139         $_SESSION['search']['hd']            = $_REQUEST['hd'] ? true : false;
140+        $_SESSION['search']['commfree']            = $_REQUEST['commfree'] ? true : false;
141         $_SESSION['search']['airdate_start'] = trim($_REQUEST['airdate_start']);
142         $_SESSION['search']['airdate_end']   = trim($_REQUEST['airdate_end']);
143         $_SESSION['search']['starttime']     = trim($_REQUEST['starttime']);
144@@ -204,6 +205,9 @@
145         // HDTV only?
146             if ($_SESSION['search']['hd'])
147                 $extra_query[] = 'program.hdtv=1';
148+        // Commercial-free channels only?
149+            if ($_SESSION['search']['commfree'])
150+                $extra_query[] = 'channel.commfree=1';
151         // Build the actual search query
152             $query = '';
153             foreach ($_SESSION['search']['as'] as $i => $string) {
154diff -ur mythplugins_old/mythweb/modules/tv/tmpl/default/search.php mythplugins/mythweb/modules/tv/tmpl/default/search.php
155--- mythplugins_old/mythweb/modules/tv/tmpl/default/search.php  2006-08-30 14:10:57.000000000 -0700
156+++ mythplugins/mythweb/modules/tv/tmpl/default/search.php      2006-08-30 14:18:29.000000000 -0700
157@@ -59,6 +59,10 @@
158         <input type="checkbox" name="hd" id="hd" value="1"<?php
159             if ($_SESSION['search']['hd']) echo ' CHECKED' ?>>
160         <label for="hd"><?php echo t('Only match HD programs') ?></label>
161+        <p>
162+        <input type="checkbox" name="commfree" id="commfree" value="1"<?php
163+            if ($_SESSION['search']['commfree']) echo ' CHECKED' ?>>
164+        <label for="commfree"><?php echo t('Only match commercial-free channels') ?></label>
165         </p>
166         <p>
167         Showings between:<br />