Ticket #11222: 0012-mythtv-0.26-mythweb_channels_serviceid_mplexid.patch

mythplugins/mythweb/modules/_shared/lang/Catalan.lang

@@ -928 +928 @@
 "Select the correct show"
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
+"serviceid"
+"mplexid"
 "Set Host"
     Ajustar Host
 "Settings"

mythplugins/mythweb/modules/_shared/lang/Czech.lang

@@ -650 +650 @@
     NAČÍTÁVÁM
 "Local Server Statistics"
     Statistiky lokálního serveru
+"serviceid"
+"mplexid"
 "LOCKDOWN_NOTICE"
 "LOCKDOWN_NOTICE_2"
 "Logs"

mythplugins/mythweb/modules/_shared/lang/Danish.lang

@@ -1257 +1257 @@
     Serveren svarede med ugyldige data ved metadata opslag
 "Server Statistics"
     Server statistik
+"serviceid"
+"mplexid"
 "Set Host"
     SÊt vÊrt
 "Settings"

mythplugins/mythweb/modules/_shared/lang/Dutch.lang

@@ -901 +901 @@
 "Select the correct show"
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
+"serviceid"
+"mplexid"
 "Set Host"
     Host instellen
 "Settings"

mythplugins/mythweb/modules/_shared/lang/English.lang

@@ -724 +724 @@
 "Select the correct show"
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
+"mplexid"
+"serviceid"
 "Set Host"
 "Settings"
 "settings"

mythplugins/mythweb/modules/_shared/lang/English_CA.lang

@@ -726 +726 @@
 "Select the correct show"
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
+"serviceid"
+"mplexid"
 "Set Host"
 "Settings"
 "settings"

mythplugins/mythweb/modules/_shared/lang/English_GB.lang

@@ -743 +743 @@
 "Select the correct show"
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
+"serviceid"
+"mplexid"
 "Set Host"
 "Settings"
 "settings"

mythplugins/mythweb/modules/_shared/lang/Finnish.lang

@@ -1242 +1242 @@
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
     Serverin statistiikkaa
+"serviceid"
+"mplexid"
 "Set Host"
     Aseta palvelin
 "Settings"

mythplugins/mythweb/modules/_shared/lang/French.lang

@@ -1283 +1283 @@
     Le serveur a retourné des données invalides pendant la recherche de métadonnées.
 "Server Statistics"
     Statistiques du serveur
+"serviceid"
+"mplexid"
 "Set Host"
     Choisir l'ordinateur
 "Settings"

mythplugins/mythweb/modules/_shared/lang/French_CA.lang

@@ -1283 +1283 @@
     Le serveur a retourné des données invalides pendant la recherche de métadonnées.
 "Server Statistics"
     Statistiques du serveur
+"serviceid"
+"mplexid"
 "Set Host"
     Choisir l'ordinateur
 "Settings"

mythplugins/mythweb/modules/_shared/lang/German.lang

@@ -1263 +1263 @@
     Beim Versuch Metadaten abzurufen gab der Server ungÃŒltige Daten zurÃŒck.
 "Server Statistics"
     Serverstatistik
+"serviceid"
+"mplexid"
 "Set Host"
     Setze Host
 "Settings"

mythplugins/mythweb/modules/_shared/lang/Hungarian.lang

@@ -1173 +1173 @@
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
     Szerver statisztikák
+"serviceid"
+"mplexid"
 "Set Host"
     Gép beállítása
 "Settings"

mythplugins/mythweb/modules/_shared/lang/Japanese.lang

@@ -902 +902 @@
 "Select the correct show"
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
+"serviceid"
+"mplexid"
 "Set Host"
     ホスト蚭定
 "Settings"

mythplugins/mythweb/modules/_shared/lang/Norwegian_NB.lang

@@ -1269 +1269 @@
     Tjeneren returnerte ugyldige data under henting av metadata.
 "Server Statistics"
     Tjenerstatistikk
+"serviceid"
+"mplexid"
 "Set Host"
     Sett vert
 "Settings"

mythplugins/mythweb/modules/_shared/lang/Polish.lang

@@ -814 +814 @@
 "Select the correct show"
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
+"serviceid"
+"mplexid"
 "Set Host"
 "Settings"
     Ustawienia

mythplugins/mythweb/modules/_shared/lang/Slovenian.lang

@@ -1131 +1131 @@
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
     Stratistike streÅŸnika
+"serviceid"
+"mplexid"
 "Set Host"
     Nastavi gostitelja
 "Settings"

mythplugins/mythweb/modules/_shared/lang/Spanish.lang

@@ -996 +996 @@
 "Select the correct show"
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
+"serviceid"
+"mplexid"
 "Set Host"
     Ajustar Host
 "Settings"

mythplugins/mythweb/modules/_shared/lang/Spanish_ES.lang

@@ -680 +680 @@
     CARGANDO
 "Local Server Statistics"
     Estadísticas del Servidor Local
+"serviceid"
+"mplexid"
 "LOCKDOWN_NOTICE"
 "LOCKDOWN_NOTICE_2"
 "Logs"

mythplugins/mythweb/modules/_shared/lang/Swedish.lang

@@ -1243 +1243 @@
 "Server returned invalid data when attempting to retrieve metadata."
 "Server Statistics"
     Serverstatistik
+"serviceid"
+"mplexid"
 "Set Host"
     SÀtt vÀrd
 "Settings"

mythplugins/mythweb/modules/tv/set_channels.php

@@ -21 +21 @@
             // Not deleting so grab values that can be empty
                 $query = 'UPDATE channel SET xmltvid       = ?,
                                              freqid        = ?,
+                                             mplexid       = ?,
+                                             serviceid     = ?,
                                              finetune      = ?,
                                              videofilters  = ?,
                                              brightness    = ?,
@@ -33 +35 @@
                                              visible       = ?';
                 $query_params[] = $data['xmltvid'];
                 $query_params[] = $data['freqid'];
+                $query_params[] = $data['mplexid'];
+                $query_params[] = $data['serviceid'];
                 $query_params[] = $data['finetune'];
                 $query_params[] = $data['videofilters'];
                 $query_params[] = $data['brightness'];
@@ -63 +67 @@
             }
         }
     // Do a reschedule to refresh scheduled recordings;
-        MythBackend::find()->rescheduleRecording();
+        // MythBackend::find()->rescheduleRecording();
     }
 
 // Sortby

mythplugins/mythweb/modules/tv/tmpl/default/set_channels.php

@@ -15 +15 @@
 <tr class="menu" align="center">
     <td width="4%"><?php  echo t('delete')        ?></td>
     <td width="4%"><a href="<?php echo form_action ?>?sortby=sourceid"><?php  echo t('sourceid') ?></a></td>
-    <td width="4%"><a href="<?php echo form_action ?>?sortby=xmltvid"><?php  echo t('xmltvid') ?></a></td>
-    <td width="5%"><a href="<?php echo form_action ?>?sortby=channum"><?php  echo t('channum') ?></a></td>
-    <td width="5%"><a href="<?php echo form_action ?>?sortby=callsign"><?php echo t('callsign') ?></a></td>
-    <td width="5%"><a href="<?php echo form_action ?>?sortby=name"><?php     echo t('name') ?></a></td>
-    <td width="5%"><a href="<?php echo form_action ?>?sortby=freqid"><?php   echo t('freqid') ?></a></td>
+    <td width="4%"><a href="<?php echo form_action ?>?sortby=xmltvid"><?php   echo t('xmltvid') ?></a></td>
+    <td width="5%"><a href="<?php echo form_action ?>?sortby=channum"><?php   echo t('channum') ?></a></td>
+    <td width="5%"><a href="<?php echo form_action ?>?sortby=callsign"><?php  echo t('callsign') ?></a></td>
+    <td width="5%"><a href="<?php echo form_action ?>?sortby=name"><?php      echo t('name') ?></a></td>
+    <td width="5%"><a href="<?php echo form_action ?>?sortby=mplexid"><?php   echo t('mplexid') ?></a></td>
+    <td width="5%"><a href="<?php echo form_action ?>?sortby=serviceid"><?php echo t('serviceid') ?></a></td>
+    <td width="5%"><?php  echo t('visible')       ?></td>
+    <td width="5%"><?php  echo t('useonairguide') ?></td>
+    <td width="5%"><?php  echo t('commfree')      ?></td>
+    <td width="5%"><?php  echo t('recpriority')   ?></td>
+    <td width="5%"><a href="<?php echo form_action ?>?sortby=freqid"><?php    echo t('freqid') ?></a></td>
     <td width="5%"><?php  echo t('finetune')      ?></td>
     <td width="5%"><?php  echo t('videofilters')  ?></td>
     <td width="7%"><?php  echo t('brightness')    ?></td>
     <td width="7%"><?php  echo t('contrast')      ?></td>
     <td width="7%"><?php  echo t('color')         ?></td>
     <td width="7%"><?php  echo t('hue')           ?></td>
-    <td width="5%"><?php  echo t('recpriority')   ?></td>
-    <td width="5%"><?php  echo t('commfree')      ?></td>
-    <td width="5%"><?php  echo t('visible')       ?></td>
-    <td width="5%"><?php  echo t('useonairguide') ?></td>
+
 </tr><?php
     foreach ($channels as $chanid) {
         $channel =& Channel::find($chanid);
@@ -39 +42 @@
     <td><input type="text" size="5"  name="channel[<?php echo $channel->chanid ?>][xmltvid]"       id="xmltvid_<?php      echo $channel->chanid ?>" value="<?php echo html_entities($channel->xmltvid)      ?>" style="text-align: center" /></td>
     <td><input type="text" size="5"  name="channel[<?php echo $channel->chanid ?>][channum]"       id="channum_<?php      echo $channel->chanid ?>" value="<?php echo html_entities($channel->channum)      ?>" style="text-align: center" /></td>
     <td><input type="text" size="10" name="channel[<?php echo $channel->chanid ?>][callsign]"      id="callsign_<?php     echo $channel->chanid ?>" value="<?php echo html_entities($channel->callsign)     ?>" /></td>
-    <td><input type="text" size="27" name="channel[<?php echo $channel->chanid ?>][name]"          id="name_<?php         echo $channel->chanid ?>" value="<?php echo html_entities($channel->name) ?>" /></td>
+    <td><input type="text" size="27" name="channel[<?php echo $channel->chanid ?>][name]"          id="name_<?php         echo $channel->chanid ?>" value="<?php echo html_entities($channel->name)         ?>" /></td>
+    <td><input type="text" size="3"  name="channel[<?php echo $channel->chanid ?>][mplexid]"       id="mplexid_<?php      echo $channel->chanid ?>" value="<?php echo html_entities($channel->mplexid)      ?>" style="text-align: center" /></td>
+    <td><input type="text" size="3"  name="channel[<?php echo $channel->chanid ?>][serviceid]"     id="serviceid_<?php    echo $channel->chanid ?>" value="<?php echo html_entities($channel->serviceid)    ?>" style="text-align: center" /></td>
+    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][visible]"       value="1"<?php if (!empty($channel->visible))       echo ' CHECKED' ?> /></td>
+    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][useonairguide]" value="1"<?php if (!empty($channel->useonairguide)) echo ' CHECKED' ?> /></td>
+    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][commfree]"      value="1"<?php if (!empty($channel->commmethod) && $channel->commmethod == -2)      echo ' CHECKED'      ?> /></td>
+    <td><input type="text" size="2"  name="channel[<?php echo $channel->chanid ?>][recpriority]"   id="recpriority_<?php  echo $channel->chanid ?>" value="<?php echo html_entities($channel->recpriority)  ?>" style="text-align: center" /></td>
     <td><input type="text" size="3"  name="channel[<?php echo $channel->chanid ?>][freqid]"        id="freqid_<?php       echo $channel->chanid ?>" value="<?php echo html_entities($channel->freqid)       ?>" style="text-align: center" /></td>
     <td><input type="text" size="3"  name="channel[<?php echo $channel->chanid ?>][finetune]"      id="finetune_<?php     echo $channel->chanid ?>" value="<?php echo html_entities($channel->finetune)     ?>" style="text-align: center" /></td>
     <td><input type="text" size="3"  name="channel[<?php echo $channel->chanid ?>][videofilters]"  id="videofilters_<?php echo $channel->chanid ?>" value="<?php echo html_entities($channel->videofilters) ?>" style="text-align: center" /></td>
@@ -47 +56 @@
     <td><input type="text" size="5"  name="channel[<?php echo $channel->chanid ?>][contrast]"      id="contrast_<?php     echo $channel->chanid ?>" value="<?php echo html_entities($channel->contrast)     ?>" style="text-align: center" /></td>
     <td><input type="text" size="5"  name="channel[<?php echo $channel->chanid ?>][colour]"        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="channel[<?php echo $channel->chanid ?>][hue]"           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="channel[<?php echo $channel->chanid ?>][recpriority]"   id="recpriority_<?php  echo $channel->chanid ?>" value="<?php echo html_entities($channel->recpriority)  ?>" style="text-align: center" /></td>
-    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][commfree]"      value="1"<?php if (!empty($channel->commmethod) && $channel->commmethod == -2)      echo ' CHECKED' ?> /></td>
-    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][visible]"       value="1"<?php if (!empty($channel->visible))       echo ' CHECKED' ?> /></td>
-    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][useonairguide]" value="1"<?php if (!empty($channel->useonairguide)) echo ' CHECKED' ?> /></td>
 </tr><?php
     }
 ?>

mythplugins/mythweb/modules/tv/tmpl/lite/set_channels.php

@@ -19 +19 @@
     <td width="5%"><a href="<?php echo form_action ?>?sortby=channum"><?php  echo t('channum') ?></a></td>
     <td width="5%"><a href="<?php echo form_action ?>?sortby=callsign"><?php echo t('callsign') ?></a></td>
     <td width="5%"><a href="<?php echo form_action ?>?sortby=name"><?php     echo t('name') ?></a></td>
+    <td width="5%"><?php  echo t('mplexid')       ?></td>
+    <td width="5%"><?php  echo t('serviceid')     ?></td>
+    <td width="5%"><?php  echo t('visible')       ?></td>
+    <td width="5%"><?php  echo t('useonairguide') ?></td>
+    <td width="5%"><?php  echo t('commfree')      ?></td>
+    <td width="5%"><?php  echo t('recpriority')   ?></td>
     <td width="5%"><a href="<?php echo form_action ?>?sortby=freqid"><?php   echo t('freqid') ?></a></td>
     <td width="5%"><?php  echo t('finetune')      ?></td>
     <td width="5%"><?php  echo t('videofilters')  ?></td>
@@ -26 +32 @@
     <td width="7%"><?php  echo t('contrast')      ?></td>
     <td width="7%"><?php  echo t('color')         ?></td>
     <td width="7%"><?php  echo t('hue')           ?></td>
-    <td width="5%"><?php  echo t('recpriority')   ?></td>
-    <td width="5%"><?php  echo t('commfree')      ?></td>
-    <td width="5%"><?php  echo t('visible')       ?></td>
-    <td width="5%"><?php  echo t('useonairguide') ?></td>
 </tr><?php
     foreach ($channels as $chanid) {
         $channel =& Channel::find($chanid);
@@ -40 +42 @@
     <td><input type="text" size="3"  name="channel[<?php echo $channel->chanid ?>][channum]"       id="channum_<?php      echo $channel->chanid ?>" value="<?php echo html_entities($channel->channum)      ?>" style="text-align: center" /></td>
     <td><input type="text" size="10" name="channel[<?php echo $channel->chanid ?>][callsign]"      id="callsign_<?php     echo $channel->chanid ?>" value="<?php echo html_entities($channel->callsign)     ?>" /></td>
     <td><input type="text" size="27" name="channel[<?php echo $channel->chanid ?>][name]"          id="name_<?php         echo $channel->chanid ?>" value="<?php echo html_entities($channel->name) ?>" /></td>
+    <td><input type="text" size="3"  name="channel[<?php echo $channel->chanid ?>][mplexid]"       id="mplexid_<?php      echo $channel->chanid ?>" value="<?php echo html_entities($channel->mplexid)      ?>" style="text-align: center" /></td>
+    <td><input type="text" size="3"  name="channel[<?php echo $channel->chanid ?>][serviceid]"     id="serviceid_<?php    echo $channel->chanid ?>" value="<?php echo html_entities($channel->serviceid)    ?>" style="text-align: center" /></td>
+    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][visible]"       value="1"<?php if (!empty($channel->visible))       echo ' CHECKED' ?> /></td>
+    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][useonairguide]" value="1"<?php if (!empty($channel->useonairguide)) echo ' CHECKED' ?> /></td>
+    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][commfree]"      value="1"<?php if (!empty($channel->commmethod) && $channel->commmethod == -2)      echo ' CHECKED' ?> /></td>
+    <td><input type="text" size="2"  name="channel[<?php echo $channel->chanid ?>][recpriority]"   id="recpriority_<?php  echo $channel->chanid ?>" value="<?php echo html_entities($channel->recpriority)  ?>" style="text-align: center" /></td>
     <td><input type="text" size="3"  name="channel[<?php echo $channel->chanid ?>][freqid]"        id="freqid_<?php       echo $channel->chanid ?>" value="<?php echo html_entities($channel->freqid)       ?>" style="text-align: center" /></td>
     <td><input type="text" size="3"  name="channel[<?php echo $channel->chanid ?>][finetune]"      id="finetune_<?php     echo $channel->chanid ?>" value="<?php echo html_entities($channel->finetune)     ?>" style="text-align: center" /></td>
     <td><input type="text" size="3"  name="channel[<?php echo $channel->chanid ?>][videofilters]"  id="videofilters_<?php echo $channel->chanid ?>" value="<?php echo html_entities($channel->videofilters) ?>" style="text-align: center" /></td>
@@ -47 +55 @@
     <td><input type="text" size="5"  name="channel[<?php echo $channel->chanid ?>][contrast]"      id="contrast_<?php     echo $channel->chanid ?>" value="<?php echo html_entities($channel->contrast)     ?>" style="text-align: center" /></td>
     <td><input type="text" size="5"  name="channel[<?php echo $channel->chanid ?>][colour]"        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="channel[<?php echo $channel->chanid ?>][hue]"           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="channel[<?php echo $channel->chanid ?>][recpriority]"   id="recpriority_<?php  echo $channel->chanid ?>" value="<?php echo html_entities($channel->recpriority)  ?>" style="text-align: center" /></td>
-    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][commfree]"      value="1"<?php if (!empty($channel->commmethod) && $channel->commmethod == -2)      echo ' CHECKED' ?> /></td>
-    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][visible]"       value="1"<?php if (!empty($channel->visible))       echo ' CHECKED' ?> /></td>
-    <td><input type="checkbox"       name="channel[<?php echo $channel->chanid ?>][useonairguide]" value="1"<?php if (!empty($channel->useonairguide)) echo ' CHECKED' ?> /></td>
 </tr><?php
     }
 ?>