From df348122a7092a24a4ae5c04cf0b5b85bd750ae0 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Wed, 22 Aug 2007 05:36:07 +0000
Subject: added the initial playlist view page, fixed the artist name on albums
 of the moment

---
 lib/class/album.class.php    | 6 ++++--
 lib/class/playlist.class.php | 4 ++--
 lib/class/user.class.php     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index dc42aa2d..f19d26cc 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -215,10 +215,12 @@ class Album {
 		$this->f_title		= $name; 
 		if ($this->artist_count == '1') { 
 			$artist = scrub_out(truncate_with_ellipsis(trim($this->artist_prefix . ' ' . $this->artist_name),Config::get('ellipsis_threshold_album')));
-		        $this->f_artist	= "<a href=\"$web_path/artists.php?action=show&amp;artist=" . $this->artist_id . "\">" . $artist . "</a>";
+		        $this->f_artist_link = "<a href=\"$web_path/artists.php?action=show&amp;artist=" . $this->artist_id . "\">" . $artist . "</a>";
+			$this->f_artist = $artist; 
 		}
 		else {
-			$this->f_artist = "<div title=\"$this->artist_count " . _('Artists') . "\">" . _('Various') . "</div>"; 
+			$this->f_artist_link = "<div title=\"$this->artist_count " . _('Artists') . "\">" . _('Various') . "</div>"; 
+			$this->f_artist = _('Various');
 		}
 
 		if ($this->year == '0') { 
diff --git a/lib/class/playlist.class.php b/lib/class/playlist.class.php
index 493e335a..fcc7f028 100644
--- a/lib/class/playlist.class.php
+++ b/lib/class/playlist.class.php
@@ -108,7 +108,7 @@ class Playlist {
 
 		$results = array(); 
 
-		$sql = "SELECT `object_id`,`object_type`,`dynamic_song` FROM `playlist_data` WHERE `playlist`='" . Dba::escape($this->id) . "' ORDER BY `track`";
+		$sql = "SELECT `object_id`,`object_type`,`dynamic_song`,`track` FROM `playlist_data` WHERE `playlist`='" . Dba::escape($this->id) . "' ORDER BY `track`";
 		$db_results = Dba::query($sql);
 
 		while ($row = Dba::fetch_assoc($db_results)) { 
@@ -117,7 +117,7 @@ class Playlist {
 				// Do something here FIXME!
 			} 
 
-			$results[] = array('type'=>$row['object_type'],'object_id'=>$row['object_id']); 
+			$results[] = array('type'=>$row['object_type'],'object_id'=>$row['object_id'],'track'=>$row['track']); 
 		} // end while
 
 		return $results;
diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index ca74badf..9ecc247a 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -568,7 +568,7 @@ class User {
 		$last_song = new Song($data['object_id']); 
 		if ($data['date']+($song_info->time/2) >= time()) { 
 			debug_event('Stats','Not collecting stats less then 50% of song has elapsed','3'); 
-			return false; 
+			return false;
 		} 
 
 		// Check if lastfm is loaded, if so run the update
-- 
cgit