diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-01-03 16:33:05 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-01-03 16:33:05 +0000 |
| commit | 03e21ae8a7e2f7eda1a34778cf91462b63f2e226 (patch) | |
| tree | 490ae8a0bc57a9871350c96c1eb55c92d2e639ec /templates | |
| parent | 22f36cbf688ec66c09ad7e3c6a50a54cea38c2af (diff) | |
| download | ampache-03e21ae8a7e2f7eda1a34778cf91462b63f2e226.tar.gz ampache-03e21ae8a7e2f7eda1a34778cf91462b63f2e226.tar.bz2 ampache-03e21ae8a7e2f7eda1a34778cf91462b63f2e226.zip | |
fix showing songs?
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_songs.inc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/templates/show_songs.inc b/templates/show_songs.inc index 21c69525..db69d7e4 100644 --- a/templates/show_songs.inc +++ b/templates/show_songs.inc @@ -25,7 +25,7 @@ $web_path = conf('web_path'); $username = $GLOBALS['user']->username; /* If it's a playlist and they've got rights */ -if (isset($playlist_id) && ($GLOBALS['user']->username == $playlist->user || $GLOBALS['user']->has_access('100'))) { +if (is_object($playlist) && ($GLOBALS['user']->username == $playlist->user || $GLOBALS['user']->has_access('100'))) { $tab = 1; $playlist_owner = true; } @@ -64,15 +64,17 @@ if (isset($playlist_id) && ($GLOBALS['user']->username == $playlist->user || $GL else { $song = new Song(); $song->title = 'Dynamic Song'; + $track_id = $song_id['id']; } - $song_id = $song_id['id']; } // end if playlist elseif (!is_object($song_id)) { unset($text_class); $song = new Song($song_id); + $track_id = $song->id; } else { $song = $song_id; + $track_id = $song->id; } @@ -87,19 +89,16 @@ if (isset($playlist_id) && ($GLOBALS['user']->username == $playlist->user || $GL <td align="center"> <input type="checkbox" name="song[]" value="<?php echo $song->id; ?>" id="song_<?php echo $song->id; ?>" /> </td> - <?php - if (isset($playlist_id) && $playlist_id != 0 && ($user->username == $pluser->username || $user->has_access('100'))) { - $tracknum = get_playlist_track_from_song($playlist_id, $song->id); - ?> + <?php + if (is_object($playlist) && ($GLOBALS['user']->username == $playlist->user || $GLOBALS['user']->has_access('100'))) { + /* $tracknum = $playlist->get_track($track_id); */ + ?> <td> - <input type="text" tabindex="<?php echo $tab; ?>" size="3" name="<?php echo "tr_" . $song->id; ?>" value="<?php echo $tracknum ?>" onchange="<?php echo "document.getElementById('song_" . $song->id . "').checked='checked';"; ?>" /> + <input type="text" tabindex="<?php echo $tab; ?>" size="3" name="<?php echo "tr_" . $song->id; ?>" value="<?php echo $tracknum ?>" onchange="<?php echo "document.getElementById('song_" . $track_id . "').checked='checked';"; ?>" /> </td> - <?php - $tab++; - } - ?> + <?php $tab++; } ?> <td> - <a href="<?php echo $web_path; ?>/song.php?action=m3u&song=<?php echo $song->id; ?>" title="<?php echo htmlspecialchars($song->title); ?>" <?php echo $text_class; ?>><?php echo htmlspecialchars($song->f_title); ?></a> + <a href="<?php echo $web_path; ?>/song.php?action=m3u&song=<?php echo $song->id; ?>" title="<?php echo scrub_out($song->title); ?>" <?php echo $text_class; ?>><?php echo scrub_out($song->f_title); ?></a> </td> <td> <a href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo htmlspecialchars($song->artist); ?>" title="<?php echo htmlspecialchars($song->f_artist_full); ?>" <?php echo $text_class; ?>><?php echo htmlspecialchars($song->f_artist); ?></a> |