fix missing page headers on democratic playlist, also show the voters

1 files changed, 27 insertions, 18 deletions

diff --git a/templates/show_democratic_playlist.inc.php b/templates/show_democratic_playlist.inc.php
index 50fb5cdc..5bd34434 100644
--- a/templates/show_democratic_playlist.inc.php
+++ b/templates/show_democratic_playlist.inc.php
@@ -20,6 +20,7 @@
 */
 $web_path = Config::get('web_path');
 ?>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <colgroup>
   <col id="col_action" />
@@ -37,12 +38,12 @@ if (!count($object_ids)) {
 	$playlist = new Playlist($democratic->base_playlist);
 ?>
 <tr>
-	<td>
-		<?php echo _('Playing from base Playlist'); ?>: 
-		<a href="<?php echo $web_path; ?>/playlist.php?action=show_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
-		<?php echo scrub_out($playlist->name); ?>
-		</a>
-	</td>
+<td>
+	<?php echo _('Playing from base Playlist'); ?>: 
+	<a href="<?php echo $web_path; ?>/playlist.php?action=show_playlist&amp;playlist_id=<?php echo $playlist->id; ?>">
+	<?php echo scrub_out($playlist->name); ?>
+	</a>
+</td>
 </tr>
 <?php
 } // if no songs
@@ -63,24 +64,31 @@ else {
 <?php 
 $democratic = Democratic::get_current_playlist(); 
 $democratic->set_parent(); 
-foreach($object_ids as $row_id=>$object_data) { 
-	$song = new Song($object_data['0']);
-	$song->format();
+foreach($object_ids as $row_id=>$data) { 
+	$media = new $data['object_type']($data['object_id']);
+	$media->format();
+	$voters = $democratic->get_voters($row_id); 
+	$voters_string = ''; 
+	foreach ($voters as $client_id) { 
+		$client = new User($client_id); 
+		$voters_string .= $client->fullname . ','; 
+	} 
+	$voters_string = rtrim($voters_string,','); 
 ?>
 <tr class="<?php echo flip_class(); ?>">
 	<td class="cel_action">
-	<?php if ($democratic->has_vote($song->id)) { ?>
+	<?php if ($democratic->has_vote($media->id)) { ?>
 	<?php echo Ajax::button('?page=democratic&action=delete_vote&row_id=' . $row_id,'delete',_('Remove Vote'),'remove_vote_' . $row_id); ?>
 	<?php } else { ?>
-	<?php echo Ajax::button('?page=democratic&action=add_vote&object_id=' . $song->id . '&type=' . scrub_out($object_data['1']),'tick',_('Add Vote'),'remove_vote_' . $row_id); ?>
+	<?php echo Ajax::button('?page=democratic&action=add_vote&object_id=' . $media->id . '&type=' . scrub_out($data['object_type']),'tick',_('Add Vote'),'remove_vote_' . $row_id); ?>
 	<?php } ?>
 	</td>
-	<td class="cel_votes"><?php echo scrub_out($democratic->get_vote($row_id)); ?></td>
-	<td class="cel_title"><?php echo $song->f_link; ?></td>
-	<td class="cel_album"><?php echo $song->f_album_link; ?></td>
-	<td class="cel_artist"><?php echo $song->f_artist_link; ?></td>
-	<td class="cel_time"><?php echo $song->f_time; ?></td>
-	<?php if ($GLOBALS['user']->has_access(100)) { ?>
+	<td class="cel_votes" >(<?php echo scrub_out($democratic->get_vote($row_id)); ?>) <span class="information"><?php echo scrub_out($voters_string); ?></span></td>
+	<td class="cel_title"><?php echo $media->f_link; ?></td>
+	<td class="cel_album"><?php echo $media->f_album_link; ?></td>
+	<td class="cel_artist"><?php echo $media->f_artist_link; ?></td>
+	<td class="cel_time"><?php echo $media->f_time; ?></td>
+	<?php if (Access::check('interface','100')) { ?>
 	<td class="cel_admin">
 	<?php echo Ajax::button('?page=democratic&action=delete&row_id=' . $row_id,'disable',_('Delete'),'delete_row_' . $row_id); ?>
 	</td>
@@ -96,7 +104,7 @@ foreach($object_ids as $row_id=>$object_data) {
 	<th class="cel_album"><?php echo _('Album'); ?></th>
 	<th class="cel_artist"><?php echo _('Artist'); ?></th>
 	<th class="cel_time"><?php echo _('Time'); ?></th>
-	<?php if ($GLOBALS['user']->has_access(100)) { ?>
+	<?php if (Access::check('interface','100')) { ?>
 	<th class="cel_admin"><?php echo _('Admin'); ?></th>
 	<?php } ?>
 </tr>
@@ -104,3 +112,4 @@ foreach($object_ids as $row_id=>$object_data) {
 } // end else
 ?>
 </table>
+<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>