From 4c53aa76672fef84895a8a7a34a4fdeba05a7f0a Mon Sep 17 00:00:00 2001 From: habarnam <> Date: Sun, 12 Apr 2009 16:11:51 +0000 Subject: [PATCH] * testing for errors before passing data to smarty --- web/album.php | 5 ++++- web/artist.php | 6 +++++- web/profile.php | 17 +++++++++++++---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/web/album.php b/web/album.php index 40030822..1d48c245 100644 --- a/web/album.php +++ b/web/album.php @@ -28,7 +28,10 @@ $album = new Album($_GET['album'], $_GET['artist']); $smarty->assign("name", $album->name); $smarty->assign("artist", $album->artist_name); -$smarty->assign("tracks", $album->getTracks()); +$aAlbumTracks = $album->getTracks(); +if (!PEAR::isError($aAlbumTracks )) { + $smarty->assign("tracks", $aAlbumTracks); +} $smarty->display("album.tpl"); diff --git a/web/artist.php b/web/artist.php index 5de6def3..3167127e 100644 --- a/web/artist.php +++ b/web/artist.php @@ -28,7 +28,11 @@ $artist = new Artist($_GET['artist']); $smarty->assign("name", $artist->name); $smarty->assign("bio_summary", $artist->bio_summary); -$smarty->assign("albums", $artist->getAlbums()); + +$aArtistAlbums = $artist->getAlbums(); +if (!PEAR::isError($aArtistAlbums)) { + $smarty->assign("albums", $aArtistAlbums); +} $smarty->display("artist.tpl"); diff --git a/web/profile.php b/web/profile.php index 39003370..7956fdaa 100644 --- a/web/profile.php +++ b/web/profile.php @@ -33,18 +33,27 @@ if(!isset($_GET['user']) && $logged_in == false) { $user = new User($_GET['user']); -if(isset($user->name)) { +if(isset($user->name)) { $smarty->assign('user', $user->name); $smarty->assign('email', $user->email); $smarty->assign('fullname', $user->fullname); $smarty->assign('bio', $user->bio); $smarty->assign('homepage', $user->homepage); $smarty->assign('location', $user->location); - $smarty->assign('scrobbles', $user->getScrobbles(20)); + $aUserScrobbles = $user->getScrobbles(20); + if (!PEAR::isError ($aUserScrobbles)) { + $smarty->assign('scrobbles', $aUserScrobbles); + } $smarty->assign('userlevel', $user->userlevel); $smarty->assign('avatar', $user->getAvatar()); - $smarty->assign('nowplaying', $user->getNowPlaying(10)); - $smarty->assign('user_tagcloud', TagCloud::GenerateTagCloud('Scrobbles', 'artist', 40, $user->name)); + $aUserNowPlaying = $user->getNowPlaying(10); + if (!PEAR::isError ($aUserNowPlaying)) { + $smarty->assign('nowplaying', $aUserNowPlaying); + } + $aUserTagCloud = TagCloud::GenerateTagCloud('Scrobbles', 'artist', 40, $user->name); + if (!PEAR::isError ($aUserTagCloud)) { + $smarty->assign('user_tagcloud',$aUserTagCloud); + } $smarty->assign('profile', true); $smarty->display('profile.tpl'); } else { -- GitLab