fixed catalog update bug

2 files changed, 101 insertions, 6 deletions

diff --git a/templates/show_edit_song.inc.php b/templates/show_edit_song.inc.php
new file mode 100644
index 00000000..b39651b0
--- /dev/null
+++ b/templates/show_edit_song.inc.php
@@ -0,0 +1,95 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+?>
+
+<p class="header1"><?php echo _('Edit Song'); ?></p>
+
+<form name="edit_song" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/flag.php">
+<table>
+<tr class="<?php echo flip_class(); ?>">
+	<td><?php echo _('File'); ?>:</td>
+	<td><?php echo scrub_out($song->file); ?></td>
+</tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td><?php echo _('Title'); ?></td>
+	<td>
+		<input type="textbox" name="title" value="<?php echo scrub_out($song->title); ?>" size="45" />
+	</td>
+</tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td><?php echo _('Album'); ?></td>
+	<td>
+		<?php show_album_select('album',$song->album); ?>
+		<br /><?php echo _('OR'); ?><br />
+		<input type="textbox" name="album_string" value="<?php echo scrub_out($song->get_album_name()); ?>" />
+	</td>
+</tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td><?php echo _('Artist'); ?></td>
+	<td>
+		<?php show_artist_select('artist',$song->artist); ?>
+		<br /><?php echo _('OR'); ?><br />
+		<input type="textbox" name="artist_string" value="<?php echo scrub_out($song->get_artist_name()); ?>" />
+	</td>
+</tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td><?php echo _('Genre'); ?></td>
+	<td>
+		<?php show_genre_select('genre',$song->genre); ?>
+		<br /><?php echo _('OR'); ?><br />
+		<input type="textbox" name="genre_string" value="<?php echo scrub_out($song->get_genre_name()); ?>" />
+	</td>
+</tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td><?php echo _('Track'); ?></td>
+	<td>
+		<input type="textbox" name="track" value="<?php echo scrub_out($song->track); ?>" size="3" />
+	</td>
+</tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td><?php echo _('Year'); ?></td>
+	<td>
+		<input type="textbox" name="year" value="<?php echo scrub_out($song->year); ?>" size="5" />
+	</td>
+</tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td><?php echo _('Comment'); ?></td>
+	<td>
+		<input type="textbox" name="comment" value="<?Php echo scrub_out($song->comment); ?>" size="45" />
+	</td>
+</tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td>&nbsp;</td>
+	<td>
+		<input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo _('Flag for Retagging'); ?>
+	</td>
+</tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td>&nbsp;</td>
+	<td>
+		<input type="hidden" name="song_id" value="<?php echo $song->id; ?>" />
+		<input type="hidden" name="action" value="edit_song" />
+		<input type="submit" value="<?php echo _('Update Song'); ?>" />
+	</td>
+</tr>
+</table>
+</form>
diff --git a/templates/show_songs.inc b/templates/show_songs.inc
index df1bfeba..5a474b0e 100644
--- a/templates/show_songs.inc
+++ b/templates/show_songs.inc
@@ -118,20 +118,20 @@ foreach ($song_ids as $song_id) {
 		<?php echo $song->f_genre; ?>
 	</td>
 	<td>
-		<a href="<?php echo $web_path; ?>/flag.php?action=show_flag&amp;type=song&amp;id=<?php echo $song->id; ?>">Flag</a>
+		<a href="<?php echo $web_path; ?>/flag.php?action=show_flag&amp;type=song&amp;id=<?php echo $song->id; ?>"><?php echo _('Flag'); ?></a>
 		<?php if ($GLOBALS['user']->has_access('100')) { ?>
-				| <a href="<?php echo $web_path; ?>/admin/song.php?action=edit&amp;song=<?php echo $song->id; ?>">Edit</a> | 
+				| <a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_song&amp;song=<?php echo $song->id; ?>"><?php echo _('Edit'); ?></a> | 
 				<?php if ($song->enabled) { ?>
-				<a href="<?php echo $web_path; ?>/admin/song.php?action=disable&amp;song_ids=<?php echo $song->id; ?>">Disable</a>
+				<a href="<?php echo $web_path; ?>/admin/flag.php?action=disable&amp;song_ids=<?php echo $song->id; ?>"><?php echo _('Disable'); ?></a>
 				<?php } else { ?>
-				<a href="<?php echo $web_path; ?>/admin/song.php?action=enabled&amp;song_ids=<?php echo $song->id; ?>">Enable</a>
+				<a href="<?php echo $web_path; ?>/admin/flag.php?action=enabled&amp;song_ids=<?php echo $song->id; ?>"><?php echo _('Enable'); ?></a>
 				<?php } //status ?>
 		<?php } //access ?>
 		<?php if ($GLOBALS['user']->prefs['download']) { ?>
-				| <a href="<?php echo $web_path; ?>/download/index.php?action=download&amp;song_id=<?php echo $song->id; ?>&amp;fn=<?php echo rawurlencode($song->f_artist_full . " - " . $song->title . "." . $song->type); ?>"><?php echo _("Download"); ?></a>
+				| <a href="<?php echo $web_path; ?>/download/index.php?action=download&amp;song_id=<?php echo $song->id; ?>&amp;fn=<?php echo rawurlencode($song->f_artist_full . " - " . $song->title . "." . $song->type); ?>"><?php echo _('Download'); ?></a>
 		<?php } ?>
 		<?php if ($GLOBALS['user']->prefs['direct_link']) { ?>
-			| <a href="<?php echo $web_path; ?>/play/index.php?song=<?php echo $song->id; ?>&amp;uid=<?php echo $GLOBALS['user']->username . "&amp;sid=" . session_id(); ?>&amp;fn=<?php echo rawurlencode($song->f_artist_full . " - " . $song->title . "." . $song->type); ?>"><?php echo _("Direct Link"); ?></a>
+			| <a href="<?php echo $web_path; ?>/play/index.php?song=<?php echo $song->id; ?>&amp;uid=<?php echo $GLOBALS['user']->username . "&amp;sid=" . session_id(); ?>&amp;fn=<?php echo rawurlencode($song->f_artist_full . " - " . $song->title . "." . $song->type); ?>"><?php echo _('Direct Link'); ?></a>
 		<?php } ?>
 	</td>
 	<?php if(conf('ratings')) { ?>