From 475f809d6c7d0c32fad01780aa9c8018705fd390 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Sun, 5 Feb 2006 19:49:22 +0000
Subject: fixed normlize playlist so it actually works, and added a delete
 action to the playlist screen thingy

---
 lib/playlist.lib.php                | 4 ++--
 templates/show_playlist_box.inc.php | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/playlist.lib.php b/lib/playlist.lib.php
index 2bf524b2..4dd54c5f 100644
--- a/lib/playlist.lib.php
+++ b/lib/playlist.lib.php
@@ -60,8 +60,8 @@ function show_playlists() {
  * runing get_items()
  */
 function show_playlist($playlist) {
-
-        /* Create the Playlist */
+        
+	/* Create the Playlist */
         $song_ids = $playlist->get_items();
 
 	show_playlist_menu();
diff --git a/templates/show_playlist_box.inc.php b/templates/show_playlist_box.inc.php
index e1ed7715..d010bc34 100644
--- a/templates/show_playlist_box.inc.php
+++ b/templates/show_playlist_box.inc.php
@@ -26,18 +26,20 @@
  */
 
 $web_path = conf('web_path'); 
+$playlist_id = scrub_out($_REQUEST['playlist_id']);
 ?>
 
 <table class="text-box"> <!-- Playlist Table -->
 <tr>
 	<td>
-		<span class="header1"><?php echo _('Playlist Actions'); ?></span><br /><br />
+		<span class="header1"><?php echo _('Playlist Actions'); ?></span><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/playlist.php?action=new"><?php echo _('Create New Playlist'); ?></a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/playlist.php"><?php echo _('View All Playlists'); ?></a><br />
 		&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/playlist.php?action=show_import_playlist"><?php echo _('Import From File'); ?></a><br />
 		<?php if ($_REQUEST['playlist_id']) { ?>
-		&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/playlist.php?action=normalize_tracks"><?php echo _('Normalize Tracks'); ?></a><br />
-		&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/song.php?action=play_selected&amp;playlist_id=<?php echo $_REQUEST['playlist_id']; ?>"><?php echo _('Play This Playlist'); ?></a><br />
+		&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/playlist.php?action=normalize_tracks&amp;playlist_id=<?php echo $playlist_id; ?>"><?php echo _('Normalize Tracks'); ?></a><br />
+		&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/song.php?action=play_selected&amp;playlist_id=<?php echo $playlist_id; ?>"><?php echo _('Play This Playlist'); ?></a><br />
+		&nbsp;&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/playlist.php?action=show_delete_playlist&amp;playlist_id=<?php echo $playlist_id; ?>"><?php echo _('Delete This Playlist'); ?></a><br />
 		<?php } ?>
 	</td>
 </tr>
-- 
cgit