diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-29 03:20:00 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-29 03:20:00 +0000 |
| commit | db47bcb6c018fecae71b8b7120c70d7ef9c7bcf6 (patch) | |
| tree | d017e40d77c0d580aa6091dceabec7fd919a83c2 /templates | |
| parent | 20c3dc0fd1993b36a8ff3467fbc8c4f30c59588d (diff) | |
| download | ampache-db47bcb6c018fecae71b8b7120c70d7ef9c7bcf6.tar.gz ampache-db47bcb6c018fecae71b8b7120c70d7ef9c7bcf6.tar.bz2 ampache-db47bcb6c018fecae71b8b7120c70d7ef9c7bcf6.zip | |
fixed play all artist, play all artist random, and account updating from user preferences
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_account.inc.php | 5 | ||||
| -rw-r--r-- | templates/show_artist_box.inc.php | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/templates/show_account.inc.php b/templates/show_account.inc.php index fc380c6f..8b179a78 100644 --- a/templates/show_account.inc.php +++ b/templates/show_account.inc.php @@ -18,7 +18,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +// Because this is a reset of the persons password make the form a little more secure +$form_string = generate_password('32'); +$_SESSION['forms']['account'] = $form_string; ?> +<?php Error::display('general'); ?> <table class="tabledata"> <tr> <td><?php echo _('Name'); ?>:</td> @@ -56,6 +60,7 @@ <input type="hidden" name="user_id" value="<?php echo scrub_out($client->id); ?>" /> <input type="hidden" name="action" value="update_user" /> <input type="hidden" name="tab" value="<?php echo scrub_out($_REQUEST['tab']); ?>" /> + <input type="hidden" name="form_string" value="<?php echo $form_string; ?>" /> <input class="button" type="submit" value="<?php echo _('Update Account'); ?>" /> </td> </tr> diff --git a/templates/show_artist_box.inc.php b/templates/show_artist_box.inc.php index 0b1cd1c7..64757603 100644 --- a/templates/show_artist_box.inc.php +++ b/templates/show_artist_box.inc.php @@ -28,13 +28,15 @@ if (Config::get('ratings')) { show_rating($artist->id, 'artist'); echo "</div>"; } // end if ratings ?> -<strong><?php echo _('Actions'); ?>:</strong><br /> +<strong><?php echo _('Actions'); ?>:</strong> +<div style="padding-left:5px;"> <a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&artist=<?php echo $artist->id; ?>"><?php echo _("Show All Songs By") . " " . $artist->full_name; ?></a><br /> -<a href="<?php echo $web_path; ?>/stream.php?action=artist&artist_id=<?php echo $artist->id; ?>"><?php echo _("Play All Songs By") . " " . $artist->full_name; ?></a><br /> -<a href="<?php echo $web_path; ?>/stream.php?action=artist_random&artist_id=<?php echo $artist->id; ?>"><?php echo _("Play Random Songs By") . " " . $artist->full_name; ?></a><br /> -<?php if ($GLOBALS['user']->has_access('100')) { ?> +<span class="text-action"><?php echo Ajax::text('?action=basket&type=artist&id=' . $artist->id,_('Play All Songs By') . ' ' . $artist->full_name,'play_full_artist'); ?></span> +<span class="text-action"><?php echo Ajax::text('?action=basket&type=artist_random&id=' . $artist->id,_('Play Random Songs By') . ' ' . $artist->full_name,'play_random_artist'); ?></span> +<?php if ($GLOBALS['user']->has_access('50')) { ?> <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo _("Update from tags"); ?></a><br /> <a href="<?php echo $web_path; ?>/artists.php?action=show_rename&artist=<?php echo $artist->id; ?>"><?php echo _("Rename Artist"); ?></a><br /> <a href="<?php echo $web_path; ?>/artists.php?action=show_similar&artist=<?php echo $artist->id; ?>"><?php echo _("Find duplicate artists"); ?></a><br /> <?php } ?> +</div> <?php show_box_bottom(); ?> |