* Fixed xmlrpc, hopefully

* Added min count filter to browse by artist
* Fixed ratings to show yours, not average if rated
* other misc fixes

14 files changed, 123 insertions, 265 deletions

diff --git a/albums.php b/albums.php
index d1ce647b..a2237875 100644
--- a/albums.php
+++ b/albums.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) 2001 - 2007 Ampache.org
  All Rights Reserved.
 
  This program is free software; you can redistribute it and/or
@@ -19,12 +19,10 @@
 
 */
 
-
-require_once('lib/init.php');
+require_once 'lib/init.php';
 
 show_template('header');
 
-
 // We'll set any input parameters here
 if(!isset($_REQUEST['match'])) { $_REQUEST['match'] = "Browse"; }
 if(isset($_REQUEST['match'])) $match = scrub_in($_REQUEST['match']);
@@ -38,7 +36,6 @@ if ($min_album_size == '') {
 
 $action = scrub_in($_REQUEST['action']); 
 
-
 /* Switch on Action */
 switch ($action) { 
 	case 'clear_art':
@@ -278,7 +275,7 @@ switch ($action) {
 	
 		if ($view->base_sql) { 
 			$albums = get_albums($view->sql);
-			show_albums($albums,$view);	
+			require conf('prefix') . '/templates/show_albums.inc.php';
 		}
 	
 	break;
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index c917a33d..c4b9e514 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,10 @@
 
 --------------------------------------------------------------------------
   v.3.4-Alpha1
+  	- Added min song count to Browse Artist, refercing min object count
+		preference
+  	- Fixed ratings so that it shows your rating if you've rated it
+		otherwise it shows an average rating
   	- Fixed Democratic Play newest votes of same total count first
 		(Order by vote time)
 	- Fixed a problem where config re-gen wouldn't update the current
diff --git a/lib/artist.lib.php b/lib/artist.lib.php
index f2857921..79440cd8 100644
--- a/lib/artist.lib.php
+++ b/lib/artist.lib.php
@@ -78,12 +78,19 @@ function show_artists ($match = '') {
 
         // If there isn't a view object we need to create a new one..
         else {
+
+		// Pull in the min object count
+		$min_object_count	= conf('min_object_count');
+		$min_join	= " LEFT JOIN song ON song.artist=artist.id"; 
+		$min_group	= "GROUP BY song.artist HAVING COUNT(song.id) > $min_object_count"; 
+
+
                 if ( isset($match) && $match != '' ) {
-                        $query = "SELECT id,name FROM artist " .
-                                " WHERE name LIKE '$match%' ";
+                        $query = "SELECT artist.id,artist.name FROM artist $min_join" .
+                                " WHERE artist.name LIKE '$match%' $min_group";
                 }
                 else {
-                        $query = "SELECT id FROM artist ";
+                        $query = "SELECT artist.id FROM `artist` $min_join $min_group";
                 }
 
                 $db_results = mysql_query($query, $dbh);
@@ -102,22 +109,20 @@ function show_artists ($match = '') {
                 $artists = $match;
                 $_SESSION['view_script'] = false;
         }
-
+debug_event('foo',$view->sql,'3');
         $db_results = mysql_query($view->sql, $dbh);
-        while ($r = @mysql_fetch_array($db_results)) {
-		//FIXME: This seriously needs to be updated to use the artist object
-                $artist_info = get_artist_info($r[0]);
-                $artist = format_artist($artist_info);
-		// Only Add this artist if there is information to go along with it
-		if ($artist_info) { 
-	                $artists[] = $artist;
-		}
+
+	// Get the artist object
+        while ($r = mysql_fetch_assoc($db_results)) {
+		$artist = new Artist($r['id']); 	
+		$artist->format(); 
+		$artists[] = $artist;
         }
 
         if (count($artists)) {
 		/* Ack horrible hack :( */
 		$GLOBALS['view'] = $view;
-                require ( conf('prefix') . "/templates/show_artists.inc");
+                require conf('prefix') . '/templates/show_artists.inc.php';
         }
 
 } // show_artists
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php
index fbbca4d1..c89eb271 100644
--- a/lib/class/artist.class.php
+++ b/lib/class/artist.class.php
@@ -176,14 +176,14 @@ class Artist {
 
 	} // get_count
 
-	/*!
-		@function format_artist
-        	@discussion this function takes an array of artist
-	                information and reformats the relevent values
-	                so they can be displayed in a table for example
-	                it changes the title into a full link.
-	*/
-	function format_artist() {
+	/**
+	 * format
+         * this function takes an array of artist
+	 * information and reformats the relevent values
+	 * so they can be displayed in a table for example
+	 * it changes the title into a full link.
+ 	 */
+	function format() {
 
 		/* Combine prefix and name, trim then add ... if needed */
                 $name = scrub_out(truncate_with_ellipse(trim($this->prefix . " " . $this->name)));
@@ -196,8 +196,21 @@ class Artist {
 	        $this->link = "<a href=\"" . conf('web_path') . "/artists.php?action=show&amp;artist=" . $this->id . "\" title=\"" . $this->full_name . "\">" . $name . "</a>";
 		$this->name = $this->link;
 
+		// Get the counts 
+		$this->get_count(); 
+
 		return true; 
 
+	} // format
+
+	/** 
+	 * format_artist
+	 * DEFUNCT, do not use anymore
+	 */
+	function format_artist() { 
+
+		$this->format(); 
+
 	} // format_artist
 	
         /*!
diff --git a/lib/class/rating.class.php b/lib/class/rating.class.php
index e79ea0ef..32a85253 100644
--- a/lib/class/rating.class.php
+++ b/lib/class/rating.class.php
@@ -1,13 +1,12 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) 2001 - 2007 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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -44,12 +43,15 @@ class Rating {
 		$this->id 	= intval($id);
 		$this->type 	= sql_escape($type);
 
-		if (intval($id) > 1) { 
+		// Check for the users rating
+		if ($rating = $this->get_user($GLOBALS['user']->id)) { 
+			$this->rating = $rating;
+		} 
+		else { 
 			$this->get_average();
 		}
-		else {
-			$this->rating='0';
-		}
+	
+		return true; 
 
 	} // Rating
 
@@ -58,11 +60,11 @@ class Rating {
 	 * Get the user's rating this is based off the currently logged
 	 * in user. It returns the value
 	 */
-	function get_user($username) { 
+	function get_user($user_id) { 
 
-		$username = sql_escape($username);
+		$user_id	= sql_escape($user_id); 
 
-		$sql = "SELECT rating FROM ratings WHERE user='$username' AND object_id='$this->id' AND object_type='$this->type'";
+		$sql = "SELECT rating FROM ratings WHERE user='$user_id' AND object_id='$this->id' AND object_type='$this->type'";
 		$db_results = mysql_query($sql, dbh());
 		
 		$results = mysql_fetch_assoc($db_results);
diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index c03a3969..a14863a5 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -1,13 +1,12 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) 2001 - 2007 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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,7 +24,6 @@
 
 */
 
-
 class User {
 
 	//Basic Componets
@@ -247,7 +245,8 @@ class User {
 
 			/* Find everything they've rated at 4+ */
 			$sql = "SELECT object_id,user_rating FROM ratings " . 
-				"WHERE user='" . sql_escape($user_id) . "' AND user_rating >='4' AND object_type = '" . sql_escape($type) . "' ORDER BY user_rating DESC"; 
+				"WHERE user='" . sql_escape($user_id) . "' AND user_rating >='4' AND " . 
+				"object_type = '" . sql_escape($type) . "' ORDER BY user_rating DESC"; 
 			$db_results = mysql_query($sql,dbh()); 
 
 			while ($r = mysql_fetch_assoc($db_results)) { 
@@ -470,8 +469,8 @@ class User {
 	function update_access($new_access) { 
 
 		/* Prevent Only User accounts */
-		if ($new_access == '25') { 
-			$sql = "SELECT username FROM user WHERE (access='admin' OR access='100') AND username != '$this->username'";
+		if ($new_access < '100') { 
+			$sql = "SELECT `id` FROM user WHERE `access`='100' AND `id` != '$this->id'";
 			$db_results = mysql_query($sql, dbh());
 			if (!mysql_num_rows($db_results)) { return false; }
 		}
@@ -500,8 +499,7 @@ class User {
 	function update_stats($song_id) {
 
 		$song_info = new Song($song_id);
-		//FIXME:: User uid reference
-		$user = $this->uid;
+		$user = $this->id;
 		
 		if (!$song_info->file) { return false; }
 
@@ -603,8 +601,9 @@ class User {
 		@discussion updates a users password
 	*/
 	function update_password($new_password) { 
-		
-		$sql = "UPDATE user SET password=PASSWORD('$new_password') WHERE username='$this->username'";
+
+		$new_password = sql_escape($new_password);
+		$sql = "UPDATE user SET password=PASSWORD('$new_password') WHERE `id`='$this->id'";
 		$db_results = mysql_query($sql, dbh());
 
 		return true;
@@ -628,7 +627,7 @@ class User {
 
 		/* Calculate their total Bandwidth Useage */
 		$sql = "SELECT song.size FROM song LEFT JOIN object_count ON song.id=object_count.object_id " . 
-			"WHERE object_count.user='$this->uid' AND object_count.object_type='song'";
+			"WHERE object_count.user='$this->id' AND object_count.object_type='song'";
 		$db_results = mysql_query($sql, dbh());
 
 		while ($r = mysql_fetch_assoc($db_results)) { 
@@ -959,7 +958,7 @@ class User {
 	*/
 	function delete_stats() { 
 
-		$sql = "DELETE FROM object_count WHERE userid='" . $this->username . "'";
+		$sql = "DELETE FROM object_count WHERE user='" . $this->id . "'";
 		$db_results = mysql_query($sql, dbh());
 
 	} // delete_stats
@@ -975,7 +974,7 @@ class User {
 		  admin
 		*/
 		if ($this->has_access(100)) { 
-			$sql = "SELECT username FROM user WHERE (access='admin' OR access='100') AND username !='" . sql_escape($this->username) . "'";
+			$sql = "SELECT `id` FROM user WHERE `access`='100' AND id !='" . sql_escape($this->id) . "'";
 			$db_results = mysql_query($sql, dbh());
 			if (!mysql_num_rows($db_results)) { 
 				return false;
@@ -983,22 +982,34 @@ class User {
 		} // if this is an admin check for others 
 
 		// Delete their playlists
-		$sql = "DELETE FROM playlist WHERE user='$this->username'";
+		$sql = "DELETE FROM playlist WHERE user='$this->id'";
 		$db_results = mysql_query($sql, dbh());
 
 		// Delete any stats they have
-		$sql = "DELETE FROM object_count WHERE userid='$this->username'";
+		$sql = "DELETE FROM object_count WHERE user='$this->id'";
 		$db_results = mysql_query($sql, dbh());
 
+		// Delete their ratings
+		$sql = "DELETE FROM `ratings` WHERE `user`='$this->id'";
+		$db_results = mysql_query($sql,dbh()); 
+
+		// Delete their tags
+		$sql = "DELETE FROM `tag_map` WHERE `user`='$this->id'";
+		$db_results = mysql_query($sql,dbh());
+
+		// Clean out the tags
+		$sql = "DELETE FROM `tags` USING `tag_map` LEFT JOIN `tag_map` ON tag_map.id=tags.map_id AND tag_map.id IS NULL";
+		$db_results = mysql_query($sql,dbh()); 
+
 		// Delete their preferences
-		$sql = "DELETE FROM preferences WHERE user='$this->username'";
+		$sql = "DELETE FROM preferences WHERE user='$this->id'";
 		$db_results = mysql_query($sql, dbh());
 
 		// Delete the user itself
-		$sql = "DELETE FROM user WHERE username='$this->username'";
+		$sql = "DELETE FROM user WHERE `id`='$this->id'";
 		$db_results = mysql_query($sql, dbh());
 
-		$sql = "DELETE FROM session WHERE username='$this->username'";
+		$sql = "DELETE FROM session WHERE username='" . sql_escape($this->username) . "'";
 		$db_results = mysql_query($sql, dbh());
 
 		return true;
@@ -1100,6 +1111,24 @@ class User {
 		
 	} // activate_user
 
+       /*!
+                @function is_xmlrpc
+                @discussion checks to see if this is a valid
+                        xmlrpc user
+        */
+        function is_xmlrpc() {
+
+                /* If we aren't using XML-RPC return true */
+                if (!conf('xml_rpc')) {
+                        return false;
+                }
+
+                //FIXME: Ok really what we will do is check the MD5 of the HTTP_REFERER
+                //FIXME: combined with the song title to make sure that the REFERER
+                //FIXME: is in the access list with full rights
+                return true;
+
+        } // is_xmlrpc
 	
 } //end user class
 
diff --git a/lib/init.php b/lib/init.php
index 6d8c9158..01d0c6c4 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -137,7 +137,6 @@ require_once(conf('prefix') . '/lib/themes.php');
 require_once(conf('prefix') . '/lib/stream.lib.php');
 require_once(conf('prefix') . '/lib/playlist.lib.php');
 require_once(conf('prefix') . '/lib/democratic.lib.php');
-require_once(conf('prefix') . '/modules/lib.php');
 require_once(conf('prefix') . '/modules/catalog.php');
 require_once(conf('prefix') . "/modules/id3/getid3/getid3.php");
 require_once(conf('prefix') . '/modules/id3/vainfo.class.php');
diff --git a/lib/rating.lib.php b/lib/rating.lib.php
index 676a37eb..ee589618 100644
--- a/lib/rating.lib.php
+++ b/lib/rating.lib.php
@@ -1,13 +1,12 @@
 <?php
 /*
 
- Copyright 2001 - 2006 Ampache.org
+ Copyright 2001 - 2007 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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/xmlrpc.php b/lib/xmlrpc.php
index 8e016f60..a0c3d2b8 100644
--- a/lib/xmlrpc.php
+++ b/lib/xmlrpc.php
@@ -1,13 +1,12 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) 2001 - 2007 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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -116,6 +115,7 @@ function remote_song_query($params) {
 	while ($r = mysql_fetch_object($db_results)) { 
 
 		$song 		= new Song($r->id);
+		$song->fill_ext_info(); 
 		$song->album 	= $song->get_album_name();
 		$song->artist 	= $song->get_artist_name();
 		$song->genre	= $song->get_genre_name();
diff --git a/modules/lib.php b/modules/lib.php
deleted file mode 100644
index 6e06d7f8..00000000
--- a/modules/lib.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/*
-
- Copyright (c) 2004 ampache.org
- All rights reserved.
-
- All of the main functions for Ampache.
- FIXME: Remove this file... shouldn't be used anymore
-
-*/
-
-// This function makes baby vollmer cry, need to fix
-//FIXME
-function get_artist_info ($artist_id) {
-
-	$dbh = dbh();
-
-	$sql = "SELECT * FROM artist WHERE id = '$artist_id'";
-	$db_result = mysql_query($sql, $dbh);
-	if ($info = mysql_fetch_array($db_result)) {
-		$sql = "SELECT COUNT(song.album) FROM song " .
-			" WHERE song.artist = '$artist_id'" .
-			" GROUP BY song.album";
-		$db_result = mysql_query($sql, $dbh);
-
-		$albums = 0;
-		$songs = 0;
-		while(list($song) = mysql_fetch_row($db_result)) {
-			$songs += $song;
-			$albums++;
-		}
-		$info['songs'] = $songs;
-		$info['albums'] = $albums;
-		//FIXME: Lame place to put this
-		//if ($songs < conf('min_artist_songs') || $albums < conf('min_artist_albums')) { 
-		//	return FALSE;
-		//}
-		return $info;
-	}
-	else {
-		return FALSE;
-	}
-}
-
-
-function get_album_name ($album, $dbh = 0) {
-
-	$album = new Album($album);
-	return $album->name;
-} // get_album_name
-
-
-function get_genre_info($genre_id) {
-
-	global $settings;
-	$dbh = dbh();
-
-	$sql = "SELECT name FROM genre WHERE id = '$genre_id'";
-	$db_result = mysql_query($sql, $dbh);
-
-	// if its -1 then we're doing all songs
-	if ( $genre_id < 0 ) {
-		$sql = "SELECT count(*) FROM song";
-	}
-	else {
-		$sql = "SELECT count(*) FROM song WHERE genre = '$genre_id'";
-	}
-
-	$genre_result = mysql_query($sql, $dbh);
-
-	$genre_count = mysql_fetch_row($genre_result);
-
-	$r = mysql_fetch_row($db_result);
-
-        // Crude hack for non-standard genre types
-	if ($genre_id == -1) {
-		return array('All', $genre_count[0]);
-	}
-	elseif ($genre_id == 0) {
-		return array('N/A', $genre_count[0]);
-	}
-	else {
-		return array($r[0], $genre_count[0]);
-	}
-}
-
-
-function get_genre($id) {
-
-	global $settings;
-	$dbh = dbh();
-
-	$query = "SELECT * FROM genre WHERE id = '$id'";
-	$db_result = mysql_query($query, $dbh);
-
-	$r = mysql_fetch_object($db_result);
-	return $r;
-}
-
-
-// Utility function to help move things along
-function get_song_info ($song, $dbh = 0) {
-	
-	$song = new Song($song);
-	return $song;
-	
-} // get_song_info
-
-
-/*!
-	@function show_albums
-	@discussion show many albums, uses view class
-*/
-function show_albums ($albums,$view=0) {
-
-	$dbh = libglue_param(libglue_param('dbh_name'));
-
-	if (!$view) {
-	        $view = new View($_SESSION['view_base_sql'], $_SESSION['script'], $total_items,$_SESSION['view_offset_limit']);
-	}
-
-	if ($albums) { 
-		require (conf('prefix') . "/templates/show_albums.inc");
-	}
-	else {
-		echo "<p><font color=\"red\">No Albums Found</font></p>";
-	}
-
-} // show_albums
-
-// Used to show a form with confirm action button on it (for deleting playlists, users, etc)
-/*!
-	@function show_confirm_action
-	@discussion shows a confirmation of an action, gives a YES/NO choice
-*/
-function show_confirm_action ($text, $script, $arg) {
-
-	$web_path = conf('web_path');
-	require (conf('prefix') . "/templates/show_confirm_action.inc.php");
-
-} // show_confirm_action
-
-
-function unhtmlentities ($string)  {
-
-	$trans_tbl = get_html_translation_table (HTML_ENTITIES);
-	$trans_tbl = array_flip ($trans_tbl);
-	$ret = strtr ($string, $trans_tbl);
-	return preg_replace('/&#(\d+);/me', "chr('\\1')",$ret);
-}
-
-?>
diff --git a/server/xmlrpc.server.php b/server/xmlrpc.server.php
index c7d0b36d..139a02c0 100644
--- a/server/xmlrpc.server.php
+++ b/server/xmlrpc.server.php
@@ -23,7 +23,6 @@
 define('NO_SESSION','1');
 require_once('../lib/init.php');
 
-
 if (conf('xml_rpc')) { 
 	require_once(conf('prefix') . "/modules/xmlrpc/xmlrpcs.inc");
 	require_once(conf('prefix') . "/modules/xmlrpc/xmlrpc.inc");
diff --git a/templates/show_albums.inc b/templates/show_albums.inc.php
index b24804b1..b24804b1 100644
--- a/templates/show_albums.inc
+++ b/templates/show_albums.inc.php
diff --git a/templates/show_artists.inc b/templates/show_artists.inc.php
index 4e2cef72..7b1176b6 100644
--- a/templates/show_artists.inc
+++ b/templates/show_artists.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) 2001 - 2007 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -18,11 +18,6 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-/*!
-	@header Show Artists
-	Shows multiple artists.... takes an array of artist objects
-
-*/
 $web_path = conf('web_path');
 
 // Build array of the table classes we are using
@@ -37,7 +32,7 @@ $total_items = $view->total_items;
 </tr>
 <tr class="table-header">
 	<td>
-		<a href="<?php echo $web_path; ?>/<?php echo $_SESSION['view_script']; ?>?action=<?php echo $_REQUEST['action']; ?>&amp;keep_view=true&amp;sort_type=artist.name&amp;sort_order=0"> <?php echo _("Artist"); ?> </a>
+		<a href="<?php echo $web_path; ?>/<?php echo $_SESSION['view_script']; ?>?action=<?php echo $_REQUEST['action']; ?>&amp;keep_view=true&amp;sort_type=artist.name&amp;sort_order=0"> <?php echo _('Artist'); ?> </a>
 	</td>
 	<td> <?php echo _('Songs');  ?> </td>
 	<td> <?php echo _('Albums'); ?> </td>
@@ -48,18 +43,18 @@ $total_items = $view->total_items;
 //FIXME: These should come in as objects...
 foreach ($artists as $artist) { ?>
 	<tr class="<?php echo flip_class(); ?>">
-		<td><?php echo $artist['name']; ?></td>
-		<td><?php echo $artist['songs']; ?></td>
-		<td><?php echo $artist['albums']; ?></td>	
+		<td><?php echo $artist->f_name; ?></td>
+		<td><?php echo $artist->songs; ?></td>
+		<td><?php echo $artist->albums; ?></td>	
 		<td nowrap="nowrap"> 
-			<a href="<?php echo $web_path; ?>/song.php?action=artist&amp;artist_id=<?php echo $artist['id']; ?>">
+			<a href="<?php echo $web_path; ?>/song.php?action=artist&amp;artist_id=<?php echo $artist->id; ?>">
 				<?php echo get_user_icon('all'); ?>	
 			</a> 
-			<a href="<?php echo $web_path; ?>/song.php?action=artist_random&amp;artist_id=<?php echo $artist['id']; ?>">
+			<a href="<?php echo $web_path; ?>/song.php?action=artist_random&amp;artist_id=<?php echo $artist->id; ?>">
 				<?php echo get_user_icon('random'); ?>
 			</a> 
 		<?php if ($GLOBALS['user']->has_access(100)) { ?>
-			<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_artist&amp;artist_id=<?php echo $artist['id']; ?>">
+			<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_artist&amp;artist_id=<?php echo $artist->id; ?>">
 				<?php echo get_user_icon('edit'); ?>
 			</a>
 		<?php } ?>
diff --git a/templates/show_confirm_action.inc.php b/templates/show_confirm_action.inc.php
deleted file mode 100644
index bef0e8db..00000000
--- a/templates/show_confirm_action.inc.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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.
-*/
-?>
-
-<br />
-<div class="text-box" style="margin-right:25%;text-align:center;margin-left:25%;">
-<form name="confirm" method="post" action="<?php echo $web_path; ?>/<?php echo $script; ?>?<?php echo $arg; ?>" enctype="multipart/form-data">
-	<p><?php echo $text; ?></p>
-	<p>
-		<input type="submit" name="confirm" value="<?php echo _("Yes"); ?>" />
-		<input type="submit" name="confirm" value="<?php echo _("No"); ?>" />
-	</p>
-</form>
-</div>