Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Patch to make mythweb work with new rec filters

Apply patch from Doug Haber <doug@fawnanddoug.com>  to close #9580

Also updates translations strings missing from patch
  • Loading branch information...
commit bfb69bef8b5923c421cf327d7944ea4590441046 1 parent e1a2b32
@ex-nerd ex-nerd authored
Showing with 100 additions and 156 deletions.
  1. +1 −5 modules/_shared/lang/Catalan.lang
  2. +1 −8 modules/_shared/lang/Czech.lang
  3. +1 −10 modules/_shared/lang/Danish.lang
  4. +1 −6 modules/_shared/lang/Dutch.lang
  5. +1 −5 modules/_shared/lang/English.lang
  6. +1 −5 modules/_shared/lang/English_CA.lang
  7. +1 −5 modules/_shared/lang/English_GB.lang
  8. +1 −10 modules/_shared/lang/Finnish.lang
  9. +1 −10 modules/_shared/lang/French.lang
  10. +1 −10 modules/_shared/lang/French_CA.lang
  11. +1 −4 modules/_shared/lang/German.lang
  12. +1 −10 modules/_shared/lang/Hungarian.lang
  13. +1 −5 modules/_shared/lang/Japanese.lang
  14. +1 −10 modules/_shared/lang/Norwegian_NB.lang
  15. +1 −5 modules/_shared/lang/Polish.lang
  16. +1 −10 modules/_shared/lang/Slovenian.lang
  17. +1 −5 modules/_shared/lang/Spanish.lang
  18. +1 −4 modules/_shared/lang/Spanish_ES.lang
  19. +1 −10 modules/_shared/lang/Swedish.lang
  20. +49 −3 modules/tv/classes/Schedule.php
  21. +4 −3 modules/tv/detail.php
  22. +12 −0 modules/tv/includes/schedule_utils.php
  23. +16 −12 modules/tv/tmpl/default/_advanced_options.php
  24. +0 −1  modules/tv/tmpl/default/schedules.php
View
6 modules/_shared/lang/Catalan.lang
@@ -331,9 +331,6 @@
"Erroring"
"Escape"
"Everything"
-"Exclude Generic Episodes"
-"Exclude Repeat and Generic Episodes"
-"Exclude Repeat Episodes"
"Exec. Producer"
Productor exec.
"Extended Check"
@@ -341,7 +338,6 @@
"File Size"
mida de l'arxiu
"film"
-"Filter"
"Filters"
"Find Date & Time Options"
Opcions de recerca per data i hora
@@ -584,7 +580,6 @@
Mai enregistrar
"New"
"New episodes only"
-"New Episodes Only"
"New Group"
"New Search"
"New Titles, Premieres"
@@ -690,6 +685,7 @@
"Possible conflicts"
"Possible conflicts with this show"
Possibles conflictes amb aquest programa
+"Post Processing"
"Power"
Avançat
"Power Search"
View
9 modules/_shared/lang/Czech.lang
@@ -435,10 +435,6 @@
Chybující
"Escape"
"Everything"
-"Exclude Generic Episodes"
-"Exclude Repeat and Generic Episodes"
-"Exclude Repeat Episodes"
- S vyjímkou opakujících se epizod
"Exec. Producer"
"Extended Check"
"ffmpeg with MP3 support not detected"
@@ -447,8 +443,6 @@
Velikost souboru
"film"
film
-"Filter"
- Filtr
"Filters"
Filtry
"Find Date & Time Options"
@@ -690,8 +684,6 @@
Nový
"New episodes only"
Pouze nové epizody
-"New Episodes Only"
- Pouze nové epizody
"New Group"
Nová skupina
"New Search"
@@ -794,6 +786,7 @@
"Possible conflicts"
Možné konflikty
"Possible conflicts with this show"
+"Post Processing"
"Power"
"Power Search"
Pokročilé vyhledávání
View
11 modules/_shared/lang/Danish.lang
@@ -463,12 +463,6 @@
Escape
"Everything"
Alting
-"Exclude Generic Episodes"
- Ekskluder generiske episoder
-"Exclude Repeat and Generic Episodes"
- Ekskluder gentagne og generiske episoder
-"Exclude Repeat Episodes"
- Ekskluder gentagne episoder
"Exec. Producer"
Producer
"Extended Check"
@@ -479,8 +473,6 @@
filstørrelse
"film"
film
-"Filter"
- Filter
"Filters"
Filtre
"Find Date & Time Options"
@@ -796,8 +788,6 @@
Ny
"New episodes only"
Kun nye episoder
-"New Episodes Only"
- Kun nye episoder
"New Group"
Ny gruppe
"New Search"
@@ -960,6 +950,7 @@
Mulige konflikter
"Possible conflicts with this show"
Mulige konflikter med denne udsendelse
+"Post Processing"
"Power"
Super
"Power Search"
View
7 modules/_shared/lang/Dutch.lang
@@ -323,9 +323,6 @@
"Erroring"
"Escape"
"Everything"
-"Exclude Generic Episodes"
-"Exclude Repeat and Generic Episodes"
-"Exclude Repeat Episodes"
"Exec. Producer"
Uitv. Producent
"Extended Check"
@@ -333,7 +330,6 @@
"File Size"
bestandsgrootte
"film"
-"Filter"
"Filters"
"Find Date & Time Options"
Datum &amp; tijd zoeken, opties
@@ -568,8 +564,6 @@
Nieuw
"New episodes only"
Alleen nieuwe afleveringen
-"New Episodes Only"
- Alleen nieuwe afleveringen
"New Group"
Nieuwe groep
"New Search"
@@ -669,6 +663,7 @@
"Possible conflicts"
"Possible conflicts with this show"
Mogelijk conflict met dit programma
+"Post Processing"
"Power"
"Power Search"
Geavanceerd zoeken
View
6 modules/_shared/lang/English.lang
@@ -245,15 +245,11 @@
"Erroring"
"Escape"
"Everything"
-"Exclude Generic Episodes"
-"Exclude Repeat and Generic Episodes"
-"Exclude Repeat Episodes"
"Exec. Producer"
"Extended Check"
"ffmpeg with MP3 support not detected"
"File Size"
"film"
-"Filter"
"Filters"
"Find Date & Time Options"
Find Date &amp; Time Options
@@ -446,7 +442,6 @@
"Never Record"
"New"
"New episodes only"
-"New Episodes Only"
"New Group"
"New Search"
"New Titles, Premieres"
@@ -528,6 +523,7 @@
"Pop-out player"
"Possible conflicts"
"Possible conflicts with this show"
+"Post Processing"
"Power"
"Power Search"
"Power Search:"
View
6 modules/_shared/lang/English_CA.lang
@@ -245,15 +245,11 @@
"Erroring"
"Escape"
"Everything"
-"Exclude Generic Episodes"
-"Exclude Repeat and Generic Episodes"
-"Exclude Repeat Episodes"
"Exec. Producer"
"Extended Check"
"ffmpeg with MP3 support not detected"
"File Size"
"film"
-"Filter"
"Filters"
"Find Date & Time Options"
Find Date &amp; Time Options
@@ -446,7 +442,6 @@
"Never Record"
"New"
"New episodes only"
-"New Episodes Only"
"New Group"
"New Search"
"New Titles, Premieres"
@@ -528,6 +523,7 @@
"Pop-out player"
"Possible conflicts"
"Possible conflicts with this show"
+"Post Processing"
"Power"
"Power Search"
"Power Search:"
View
6 modules/_shared/lang/English_GB.lang
@@ -246,15 +246,11 @@
"Erroring"
"Escape"
"Everything"
-"Exclude Generic Episodes"
-"Exclude Repeat and Generic Episodes"
-"Exclude Repeat Episodes"
"Exec. Producer"
"Extended Check"
"ffmpeg with MP3 support not detected"
"File Size"
"film"
-"Filter"
"Filters"
"Find Date & Time Options"
"Find Day"
@@ -447,7 +443,6 @@
"Never Record"
"New"
"New episodes only"
-"New Episodes Only"
"New Group"
"New Search"
"New Titles, Premieres"
@@ -538,6 +533,7 @@
"Pop-out player"
"Possible conflicts"
"Possible conflicts with this show"
+"Post Processing"
"Power"
"Power Search"
"Power Search:"
View
11 modules/_shared/lang/Finnish.lang
@@ -460,12 +460,6 @@
Poistu
"Everything"
Kaikki
-"Exclude Generic Episodes"
- Sulje rekisteröimättömät jaksot ulos
-"Exclude Repeat and Generic Episodes"
- Sulje toistettavat ja rekisteröimättömät jaksot ulos
-"Exclude Repeat Episodes"
- Sulje toistetut jaksot ulos
"Exec. Producer"
Tuottaja
"Extended Check"
@@ -476,8 +470,6 @@
Tiedostokoko
"film"
elokuva
-"Filter"
- Filtteri
"Filters"
Filtterit
"Find Date & Time Options"
@@ -798,8 +790,6 @@
Uusi
"New episodes only"
Vain uudet jaksot
-"New Episodes Only"
- Vain uudet jaksot
"New Group"
Uusi ryhmä
"New Search"
@@ -957,6 +947,7 @@
Mahdolliset ristiriidat
"Possible conflicts with this show"
Saattaa olla ristiriidassa tämän ohjelman kanssa
+"Post Processing"
"Power"
Virta
"Power Search"
View
11 modules/_shared/lang/French.lang
@@ -464,12 +464,6 @@
Échap
"Everything"
Tout
-"Exclude Generic Episodes"
- Exclure les épisodes génériques
-"Exclude Repeat and Generic Episodes"
- Exclure les rediffusions et les épisodes génériques
-"Exclude Repeat Episodes"
- Exclure les rediffusions
"Exec. Producer"
Producteur exécutif
"Extended Check"
@@ -480,8 +474,6 @@
Taille du fichier
"film"
film
-"Filter"
- Filtre
"Filters"
Filtres
"Find Date & Time Options"
@@ -807,8 +799,6 @@
Nouveau
"New episodes only"
Seulement les nouveaux épisodes
-"New Episodes Only"
- Seulement les nouveaux épisodes
"New Group"
Nouveau groupe
"New Search"
@@ -966,6 +956,7 @@
Conflits potentiels
"Possible conflicts with this show"
Conflits potentiels avec cette diffusion
+"Post Processing"
"Power"
Avancée
"Power Search"
View
11 modules/_shared/lang/French_CA.lang
@@ -464,12 +464,6 @@
Échap
"Everything"
Tout
-"Exclude Generic Episodes"
- Exclure les épisodes génériques
-"Exclude Repeat and Generic Episodes"
- Exclure les rediffusions et les épisodes génériques
-"Exclude Repeat Episodes"
- Exclure les rediffusions
"Exec. Producer"
Producteur exécutif
"Extended Check"
@@ -480,8 +474,6 @@
Taille du fichier
"film"
film
-"Filter"
- Filtre
"Filters"
Filtres
"Find Date & Time Options"
@@ -807,8 +799,6 @@
Nouveau
"New episodes only"
Seulement les nouveaux épisodes
-"New Episodes Only"
- Seulement les nouveaux épisodes
"New Group"
Nouveau groupe
"New Search"
@@ -966,6 +956,7 @@
Conflits potentiels
"Possible conflicts with this show"
Conflits potentiels avec cette diffusion
+"Post Processing"
"Power"
Avancée
"Power Search"
View
5 modules/_shared/lang/German.lang
@@ -476,8 +476,6 @@
Dateigröße
"film"
Film
-"Filter"
- Filter
"Filters"
Filter
"Find Date & Time Options"
@@ -797,8 +795,6 @@
Neu
"New episodes only"
nur neue Folgen
-"New Episodes Only"
- nur neue Folgen
"New Group"
Neue Gruppe
"New Search"
@@ -960,6 +956,7 @@
Mögliche Überschneidungen
"Possible conflicts with this show"
Mögliche Überschneidungen mit dieser Sendung
+"Post Processing"
"Power"
freie Suche
"Power Search"
View
11 modules/_shared/lang/Hungarian.lang
@@ -441,12 +441,6 @@
Kilép
"Everything"
Minden
-"Exclude Generic Episodes"
- Általános részek kivételével
-"Exclude Repeat and Generic Episodes"
- Az általános és az ismételt részek kivételével
-"Exclude Repeat Episodes"
- Ismétlések kivételével
"Exec. Producer"
Külső támogató
"Extended Check"
@@ -456,8 +450,6 @@
Fájlméret
"film"
film
-"Filter"
- Sorozatszűrő
"Filters"
Szűrők
"Find Date & Time Options"
@@ -757,8 +749,6 @@
"New"
Új
"New episodes only"
-"New Episodes Only"
- Csak az új részeket
"New Group"
Új csoport
"New Search"
@@ -902,6 +892,7 @@
Leheséges ütközések
"Possible conflicts with this show"
Lehetséges ütközések ebben a műsorban
+"Post Processing"
"Power"
Energia
"Power Search"
View
6 modules/_shared/lang/Japanese.lang
@@ -321,9 +321,6 @@
"Erroring"
"Escape"
"Everything"
-"Exclude Generic Episodes"
-"Exclude Repeat and Generic Episodes"
-"Exclude Repeat Episodes"
"Exec. Producer"
製作責任者
"Extended Check"
@@ -331,7 +328,6 @@
"File Size"
ファイルサイズ
"film"
-"Filter"
"Filters"
"Find Date & Time Options"
日時オプション
@@ -566,7 +562,6 @@
もう録画しない
"New"
"New episodes only"
-"New Episodes Only"
"New Group"
"New Search"
"New Titles, Premieres"
@@ -667,6 +662,7 @@
"Possible conflicts"
"Possible conflicts with this show"
次の番組と衝突しています
+"Post Processing"
"Power"
パワー
"Power Search"
View
11 modules/_shared/lang/Norwegian_NB.lang
@@ -461,12 +461,6 @@
Escape
"Everything"
Alt
-"Exclude Generic Episodes"
- Ekskluder generiske episoder
-"Exclude Repeat and Generic Episodes"
- Ekskluder gjentatte og generiske episoder
-"Exclude Repeat Episodes"
- Ekskluder gjentatte episoder
"Exec. Producer"
Produsent
"Extended Check"
@@ -477,8 +471,6 @@
Filstørrelse
"film"
film
-"Filter"
- Filter
"Filters"
Filtre
"Find Date & Time Options"
@@ -791,8 +783,6 @@
Ny
"New episodes only"
Kun nye episoder
-"New Episodes Only"
- Kun nye episoder
"New Group"
Ny gruppe
"New Search"
@@ -950,6 +940,7 @@
Mulige konflikter
"Possible conflicts with this show"
Mulige konflikter for denne sendingen
+"Post Processing"
"Power"
Kraftig
"Power Search"
View
6 modules/_shared/lang/Polish.lang
@@ -307,15 +307,11 @@
"Erroring"
"Escape"
"Everything"
-"Exclude Generic Episodes"
-"Exclude Repeat and Generic Episodes"
-"Exclude Repeat Episodes"
"Exec. Producer"
"Extended Check"
"ffmpeg with MP3 support not detected"
"File Size"
"film"
-"Filter"
"Filters"
"Find Date & Time Options"
Find Date &amp; Time Options
@@ -508,7 +504,6 @@
Nigdy Nie Nagrywaj
"New"
"New episodes only"
-"New Episodes Only"
"New Group"
"New Search"
"New Titles, Premieres"
@@ -594,6 +589,7 @@
"Pop-out player"
"Possible conflicts"
"Possible conflicts with this show"
+"Post Processing"
"Power"
"Power Search"
"Power Search:"
View
11 modules/_shared/lang/Slovenian.lang
@@ -421,12 +421,6 @@
"Escape"
"Everything"
Vse
-"Exclude Generic Episodes"
- Izključi splošne oddaje
-"Exclude Repeat and Generic Episodes"
- Izključi ponovitve in splošne oddaje
-"Exclude Repeat Episodes"
- Izključi ponovitve oddaj
"Exec. Producer"
Scenarist
"Extended Check"
@@ -435,8 +429,6 @@
"File Size"
Velikost datoteke
"film"
-"Filter"
- Sito
"Filters"
Sita
"Find Date & Time Options"
@@ -725,8 +717,6 @@
"New"
Novo
"New episodes only"
-"New Episodes Only"
- Samo nove oddaje
"New Group"
Nova skupina
"New Search"
@@ -866,6 +856,7 @@
Možni konflikti
"Possible conflicts with this show"
S to oddajo so možni konflikti
+"Post Processing"
"Power"
Napr.
"Power Search"
View
6 modules/_shared/lang/Spanish.lang
@@ -401,9 +401,6 @@
"Erroring"
"Escape"
"Everything"
-"Exclude Generic Episodes"
-"Exclude Repeat and Generic Episodes"
-"Exclude Repeat Episodes"
"Exec. Producer"
Productor ejec.
"Extended Check"
@@ -411,7 +408,6 @@
"File Size"
tamaño fichero
"film"
-"Filter"
"Filters"
"Find Date & Time Options"
Opciones Búsqueda Fecha y Hora
@@ -652,7 +648,6 @@
Nunca grabar
"New"
"New episodes only"
-"New Episodes Only"
"New Group"
"New Search"
"New Titles, Premieres"
@@ -758,6 +753,7 @@
"Possible conflicts"
"Possible conflicts with this show"
Posibles conflictos con este programa
+"Post Processing"
"Power"
Avanzada
"Power Search"
View
5 modules/_shared/lang/Spanish_ES.lang
@@ -478,8 +478,6 @@
Tama�o de Archivo
"film"
pel�cula
-"Filter"
- Filtro
"Filters"
Filtros
"Find Date & Time Options"
@@ -797,8 +795,6 @@
Nuevos
"New episodes only"
S�lo nuevos episodios
-"New Episodes Only"
- S�lo Nuevos Episodios
"New Group"
Nuevo Grupo
"New Search"
@@ -960,6 +956,7 @@
Posibles conflictos
"Possible conflicts with this show"
Posibles conflictos con este programa
+"Post Processing"
"Power"
Avanzada
"Power Search"
View
11 modules/_shared/lang/Swedish.lang
@@ -462,12 +462,6 @@
Undgå
"Everything"
Allt
-"Exclude Generic Episodes"
- Exkludera generiska avsnitt
-"Exclude Repeat and Generic Episodes"
- Exkludera upprepade och generiska avsnitt
-"Exclude Repeat Episodes"
- Exkludera upprepade avsnitt
"Exec. Producer"
Producent
"Extended Check"
@@ -478,8 +472,6 @@
Filstorlek
"film"
film
-"Filter"
- Filter
"Filters"
Filter
"Find Date & Time Options"
@@ -800,8 +792,6 @@
Ny
"New episodes only"
Endast nya avsnitt
-"New Episodes Only"
- Endast nya avsnitt
"New Group"
Ny grupp
"New Search"
@@ -957,6 +947,7 @@
Möjliga konflikter
"Possible conflicts with this show"
Möjliga konflikter med denna visning
+"Post Processing"
"Power"
Avancerat
"Power Search"
View
52 modules/tv/classes/Schedule.php
@@ -51,6 +51,7 @@ class Schedule extends MythBase {
public $findid;
public $transcoder;
public $parentid;
+ public $filter;
public $playgroup;
public $prefinput;
@@ -63,6 +64,50 @@ class Schedule extends MythBase {
public $will_record = false;
public $css_class; // css class, based on category and/or category_type
+
+ /**
+ * Intended to be called as Schedule::availableRecordFilters()
+ *
+ * @return array sorted list of record filters available to the system keyed by filterid
+ /**/
+ public static function availableRecordFilters() {
+ static $cache = array();
+ if (empty($cache)) {
+ global $db;
+ $cache = $db->query_keyed_list_assoc('filterid',
+ 'SELECT filterid,description,newruledefault
+ FROM recordfilter
+ ORDER BY filterid');
+ }
+ return $cache;
+ }
+
+ /**
+ *
+ * @return an array of the filters for this Schedule. Array includes
+ * a property called "enabled" to indicate if the filter is enabled.
+ * If this is not a real schedule "enabled" is from the newruledefault
+ * property
+ *
+ /**/
+ public function recordFilters() {
+ $filters = array();
+ foreach (Schedule::availableRecordFilters() as $id => $filter) {
+ $filters[$id] = $filter;
+ // if this is a real schedule, use the filter property
+ if ($this->recordid) {
+ $mask = 1 << $id;
+ $filters[$id]['enabled'] = ($this->filter & $mask) == $mask;
+
+ // otherwise it's not a real schedule, so use the default value
+ } else {
+ $filters[$id]['enabled'] = $filter['newruledefault'];
+ }
+ }
+
+ return $filters;
+ }
+
public static function findAll($sort = true) {
global $db;
$orderby = '';
@@ -236,10 +281,10 @@ public function save($new_type) {
findday,findtime,findid,autotranscode,parentid,transcoder,
autouserjob1,autouserjob2,autouserjob3,autouserjob4,autometadata,
playgroup,storagegroup,prefinput,
- next_record,last_record,last_delete,inetref,season,episode)
+ next_record,last_record,last_delete,inetref,season,episode,filter)
VALUES (?,?,?,
FROM_UNIXTIME(?),FROM_UNIXTIME(?),FROM_UNIXTIME(?),FROM_UNIXTIME(?),
- ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
+ ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
_or($this->recordid, 0, true),
_or($this->type, 0, true),
$this->chanid,
@@ -286,7 +331,8 @@ public function save($new_type) {
_or($this->last_delete, '00:00:00' ),
_or($this->inetref, '' ),
_or($this->season, 0 ),
- _or($this->episode, 0 )
+ _or($this->episode, 0 ),
+ _or($this->filter, 0 )
);
// Get the id that was returned
$recordid = $sh->insert_id();
View
7 modules/tv/detail.php
@@ -162,6 +162,9 @@
redirect_browser(root_url.'tv/detail/'.$program->chanid.'/'.$program->recstartts);
}
+// Load the utility/display functions for scheduling
+ require_once 'includes/schedule_utils.php';
+
// The user tried to update the recording settings - update the database and the variable in memory
if (isset($_POST['save'])) {
if ($schedule) {
@@ -234,6 +237,7 @@
$schedule->inetref = $_POST['inetref'];
$schedule->season = intval($_POST['season']);
$schedule->episode = intval($_POST['episode']);
+ $schedule->filter = generateFilter();
// Keep track of the parent recording for overrides
if ($_POST['record'] == rectype_override) {
@@ -348,9 +352,6 @@
$program->load_jobs();
}
-// Load the utility/display functions for scheduling
- require_once 'includes/schedule_utils.php';
-
// Setup some vars for the ipod template
$Page_Previous_Location = root_url.'tv/list_shows_in_title_and_group?group='.urlencode($program->recgroup).'&title='.urlencode($program->title);
$Page_Previous_Location_Name = $program->title;
View
12 modules/tv/includes/schedule_utils.php
@@ -11,6 +11,18 @@
/**/
/**
+ * Generates a schedule filter paramater from the POST parameters
+/**/
+ function generateFilter() {
+ $total = 0;
+ foreach (Schedule::availableRecordFilters() as $id => $filter) {
+ $enabled = intval($_POST["recordfilter_$id"]);
+ $total |= $enabled << $id;
+ }
+ return $total;
+ }
+
+/**
* Prints a <select> of the available recording inputs
/**/
function input_select($selected, $ename='prefinput') {
View
28 modules/tv/tmpl/default/_advanced_options.php
@@ -332,17 +332,6 @@ function messageDialog(title, msg) {
echo ' SELECTED';
echo '>' . t('Previous recordings') . '</option>';
?></select></dd>
- <dt><?php echo t('Filter')?>:</dt>
- <dd><select name="dupin2"><?php
- echo '<option value="0"';
- if ($schedule->dupin == 0)
- echo ' SELECTED';
- echo '>' . t('None') . '</option>';
- echo '<option value="', dupsin_newepisodes, '"';
- if ($schedule->dupin & dupsin_newepisodes)
- echo ' SELECTED';
- echo '>' . t('New Episodes Only') . '</option>';
- ?></select></dd>
<dt><?php echo t('Preferred Input') ?>:</dt>
<dd><?php input_select($schedule->prefinput, 'prefinput') ?></dd>
<dt><?php echo t('Internet Reference #') ?>:</dt>
@@ -351,8 +340,19 @@ function messageDialog(title, msg) {
<dd><input type="text" id="season" class="quantity" name="season" value="<?php echo html_entities($schedule->season) ?>"></dd>
<dt><?php echo t('Episode') ?>:</dt>
<dd><input type="text" id="episode" class="quantity" name="episode" value="<?php echo html_entities($schedule->episode) ?>"></dd>
+ <fieldset>
+ <legend><?php echo t('Filters') ?></legend>
+ <?php
+ foreach ($schedule->recordFilters() as $id => $filter) {
+ ?>
+ <dt><label for="recordfilter_$id"><?php echo t($filter['description']) ?>:</label></dt>
+ <dd><input type="checkbox" class="radio" id="recordfilter_<?php echo $id ?>" name="recordfilter_<?php echo $id ?>"<?php if ($filter['enabled']) echo ' CHECKED' ?> value="1"></dd>
+ <?php } ?>
+ </fieldset>
+ <fieldset>
+ <legend><?php echo t('Post Processing') ?></legend>
<dt><label for="autometadata"><?php echo t('Look up Metadata') ?>:</label></dt>
- <dd><input type="checkbox" class="radio" id="autometadata" name="autometadata"<?php if ($schedule->autometadata) echo ' CHECKED' ?> value="1"></dd>
+ <dd><input type="checkbox" class="radio" id="autometadata" name="autometadata"<?php if ($schedule->autometadata) echo ' CHECKED' ?> value="1"></dd>
<dt><label for="autocommflag"><?php echo t('Auto-flag commercials') ?>:</label></dt>
<dd><input type="checkbox" class="radio" id="autocommflag" name="autocommflag"<?php if ($schedule->autocommflag) echo ' CHECKED' ?> value="1"></dd>
<dt><label for="autotranscode"><?php echo t('Auto-transcode') ?>:</label></dt>
@@ -365,6 +365,9 @@ function messageDialog(title, msg) {
<dd><input type="checkbox" class="radio" id="autouserjob3" name="autouserjob3"<?php if ($schedule->autouserjob3) echo ' CHECKED' ?> value="1"></dd>
<dt><label for="autouserjob4"><?php echo setting('UserJobDesc4') ?>:</label></dt>
<dd><input type="checkbox" class="radio" id="autouserjob4" name="autouserjob4"<?php if ($schedule->autouserjob4) echo ' CHECKED' ?> value="1"></dd>
+ </fieldset>
+ <fieldset>
+ <legend><?php echo t('Schedule Options') ?></legend>
<dt><label for="inactive"><?php echo t('Inactive') ?>:</label></dt>
<dd><input type="checkbox" class="radio" id="inactive" name="inactive"<?php if ($schedule->inactive) echo ' CHECKED' ?> value="1"></dd>
<dt><label for="autoexpire"><?php echo t('Auto-expire recordings') ?>:</label></dt>
@@ -379,6 +382,7 @@ function messageDialog(title, msg) {
<dt><?php echo t('End Late') ?>:</dt>
<dd><input type="text" class="quantity" name="endoffset" value="<?php echo html_entities($schedule->endoffset) ?>">
<?php echo t('minutes') ?></dd>
+ </fieldset>
</dl>
<div style="display: none;" id="message-dialog">
View
1  modules/tv/tmpl/default/schedules.php
@@ -18,7 +18,6 @@
// Print the page header
require 'modules/_shared/tmpl/'.tmpl.'/header.php';
-
// No schedules defined?
if (!is_array($the_schedules) || !count($the_schedules)) {
echo '<div id="no_schedules">',

1 comment on commit bfb69be

@ex-nerd
Owner

That should have been #9850

Please sign in to comment.
Something went wrong with that request. Please try again.