diff options
| -rw-r--r-- | albums.php | 2 | ||||
| -rw-r--r-- | browse.php | 27 | ||||
| -rwxr-xr-x | docs/CHANGELOG | 5 | ||||
| -rw-r--r-- | lib/class/localplay.class.php | 7 | ||||
| -rw-r--r-- | templates/show_album.inc | 2 |
5 files changed, 41 insertions, 2 deletions
@@ -32,7 +32,7 @@ if(isset($_REQUEST['artist'])) $artist = scrub_in($_REQUEST['artist']); $_REQUEST['artist_id'] = scrub_in($_REQUEST['artist_id']); if ($_REQUEST['action'] === 'clear_art') { - if (!$user->has_access('25')) { access_denied(); } + if (!$GLOBALS['user']->has_access('75')) { access_denied(); } $album = new Album($_REQUEST['album_id']); $album->clear_art(); show_confirmation(_('Album Art Cleared'),_('Album Art information has been removed from the database'),"/albums.php?action=show&album=" . $album->id); @@ -105,7 +105,34 @@ switch($action) { } break; + case 'song_title': + /* Create the Needed Object */ + $song = new Song(); + + /* Setup the View Object */ + $view = new View(); + $view->import_session_view(); + + $song->show_match_list($_REQUEST['match']); + $sql = $song->get_sql_from_match($_REQUEST['match']); + + if ($_REQUEST['keep_view']) { + $view->initialize(); + } + else { + $db_results = mysql_query($sql, dbh()); + $total_items = mysql_num_rows($db_results); + $offset_limit = 999999; + if ($match != 'Show All') { $offset_limit = $_SESSION['userdata']['offset_limit']; } + $view = new View($sql, 'browse.php?action=song_title','title',$total_items,$offset_limit); + } + + if ($view->base_sql) { + $songs = $song->get_songs($view->sql); + show_songs($songs,$view); + } + break; case 'catalog': break; diff --git a/docs/CHANGELOG b/docs/CHANGELOG index f9b18c97..6521d6bd 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,11 @@ -------------------------------------------------------------------------- v.3.3.2 + - Fixed a problem with the automatic registration sorting on user + lists and admin notification of new users (Thx pb1dft) + - Fixed 'auto_user' config option on automatic registration it + wasn't actually respecting the config option (Thx pb1dft) + - Fixed a typo on the XSPF playlist generation (Thx pb1dft) - Fixed an issue with 'Download Selected' from playlists passing the incorrect songs - When adding to a playlist by default it 'appends' rather then diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php index 0b401bdc..4d027579 100644 --- a/lib/class/localplay.class.php +++ b/lib/class/localplay.class.php @@ -143,21 +143,26 @@ class Localplay { $this->_function_map['stop'] = $data['stop']; $this->_function_map['get'] = $data['get']; $this->_function_map['connect'] = $data['connect']; + $this->_function_map['status'] = $data['status']; /* Recommended Functions */ - $this->_function_map['status'] = $data['status']; $this->_function_map['pause'] = $data['pause']; $this->_function_map['next'] = $data['next']; $this->_function_map['prev'] = $data['prev']; $this->_function_map['skip'] = $data['skip']; $this->_function_map['get_playlist'] = $data['get_playlist']; $this->_function_map['get_playing'] = $data['get_playing']; + $this->_function_map['repeat'] = $data['repeat']; + $this->_function_map['random'] = $data['random']; + $this->_function_map['loop'] = $data['loop']; /* Optional Functions */ $this->_function_map['volume_set'] = $data['volume_set']; $this->_function_map['volume_up'] = $data['volume_up']; $this->_function_map['volume_down'] = $data['volume_down']; $this->_function_map['delete_all'] = $data['delete_all']; + $this->_function_map['randomize'] = $data['randomize']; + $this->_function_map['move'] = $data['move']; } // _map_functions diff --git a/templates/show_album.inc b/templates/show_album.inc index 7eb181a4..dfff023c 100644 --- a/templates/show_album.inc +++ b/templates/show_album.inc @@ -61,7 +61,9 @@ $username = $GLOBALS['user']->username; <b>Actions:</b><br /> <a href="<?php echo $web_path; ?>/song.php?action=album&album_id=<?php echo $album->id; ?>"><?php echo _("Play Album"); ; ?></a><br /> <a href="<?php echo $web_path; ?>/song.php?action=album_random&album_id=<?php echo $album->id; ; ?>"><?php echo _("Play Random from Album"); ; ?></a><br /> + <?php if ( ($GLOBALS['user']->has_access('75')) || (!conf('use_auth'))) { ?> <a href="<?php echo $web_path; ?>/albums.php?action=clear_art&album_id=<?php echo $album->id; ; ?>"><?php echo _("Reset Album Art"); ; ?></a><br /> + <?php } ?> <a href="<?php echo $web_path; ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ; ?>"><?php echo _("Find Album Art"); ; ?></a><br /> <?php if (($GLOBALS['user']->has_access('100')) || (!conf('use_auth'))) { ?> <a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&album_id=<?php echo $album->id; ; ?>"><?php echo _("Update from tags"); ?></a><br /> |