Ticket #1626: playgroup.2.patch

File playgroup.2.patch, 33.9 KB (added by derek@…, 19 years ago)

updated patch; fixes 'delete recording' regression

Line 
1Index: includes/programs.php
2===================================================================
3--- includes/programs.php (revision 10396)
4+++ includes/programs.php (working copy)
5@@ -275,6 +275,7 @@
6 var $is_movie;
7
8 var $timestretch;
9+ var $playgroup;
10
11 var $credits = array();
12
13@@ -321,7 +322,8 @@
14 $this->recpriority = $data[36];
15 $this->airdate = date('Y-m-d', $data[37]);
16 $this->hasairdate = $data[38];
17- $this->timestretch = $data[39];
18+ $this->playgroup = $data[39];
19+ $this->timestretch = ''; # Not printed by ToStringList()
20 $this->recpriority2 = $data[40];
21 // Is this a previously-recorded program?
22 if (!empty($this->filename)) {
23Index: includes/recording_schedules.php
24===================================================================
25--- includes/recording_schedules.php (revision 10396)
26+++ includes/recording_schedules.php (working copy)
27@@ -143,6 +143,7 @@
28 var $findid;
29 var $transcoder;
30 var $parentid;
31+ var $playgroup;
32
33 var $texttype;
34 var $channel;
35@@ -251,7 +252,7 @@
36 // Update the type, in case it changed
37 $this->type = $new_type;
38 // Update the record
39- $result = mysql_query('REPLACE INTO record (recordid,type,chanid,starttime,startdate,endtime,enddate,search,title,subtitle,description,profile,recpriority,category,maxnewest,inactive,maxepisodes,autoexpire,startoffset,endoffset,recgroup,dupmethod,dupin,station,seriesid,programid,autocommflag,findday,findtime,findid,autotranscode,transcoder,parentid,tsdefault,autouserjob1,autouserjob2,autouserjob3,autouserjob4) values ('
40+ $result = mysql_query('REPLACE INTO record (recordid,type,chanid,starttime,startdate,endtime,enddate,search,title,subtitle,description,profile,recpriority,category,maxnewest,inactive,maxepisodes,autoexpire,startoffset,endoffset,recgroup,dupmethod,dupin,station,seriesid,programid,autocommflag,findday,findtime,findid,autotranscode,transcoder,parentid,tsdefault,autouserjob1,autouserjob2,autouserjob3,autouserjob4,playgroup) values ('
41 .escape($this->recordid, true) .','
42 .escape($this->type) .','
43 .escape($this->chanid) .','
44@@ -289,7 +290,8 @@
45 .escape($this->autouserjob1) .','
46 .escape($this->autouserjob2) .','
47 .escape($this->autouserjob3) .','
48- .escape($this->autouserjob4) .')')
49+ .escape($this->autouserjob4) .','
50+ .escape($this->playgroup) .')')
51 or trigger_error('SQL Error: '.mysql_error(), FATAL);
52 // Get the id that was returned
53 $recordid = mysql_insert_id();
54@@ -512,4 +514,31 @@
55 echo '</select>';
56 }
57
58+/**
59+ * prints a <select> of the various playback groups available
60+/**/
61+ function playgroup_select($this_playgroup, $name = 'playgroup', $js = '', $id = '')
62+ {
63+ static $playgroups = array();
64+ if(!sizeof($playgroups))
65+ {
66+ $res = mysql_query('SELECT name FROM playgroup');
67+ while($row = mysql_fetch_row($res))
68+ $playgroups[$row[0]] = $row[0];
69+ mysql_free_result($res);
70+ }
71
72+ echo "<select name=\"$name\"";
73+ if(strlen($js))
74+ echo " onchange=\"$js\" id=\"playgroup_$id\" name=\"playgroup_$id\"";
75+ echo ">\n";
76+ foreach($playgroups as $playgroup)
77+ {
78+ echo "\t<option value=\"" . html_entities($playgroup) . '"';
79+ if($this_playgroup == $playgroup)
80+ echo ' SELECTED';
81+ echo '>' . html_entities($playgroup) . "</option>\n";
82+ }
83+ echo "</select>\n";
84+ return;
85+ }
86Index: includes/css.php
87===================================================================
88--- includes/css.php (revision 10396)
89+++ includes/css.php (working copy)
90@@ -31,14 +31,15 @@
91 // Scan the $Categories hash for any matches
92 else {
93 global $Categories;
94- foreach ($Categories as $cat => $details) {
95- if (!$details[1])
96- continue;
97- if (preg_match('/'.$details[1].'/', $category)) {
98- $class[] = $cache[$category] = 'cat_'.$cat;
99- break;
100+ if(is_array($Categories))
101+ foreach ($Categories as $cat => $details) {
102+ if (!$details[1])
103+ continue;
104+ if (preg_match('/'.$details[1].'/', $category)) {
105+ $class[] = $cache[$category] = 'cat_'.$cat;
106+ break;
107+ }
108 }
109- }
110 }
111 // No category found?
112 if (!$cache[$category])
113Index: modules/settings/playgroup.php
114===================================================================
115--- modules/settings/playgroup.php (revision 0)
116+++ modules/settings/playgroup.php (revision 0)
117@@ -0,0 +1,43 @@
118+<?php
119+/**
120+ * Configure MythTV playback groups
121+ *
122+ * @url $URL$
123+ * @date $Date$
124+ * @version $Revision$
125+ * @author $Author$
126+ * @license GPL
127+ *
128+ * @package MythWeb
129+ * @subpackage Settings
130+ *
131+/**/
132+// We need the list of available playgroups
133+ require_once 'includes/recording_schedules.php';
134+
135+// Load a playgroup to edit
136+ $row = array();
137+ if(isset($_GET['playgroup'])) {
138+ $sh = $db->query('SELECT * FROM playgroup WHERE name = ?', $_GET['playgroup']);
139+ if($sh->num_rows() == 1)
140+ $row = $sh->fetch_assoc();
141+ }
142+ $name = isset($row['name']) ? $row['name'] : '';
143+ $titlematch = isset($row['titlematch']) ? $row['titlematch'] : '';
144+ $skipahead = isset($row['skipahead']) ? $row['skipahead'] : '';
145+ $skipback = isset($row['skipback']) ? $row['skipback'] : '';
146+ $timestretch = isset($row['timestretch']) ? $row['timestretch'] : '';
147+ $jump = isset($row['jump']) ? $row['jump'] : '';
148+
149+// Save changes
150+ if(isset($_POST['save']))
151+ $db->query('REPLACE INTO playgroup (name, titlematch, skipahead, skipback, timestretch, jump) VALUES (?, ?, ?, ?, ?, ?)', $_POST['name'], $_POST['titlematch'], $_POST['skipahead'], $_POST['skipback'], $_POST['timestretch'], $_POST['jump']);
152+
153+// Delete group
154+ if(isset($_POST['delete']))
155+ $db->query('DELETE FROM playgroup WHERE name = ?', $_POST['name']);
156+
157+// Load the class for this page
158+ require_once tmpl_dir.'playgroup.php';
159+
160+ exit(0);
161Index: modules/settings/init.php
162===================================================================
163--- modules/settings/init.php (revision 10396)
164+++ modules/settings/init.php (working copy)
165@@ -23,5 +23,6 @@
166 'channels' => t('MythTV channel info'),
167 'keys' => t('MythTV key bindings'),
168 'settings' => t('MythTV settings table'),
169+ 'playgroup' => t('MythTV playback group editor')
170 ),
171 );
172Index: modules/settings/tmpl/default/playgroup.php
173===================================================================
174--- modules/settings/tmpl/default/playgroup.php (revision 0)
175+++ modules/settings/tmpl/default/playgroup.php (revision 0)
176@@ -0,0 +1,73 @@
177+<?php
178+/**
179+ * Configure MythTV playback groups
180+ *
181+ * @url $URL$
182+ * @date $Date$
183+ * @version $Revision$
184+ * @author $Author$
185+ * @license GPL
186+ *
187+ * @package MythWeb
188+ * @subpackage Settings
189+ *
190+/**/
191+
192+
193+// Set the desired page title
194+ $page_title = 'MythWeb - '.t('Playback Group Editor');
195+
196+// Print the page header
197+ require 'modules/_shared/tmpl/'.tmpl.'/header.php';
198+
199+?>
200+<table align="center" width="40%" cellspacing="2" cellpadding="2">
201+<tr>
202+ <td width="50%" class="command command_border_l command_border_t command_border_b command_border_r" align="center">
203+ <form class="form" method="get" action="<?php echo root ?>settings/playgroup">
204+ <table width="100%" border="0" cellspacing="0" cellpadding="2">
205+ <tr>
206+ <td nowrap align="center"><?php echo t('Edit existing group') ?>:&nbsp;&nbsp;</td>
207+ <td><?php playgroup_select(NULL); ?></td>
208+ <td align="center"><input type="submit" class="submit" value="<?php echo t('Load Group') ?>"></td>
209+ </tr>
210+ </table>
211+ </form>
212+ </td>
213+</tr>
214+</table>
215+
216+<form class="form" method="post" action="<?php echo root ?>settings/playgroup">
217+
218+<table border="0" cellpadding="4" cellspacing="2" class="list small" align="center">
219+<tr class="menu large" align="center">
220+ <td colspan="6"><?php echo t('Playback Group Editor') ?></td>
221+</tr><tr class="menu" align="center">
222+ <td><?php echo t('Name') ?></td>
223+ <td><?php echo t('Title Match') ?></td>
224+ <td><?php echo t('Skip Ahead') ?></td>
225+ <td><?php echo t('Skip Back') ?></td>
226+ <td><?php echo t('Time Stretch') ?></td>
227+ <td><?php echo t('Jump') ?></td>
228+</tr>
229+<tr class="menu">
230+ <td><input type="text" name="name" value="<?php echo $name ?>" /></td>
231+ <td><input type="text" name="titlematch" value="<?php echo $titlematch ?>" /></td>
232+ <td><input type="text" name="skipahead" value="<?php echo $skipahead ?>" /></td>
233+ <td><input type="text" name="skipback" value="<?php echo $skipback ?>" /></td>
234+ <td><input type="text" name="timestretch" value="<?php echo $timestretch ?>" /></td>
235+ <td><input type="text" name="jump" value="<?php echo $jump ?>" /></td>
236+</tr>
237+</table>
238+
239+<p align="center">
240+<input type="submit" name="save" value="<?php echo t('Save') ?>">
241+<input type="submit" name="delete" value="<?php echo t('Delete') ?>">
242+</p>
243+
244+</form>
245+<?php
246+
247+// Print the page footer
248+ require 'modules/_shared/tmpl/'.tmpl.'/footer.php';
249+
250Index: modules/_shared/lang/English_GB.lang
251===================================================================
252--- modules/_shared/lang/English_GB.lang (revision 10396)
253+++ modules/_shared/lang/English_GB.lang (working copy)
254@@ -106,6 +106,7 @@
255 "Duplicates"
256 "Duration"
257 "Edit"
258+"Edit existing group"
259 "Edit keybindings on"
260 "Edit MythWeb and some MythTV settings."
261 "Edit settings for"
262@@ -182,6 +183,7 @@
263 "Listing &quot;Jump to&quot;"
264 "Listing Time Key"
265 "Listings"
266+"Load Group"
267 "Logs"
268 "Low"
269 "Manual"
270@@ -202,6 +204,7 @@
271 "MythTV channel info"
272 "MythTV global defaults"
273 "MythTV key bindings"
274+"MythTV playback group editor"
275 "MythTV settings table"
276 "MythTV Status"
277 "MythVideo Artwork Dir"
278@@ -244,6 +247,8 @@
279 "Past Year"
280 "People"
281 "People Search"
282+"Playback Group"
283+"Playback Group Editor"
284 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
285 "Please search for something."
286 "plot"
287@@ -414,6 +419,8 @@
288 "Showing all programs."
289 Showing all programmes.
290 "SI Units?"
291+"Skip Ahead"
292+"Skip Back"
293 "sourceid"
294 "Special Searches"
295 "Star character"
296@@ -434,10 +441,12 @@
297 "The requested recording schedule has been deleted."
298 "Thursday"
299 "Time"
300+"Time Stretch"
301 "Time Stretch Default"
302 "Timeslot size"
303 "title"
304 "Title"
305+"Title Match"
306 "Title Search"
307 "Today"
308 "Tomorrow"
309Index: modules/_shared/lang/Spanish.lang
310===================================================================
311--- modules/_shared/lang/Spanish.lang (revision 10396)
312+++ modules/_shared/lang/Spanish.lang (working copy)
313@@ -198,6 +198,7 @@
314 Duración
315 "Edit"
316 Editar
317+"Edit existing group"
318 "Edit keybindings on"
319 Editar Teclas en
320 "Edit MythWeb and some MythTV settings."
321@@ -332,6 +333,7 @@
322 Hora Listado
323 "Listings"
324 Listados
325+"Load Group"
326 "Logs"
327 "Low"
328 Bajo
329@@ -360,6 +362,7 @@
330 "MythTV global defaults"
331 "MythTV key bindings"
332 Vínculos Teclas MythTV
333+"MythTV playback group editor"
334 "MythTV settings table"
335 "MythTV Status"
336 Estado MythTV
337@@ -427,6 +430,8 @@
338 Gente
339 "People Search"
340 Búsqueda gente
341+"Playback Group"
342+"Playback Group Editor"
343 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
344 Tenga cuidado al alterar esta tabla sin saber lo que hace, puede romper el funcionamiento de MythTV
345 "Please search for something."
346@@ -654,6 +659,8 @@
347 Mostrando todos los programas
348 "SI Units?"
349 ¿Unidades SI?
350+"Skip Ahead"
351+"Skip Back"
352 "sourceid"
353 id fuente
354 "Special Searches"
355@@ -692,6 +699,7 @@
356 Jueves
357 "Time"
358 Hora
359+"Time Stretch"
360 "Time Stretch Default"
361 Ajuste de tiempo por defecto
362 "Timeslot size"
363@@ -699,6 +707,7 @@
364 título
365 "Title"
366 Título
367+"Title Match"
368 "Title Search"
369 Buscar título
370 "Today"
371Index: modules/_shared/lang/French.lang
372===================================================================
373--- modules/_shared/lang/French.lang (revision 10396)
374+++ modules/_shared/lang/French.lang (working copy)
375@@ -161,6 +161,7 @@
376 Doublonner
377 "Duration"
378 "Edit"
379+"Edit existing group"
380 "Edit keybindings on"
381 Editer les touches sur
382 "Edit MythWeb and some MythTV settings."
383@@ -275,6 +276,7 @@
384 Lister Touches de temps
385 "Listings"
386 Liste
387+"Load Group"
388 "Logs"
389 "Low"
390 faible
391@@ -295,6 +297,7 @@
392 "MythTV channel info"
393 "MythTV global defaults"
394 "MythTV key bindings"
395+"MythTV playback group editor"
396 "MythTV settings table"
397 "MythTV Status"
398 "MythVideo Artwork Dir"
399@@ -347,6 +350,8 @@
400 "Past Year"
401 "People"
402 "People Search"
403+"Playback Group"
404+"Playback Group Editor"
405 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
406 Nous vous pr&eacute;venons que modifier les touches sans savoir ce que vous fa&icirc;tes peut s&eacute;rieusement endomager le fonctionnement de MythTV
407 "Please search for something."
408@@ -552,6 +557,8 @@
409 "Showing all programs."
410 "SI Units?"
411 Unités métriques?
412+"Skip Ahead"
413+"Skip Back"
414 "sourceid"
415 "Special Searches"
416 "Star character"
417@@ -584,12 +591,14 @@
418 Jeudi
419 "Time"
420 Heure
421+"Time Stretch"
422 "Time Stretch Default"
423 "Timeslot size"
424 "title"
425 Titre
426 "Title"
427 Titre
428+"Title Match"
429 "Title Search"
430 "Today"
431 Aujourd&acute;hui
432Index: modules/_shared/lang/Swedish.lang
433===================================================================
434--- modules/_shared/lang/Swedish.lang (revision 10396)
435+++ modules/_shared/lang/Swedish.lang (working copy)
436@@ -200,6 +200,7 @@
437 LÀngd
438 "Edit"
439 Redigera
440+"Edit existing group"
441 "Edit keybindings on"
442 Editera knappar på
443 "Edit MythWeb and some MythTV settings."
444@@ -335,6 +336,7 @@
445 TV-tablå tid
446 "Listings"
447 TV-tablåer
448+"Load Group"
449 "Logs"
450 Logg
451 "Low"
452@@ -364,6 +366,7 @@
453 "MythTV global defaults"
454 "MythTV key bindings"
455 MythTV tangentbindningar
456+"MythTV playback group editor"
457 "MythTV settings table"
458 "MythTV Status"
459 MythTV-status
460@@ -431,6 +434,8 @@
461 Person
462 "People Search"
463 Sök person
464+"Playback Group"
465+"Playback Group Editor"
466 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
467 OBS! Genom att Àndra dessa instÀllningar utan att veta vad du gör kan du allvarligt störa MythTVs funktionalitet.
468 "Please search for something."
469@@ -658,6 +663,8 @@
470 Visar alla program.
471 "SI Units?"
472 SI-enheter?
473+"Skip Ahead"
474+"Skip Back"
475 "sourceid"
476 kÀll-id
477 "Special Searches"
478@@ -696,6 +703,7 @@
479 Torsdag
480 "Time"
481 Tid
482+"Time Stretch"
483 "Time Stretch Default"
484 Förvalt tempo
485 "Timeslot size"
486@@ -703,6 +711,7 @@
487 titel
488 "Title"
489 Titel
490+"Title Match"
491 "Title Search"
492 Sök titel
493 "Today"
494Index: modules/_shared/lang/Danish.lang
495===================================================================
496--- modules/_shared/lang/Danish.lang (revision 10396)
497+++ modules/_shared/lang/Danish.lang (working copy)
498@@ -179,6 +179,7 @@
499 Varighed
500 "Edit"
501 Ændre
502+"Edit existing group"
503 "Edit keybindings on"
504 Rediger tastaturgenveje for
505 "Edit MythWeb and some MythTV settings."
506@@ -295,6 +296,7 @@
507 Programoversigt tid
508 "Listings"
509 Programoversigt
510+"Load Group"
511 "Logs"
512 "Low"
513 Lav
514@@ -318,6 +320,7 @@
515 "MythTV global defaults"
516 "MythTV key bindings"
517 MythTV taste indstillinger
518+"MythTV playback group editor"
519 "MythTV settings table"
520 "MythTV Status"
521 "MythVideo Artwork Dir"
522@@ -374,6 +377,8 @@
523 "Past Year"
524 "People"
525 "People Search"
526+"Playback Group"
527+"Playback Group Editor"
528 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
529 BemÊrk at ved at Êndre i denne tabel uden at vide hvad du laver, kan du ÞdelÊgge mythtvs funktioner.
530 "Please search for something."
531@@ -589,6 +594,8 @@
532 "Showing all programs."
533 "SI Units?"
534 SI enheder?
535+"Skip Ahead"
536+"Skip Back"
537 "sourceid"
538 "Special Searches"
539 Specielle sÞgninger
540@@ -624,6 +631,7 @@
541 Torsdag
542 "Time"
543 Tidspunkt
544+"Time Stretch"
545 "Time Stretch Default"
546 Standard Afspilnings hastighed
547 "Timeslot size"
548@@ -631,6 +639,7 @@
549 titel
550 "Title"
551 Titel
552+"Title Match"
553 "Title Search"
554 "Today"
555 I dag
556Index: modules/_shared/lang/Dutch.lang
557===================================================================
558--- modules/_shared/lang/Dutch.lang (revision 10396)
559+++ modules/_shared/lang/Dutch.lang (working copy)
560@@ -200,6 +200,7 @@
561 Lengte
562 "Edit"
563 Bewerken
564+"Edit existing group"
565 "Edit keybindings on"
566 Toetsbindingen bewerken op
567 "Edit MythWeb and some MythTV settings."
568@@ -334,6 +335,7 @@
569 Weergave Tijd Gids
570 "Listings"
571 Programmagids
572+"Load Group"
573 "Logs"
574 Logboek
575 "Low"
576@@ -363,6 +365,7 @@
577 "MythTV global defaults"
578 "MythTV key bindings"
579 MythTV toetsbindingen
580+"MythTV playback group editor"
581 "MythTV settings table"
582 "MythTV Status"
583 MythTV status
584@@ -430,6 +433,8 @@
585 Personen
586 "People Search"
587 Personen zoeken
588+"Playback Group"
589+"Playback Group Editor"
590 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
591 Waarschuwing! Als u niet weet wat u doet, kan het veranderen van deze tabel de werking van MythTV ernstig verstoren.
592 "Please search for something."
593@@ -656,6 +661,8 @@
594 Alle programma's laten zien
595 "SI Units?"
596 SI eenheden?
597+"Skip Ahead"
598+"Skip Back"
599 "sourceid"
600 bron
601 "Special Searches"
602@@ -694,6 +701,7 @@
603 Donderdag
604 "Time"
605 Tijd
606+"Time Stretch"
607 "Time Stretch Default"
608 TimeStretch Standaard
609 "Timeslot size"
610@@ -701,6 +709,7 @@
611 titel
612 "Title"
613 Titel
614+"Title Match"
615 "Title Search"
616 Titel zoeken
617 "Today"
618Index: modules/_shared/lang/German.lang
619===================================================================
620--- modules/_shared/lang/German.lang (revision 10396)
621+++ modules/_shared/lang/German.lang (working copy)
622@@ -200,6 +200,7 @@
623 Dauer
624 "Edit"
625 Bearbeiten
626+"Edit existing group"
627 "Edit keybindings on"
628 Tastaturbelegung Àndern fÌr
629 "Edit MythWeb and some MythTV settings."
630@@ -332,6 +333,7 @@
631 "Listing Time Key"
632 "Listings"
633 TV Programm
634+"Load Group"
635 "Logs"
636 Logs
637 "Low"
638@@ -361,6 +363,7 @@
639 "MythTV global defaults"
640 "MythTV key bindings"
641 MythTV Tastaturbelegung
642+"MythTV playback group editor"
643 "MythTV settings table"
644 "MythTV Status"
645 MythTV Status
646@@ -427,6 +430,8 @@
647 Leute
648 "People Search"
649 Suche nach Darsteller
650+"Playback Group"
651+"Playback Group Editor"
652 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
653 Achtung! Falls diese Tabelle ohne das nötige Hintergrundwissen verÀndert wird, könnte MythTVs FunktionalitÀt nachhaltig gestört werden.
654 "Please search for something."
655@@ -654,6 +659,8 @@
656 Zeige alle Sendungen.
657 "SI Units?"
658 SI Einheiten?
659+"Skip Ahead"
660+"Skip Back"
661 "sourceid"
662 Source ID
663 "Special Searches"
664@@ -690,6 +697,7 @@
665 Donnerstag
666 "Time"
667 Zeit
668+"Time Stretch"
669 "Time Stretch Default"
670 Zeitraffer Vorgabewert
671 "Timeslot size"
672@@ -697,6 +705,7 @@
673 Titel
674 "Title"
675 Titel
676+"Title Match"
677 "Title Search"
678 Titel Suche
679 "Today"
680Index: modules/_shared/lang/Japanese.lang
681===================================================================
682--- modules/_shared/lang/Japanese.lang (revision 10396)
683+++ modules/_shared/lang/Japanese.lang (working copy)
684@@ -185,6 +185,7 @@
685 時間
686 "Edit"
687 線集
688+"Edit existing group"
689 "Edit keybindings on"
690 キヌバむンド線集察象
691 "Edit MythWeb and some MythTV settings."
692@@ -312,6 +313,7 @@
693 䞀芧 タむムキヌ
694 "Listings"
695 番組衚
696+"Load Group"
697 "Logs"
698 ログ
699 "Low"
700@@ -337,6 +339,7 @@
701 "MythTV global defaults"
702 "MythTV key bindings"
703 MythTVキヌバむンド
704+"MythTV playback group editor"
705 "MythTV settings table"
706 "MythTV Status"
707 MythTVステヌタス
708@@ -399,6 +402,8 @@
709 ピヌプル
710 "People Search"
711 ピヌプルサヌチ
712+"Playback Group"
713+"Playback Group Editor"
714 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
715 蚭定項
716目の意味がわからないずきは倉曎しないでください。MythTVが正垞に動䜜しなくなりたす。
717 "Please search for something."
718@@ -623,6 +628,8 @@
719 すべおの番組を衚瀺
720 "SI Units?"
721 SI単䜍を䜿甚する
722+"Skip Ahead"
723+"Skip Back"
724 "sourceid"
725 "Special Searches"
726 スペシャル怜玢
727@@ -659,6 +666,7 @@
728 朚曜日
729 "Time"
730 攟送時間
731+"Time Stretch"
732 "Time Stretch Default"
733 タむムストレッチ蚭定
734 "Timeslot size"
735@@ -666,6 +674,7 @@
736 タむトル
737 "Title"
738 タむトル
739+"Title Match"
740 "Title Search"
741 タむトルサヌチ
742 "Today"
743Index: modules/_shared/lang/English.lang
744===================================================================
745--- modules/_shared/lang/English.lang (revision 10396)
746+++ modules/_shared/lang/English.lang (working copy)
747@@ -102,6 +102,7 @@
748 "Duplicates"
749 "Duration"
750 "Edit"
751+"Edit existing group"
752 "Edit keybindings on"
753 "Edit MythWeb and some MythTV settings."
754 "Edit settings for"
755@@ -177,6 +178,7 @@
756 "Listing &quot;Jump to&quot;"
757 "Listing Time Key"
758 "Listings"
759+"Load Group"
760 "Logs"
761 "Low"
762 "Manual"
763@@ -194,6 +196,7 @@
764 "MythTV channel info"
765 "MythTV global defaults"
766 "MythTV key bindings"
767+"MythTV playback group editor"
768 "MythTV settings table"
769 "MythTV Status"
770 "MythVideo Artwork Dir"
771@@ -234,6 +237,8 @@
772 "Past Year"
773 "People"
774 "People Search"
775+"Playback Group"
776+"Playback Group Editor"
777 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
778 "Please search for something."
779 "plot"
780@@ -402,6 +407,8 @@
781 "Showing all programs from the $1 group."
782 "Showing all programs."
783 "SI Units?"
784+"Skip Ahead"
785+"Skip Back"
786 "sourceid"
787 "Special Searches"
788 "Star character"
789@@ -422,10 +429,12 @@
790 "The requested recording schedule has been deleted."
791 "Thursday"
792 "Time"
793+"Time Stretch"
794 "Time Stretch Default"
795 "Timeslot size"
796 "title"
797 "Title"
798+"Title Match"
799 "Title Search"
800 "Today"
801 "Tomorrow"
802Index: modules/_shared/lang/Czech.lang
803===================================================================
804--- modules/_shared/lang/Czech.lang (revision 10396)
805+++ modules/_shared/lang/Czech.lang (working copy)
806@@ -135,6 +135,7 @@
807 "Duplicates"
808 "Duration"
809 "Edit"
810+"Edit existing group"
811 "Edit keybindings on"
812 "Edit MythWeb and some MythTV settings."
813 "Edit settings for"
814@@ -224,6 +225,7 @@
815 "Listing Time Key"
816 "Listings"
817 VÃœpisy
818+"Load Group"
819 "Logs"
820 "Low"
821 "Manual"
822@@ -245,6 +247,7 @@
823 "MythTV channel info"
824 "MythTV global defaults"
825 "MythTV key bindings"
826+"MythTV playback group editor"
827 "MythTV settings table"
828 "MythTV Status"
829 "MythVideo Artwork Dir"
830@@ -295,6 +298,8 @@
831 "Past Year"
832 "People"
833 "People Search"
834+"Playback Group"
835+"Playback Group Editor"
836 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
837 "Please search for something."
838 "plot"
839@@ -474,6 +479,8 @@
840 "Showing all programs from the $1 group."
841 "Showing all programs."
842 "SI Units?"
843+"Skip Ahead"
844+"Skip Back"
845 "sourceid"
846 "Special Searches"
847 "Star character"
848@@ -499,12 +506,14 @@
849 "Thursday"
850 Čtvrtek
851 "Time"
852+"Time Stretch"
853 "Time Stretch Default"
854 "Timeslot size"
855 "title"
856 název
857 "Title"
858 Název
859+"Title Match"
860 "Title Search"
861 "Today"
862 Dnes
863Index: modules/_shared/lang/Finnish.lang
864===================================================================
865--- modules/_shared/lang/Finnish.lang (revision 10396)
866+++ modules/_shared/lang/Finnish.lang (working copy)
867@@ -197,6 +197,7 @@
868 Kesto
869 "Edit"
870 Muokkaa
871+"Edit existing group"
872 "Edit keybindings on"
873 Muokkaa nÀppÀinkomentoja
874 "Edit MythWeb and some MythTV settings."
875@@ -326,6 +327,7 @@
876 Listauksen AikanÀppÀin
877 "Listings"
878 Listaus
879+"Load Group"
880 "Logs"
881 Lokit
882 "Low"
883@@ -351,6 +353,7 @@
884 "MythTV global defaults"
885 "MythTV key bindings"
886 MythTV komennot
887+"MythTV playback group editor"
888 "MythTV settings table"
889 "MythTV Status"
890 MythTV Tila
891@@ -414,6 +417,8 @@
892 "People"
893 "People Search"
894 Haku NimellÀ
895+"Playback Group"
896+"Playback Group Editor"
897 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
898 Varoitus: NÀiden asetusten muokkaus voi haitata MythTV:n toimintaa.
899 "Please search for something."
900@@ -638,6 +643,8 @@
901 NÀytetÀÀn kaikki ohjelmat.
902 "SI Units?"
903 SI-yksiköt
904+"Skip Ahead"
905+"Skip Back"
906 "sourceid"
907 "Special Searches"
908 Edistynyt Haku
909@@ -675,6 +682,7 @@
910 Torstai
911 "Time"
912 Aika
913+"Time Stretch"
914 "Time Stretch Default"
915 Ajan SÀÀdön Oletus
916 "Timeslot size"
917@@ -682,6 +690,7 @@
918 Nimike
919 "Title"
920 Nimike
921+"Title Match"
922 "Title Search"
923 Haku NimikkeellÀ
924 "Today"
925Index: modules/_shared/lang/Slovenian.lang
926===================================================================
927--- modules/_shared/lang/Slovenian.lang (revision 10396)
928+++ modules/_shared/lang/Slovenian.lang (working copy)
929@@ -156,6 +156,7 @@
930 Duplikati
931 "Duration"
932 "Edit"
933+"Edit existing group"
934 "Edit keybindings on"
935 Zamenjaj bliÅŸnjico za
936 "Edit MythWeb and some MythTV settings."
937@@ -269,6 +270,7 @@
938 Seznam
939 "Listings"
940 Seznam
941+"Load Group"
942 "Logs"
943 "Low"
944 Nizka
945@@ -289,6 +291,7 @@
946 "MythTV channel info"
947 "MythTV global defaults"
948 "MythTV key bindings"
949+"MythTV playback group editor"
950 "MythTV settings table"
951 "MythTV Status"
952 "MythVideo Artwork Dir"
953@@ -341,6 +344,8 @@
954 "Past Year"
955 "People"
956 "People Search"
957+"Playback Group"
958+"Playback Group Editor"
959 "Please be warned that by altering this table without knowing what you are doing, you could seriously disrupt mythtv functionality."
960 "Please search for something."
961 Prosim poiščite kaj
962@@ -544,6 +549,8 @@
963 "Showing all programs."
964 "SI Units?"
965 SI enote
966+"Skip Ahead"
967+"Skip Back"
968 "sourceid"
969 "Special Searches"
970 "Star character"
971@@ -576,12 +583,14 @@
972 Četrtek
973 "Time"
974 Čas
975+"Time Stretch"
976 "Time Stretch Default"
977 "Timeslot size"
978 "title"
979 Naslov
980 "Title"
981 Naslov
982+"Title Match"
983 "Title Search"
984 "Today"
985 Danes
986Index: modules/tv/detail.php
987===================================================================
988--- modules/tv/detail.php (revision 10396)
989+++ modules/tv/detail.php (working copy)
990@@ -132,6 +132,7 @@
991 $schedule->endoffset = intval($_POST['endoffset']);
992 $schedule->autotranscode = $_POST['autotranscode'] ? 1 : 0;
993 $schedule->transcoder = $_POST['transcoder'];
994+ $schedule->playgroup = $_POST['playgroup'];
995 $schedule->tsdefault = $_POST['timestretch'];
996 // Keep track of the parent recording for overrides
997 if ($_POST['record'] == rectype_override) {
998Index: modules/tv/schedules_custom.php
999===================================================================
1000--- modules/tv/schedules_custom.php (revision 10396)
1001+++ modules/tv/schedules_custom.php (working copy)
1002@@ -100,6 +100,7 @@
1003 $schedule->findday = $_POST['findday'];
1004 $schedule->autotranscode = $_POST['autotranscode'] ? 1 : 0;
1005 $schedule->transcoder = $_POST['transcoder'];
1006+ $schedule->playgroup = $_POST['playgroup'];
1007 // Parse the findtime
1008 $schedule->findtime = trim($_POST['findtime']);
1009 if ($schedule->findtime) {
1010Index: modules/tv/schedules_manual.php
1011===================================================================
1012--- modules/tv/schedules_manual.php (revision 10396)
1013+++ modules/tv/schedules_manual.php (working copy)
1014@@ -87,6 +87,7 @@
1015 $schedule->findtime = date('H:m:s', $schedule->starttime);
1016 $schedule->autotranscode = $_POST['autotranscode'] ? 1 : 0;
1017 $schedule->transcoder = $_POST['transcoder'];
1018+ $schedule->playgroup = $_POST['playgroup'];
1019 // Figure out the title
1020 $channel = $Channels[$_POST['channel']];
1021 if (strcasecmp($_POST['title'], t('Use callsign')) == 0) {
1022Index: modules/tv/tmpl/default/schedules_custom.php
1023===================================================================
1024--- modules/tv/tmpl/default/schedules_custom.php (revision 10396)
1025+++ modules/tv/tmpl/default/schedules_custom.php (working copy)
1026@@ -160,6 +160,8 @@
1027 echo ">$i</option>";
1028 }
1029 ?></select></dd>
1030+ <dt><?php echo t('Playback Group') ?>:</dt>
1031+ <dd><?php playgroup_select($schedule->playgroup) ?></dd>
1032 <dt><?php echo t('Check for duplicates in') ?>:</dt>
1033 <dd><select name="dupin"><?php
1034 echo '<option value="1"';
1035Index: modules/tv/tmpl/default/schedules_manual.php
1036===================================================================
1037--- modules/tv/tmpl/default/schedules_manual.php (revision 10396)
1038+++ modules/tv/tmpl/default/schedules_manual.php (working copy)
1039@@ -113,6 +113,8 @@
1040 echo ">$i</option>";
1041 }
1042 ?></select></dd>
1043+ <dt><?php echo t('Playback Group') ?>:</dt>
1044+ <dd><?php playgroup_select($schedule->playgroup) ?></dd>
1045 <dt><?php echo t('Check for duplicates in') ?>:</dt>
1046 <dd><select name="dupin"><?php
1047 echo '<option value="1"';
1048Index: modules/tv/tmpl/default/detail.php
1049===================================================================
1050--- modules/tv/tmpl/default/detail.php (revision 10396)
1051+++ modules/tv/tmpl/default/detail.php (working copy)
1052@@ -371,6 +371,8 @@
1053 echo ">$i</option>";
1054 }
1055 ?></select></dd>
1056+ <dt><?php echo t('Playback Group') ?>:</dt>
1057+ <dd><?php playgroup_select($schedule->playgroup) ?></dd>
1058 <dt><?php echo t('Time Stretch Default') ?>:</dt>
1059 <dd>
1060 <select name="timestretch">
1061Index: modules/tv/tmpl/default/recorded.php
1062===================================================================
1063--- modules/tv/tmpl/default/recorded.php (revision 10396)
1064+++ modules/tv/tmpl/default/recorded.php (working copy)
1065@@ -68,6 +68,14 @@
1066 +'&chanid='+file.chanid+'&starttime='+file.starttime);
1067 }
1068
1069+ function set_playgroup(id) {
1070+ var file = files[id];
1071+ var sel = get_element('playgroup_' + file.chanid + '.' + file.starttime);
1072+ submit_url('<?php echo root ?>tv/recorded?ajax&playgroup='+
1073+ sel.options[sel.selectedIndex].value+
1074+ '&chanid='+file.chanid+'&starttime='+file.starttime);
1075+ }
1076+
1077 function confirm_delete(id, forget_old) {
1078 var file = files[id];
1079 if (confirm("<?php echo t('Are you sure you want to delete the following show?') ?>\n\n "+file.title+": "+file.subtitle)) {
1080@@ -325,6 +333,9 @@
1081 name="autoexpire_<?php echo $show->chanid, '.', $show->recstartts ?>"
1082 <?php if ($show->auto_expire) echo ' CHECKED' ?> onchange="set_autoexpire(<?php echo $row ?>)" />
1083 </span>
1084+ <span style="padding-right: 25px"><?php echo strtolower(t('Playback Group')) ?>:&nbsp;
1085+ <?php playgroup_select($show->playgroup, 'playgroup', "set_playgroup($row)", $show->chanid . '.' . $show->recstartts) ?>
1086+ </span>
1087 <?php echo t('has bookmark') ?>:&nbsp;
1088 <b><?php echo $show->bookmark ? t('Yes') : t('No') ?></b>
1089 </td>
1090Index: modules/tv/recorded.php
1091===================================================================
1092--- modules/tv/recorded.php (revision 10396)
1093+++ modules/tv/recorded.php (working copy)
1094@@ -58,18 +58,27 @@
1095
1096 // Auto-expire
1097 isset($_GET['autoexpire']) or $_GET['autoexpire'] = $_POST['autoexpire'];
1098- if (isset($_GET['autoexpire']) && $_GET['chanid'] && $_GET['starttime']) {
1099+ if (isset($_GET['autoexpire']) && $_GET['chanid'] && $_GET['starttime'])
1100 $sh = $db->query('UPDATE recorded
1101 SET autoexpire = ?
1102 WHERE chanid = ? AND starttime = FROM_UNIXTIME(?)',
1103 $_GET['autoexpire'] ? 1 : 0,
1104 $_GET['chanid'],
1105 $_GET['starttime']);
1106+// Playback group edit
1107+ isset($_GET['playgroup']) or $_GET['playgroup'] = $_POST['playgroup'];
1108+ if(isset($_GET['playgroup']) && $_GET['chanid'] && $_GET['starttime'])
1109+ $sh = $db->query('UPDATE recorded
1110+ SET playgroup = ?
1111+ WHERE chanid = ? AND starttime = FROM_UNIXTIME(?)',
1112+ $_GET['playgroup'],
1113+ $_GET['chanid'],
1114+ $_GET['starttime']);
1115+
1116 // Exit early if we're in AJAX mode.
1117- if (isset($_GET['ajax'])) {
1118- echo 'success';
1119- exit;
1120- }
1121+ if (isset($_GET['ajax']) && isset($_GET['playgroup'])) {
1122+ echo 'success';
1123+ exit;
1124 }
1125 else {
1126 /** @todo need some sort of handler here for the non-ajax stuff */