Ticket #7032: mythweb_playgroup_select.diff

mythplugins/mythweb/modules/tv/classes/Schedule.php

@@ -388 +388 @@
 /**
  * prints a <select> of the various playback groups available
 /**/
-    function playgroup_select($this_playgroup, $name = 'playgroup', $id = NULL, $js = NULL)     {
+    function playgroup_select($this_playgroup, $name = 'playgroup', &$schedule = NULL, $id = NULL, $js = NULL) {
     // Make sure we have some data
         static $playgroups = array();
         if (!count($playgroups)) {
             global $db;
-            $sh = $db->query('SELECT name FROM playgroup ORDER BY name');
+            $sh = $db->query('SELECT name FROM playgroup ORDER BY name = "Default" DESC, name');
             while (list($group) = $sh->fetch_row()) {
                 $playgroups[] = $group;
             }
             $sh->finish();
         }
+    // Do PlayGroup titlematch
+        if (count($playgroups) > 1 && empty($this_playgroup) && is_object($schedule)) {
+            $this_playgroup =& $schedule->this_playgroup;
+            $sh = $db->query('SELECT DISTINCT name FROM playgroup
+                              WHERE name = ? OR name = ? OR (titlematch <> "" AND ? REGEXP titlematch)
+                              ORDER BY titlematch DESC',
+                             $schedule->title, $schedule->category, $schedule->title);
+            if (list($grp) = $sh->fetch_row())
+                $this_playgroup = $grp;
+            $sh->finish();
+        }
+        if (empty($this_playgroup))
+            $this_playgroup = 'Default';
     // Print the actual select
         echo "<select name=\"$name\"";
         if ($id)

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

@@ -57 +57 @@
                 <dt><?php echo t('Storage Group') ?>:</dt>
                 <dd><?php storagegroup_select($schedule->storagegroup) ?></dd>
                 <dt><?php echo t('Playback Group') ?>:</dt>
-                <dd><?php playgroup_select($schedule->playgroup, 'playgroup') ?></dd>
+                <dd><?php playgroup_select($schedule->playgroup, 'playgroup', $schedule) ?></dd>
                 <dt><?php echo t('Recording Priority') ?>:</dt>
                 <dd><select name="recpriority"><?php
                     for ($i=99; $i>=-99; --$i) {

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

@@ -19 +19 @@
 <table border="0" cellspacing="0" cellpadding="0">
 <tr class="x-sep">
     <th><?php echo t('Edit existing group') ?>:</th>
-    <td><?php playgroup_select($group['name'], 'playgroup', NULL, '$(\'chg_grp_form\').submit()') ?>
+    <td><?php playgroup_select($group['name'], 'playgroup', NULL, NULL, '$(\'chg_grp_form\').submit()') ?>
         <noscript><input type="submit" class="submit" value="<?php echo t('Edit') ?>"></noscript></td>
     <td><input type="submit" class="submit" name="new_group" value="<?php echo t('New Group') ?>"></td>
 </tr>