diff options
| -rwxr-xr-x | docs/CHANGELOG | 2 | ||||
| -rw-r--r-- | server/democratic.ajax.php | 8 | ||||
| -rw-r--r-- | stream.php | 2 | ||||
| -rw-r--r-- | templates/show_manage_democratic.inc.php | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index eef5023d..3bd2a658 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,8 @@ -------------------------------------------------------------------------- v.3.4-Beta2 + - Fixed problem where democratic play wouldn't send to localplay + and would just display a blank screen - Added Multi-Character Filter on browse pages - Fixed Flag Management Interface - Added Export Catalog to CSV diff --git a/server/democratic.ajax.php b/server/democratic.ajax.php index 90897a79..123bd3c5 100644 --- a/server/democratic.ajax.php +++ b/server/democratic.ajax.php @@ -63,6 +63,14 @@ switch ($_REQUEST['action']) { ob_end_clean(); break; + case 'send_playlist': + if (!Access::check('interface','75')) { + exit; + } + + $_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=democratic'; + $results['rfc3514'] = '<script type="text/javascript">reload_util("'.$_SESSION['iframe']['target'].'")</script>'; + break; default: $results['rfc3514'] = '0x1'; break; @@ -146,7 +146,7 @@ switch ($_REQUEST['action']) { case 'democratic': $democratic = Democratic::get_current_playlist(); $urls[] = $democratic->get_url(); - $song_ids = array(); + $song_ids = array('0'); break; case 'download': $song_ids[] = $_REQUEST['song_id']; diff --git a/templates/show_manage_democratic.inc.php b/templates/show_manage_democratic.inc.php index c9612f23..8c5a88c0 100644 --- a/templates/show_manage_democratic.inc.php +++ b/templates/show_manage_democratic.inc.php @@ -44,7 +44,7 @@ show_box_top(_('Manage Democratic Playlists')); ?> <td><?php echo $playlist->f_link; ?></td> <td><?php echo $democratic->count_items(); ?></td> <td> - <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=democratic"><?php echo get_user_icon('all'); ?></a> + <?php echo Ajax::button('?page=democratic&action=send_playlist','all',_('Play'),'play_democratic'); ?> </td> </tr> <?php } if (!count($playlists)) { ?> |