diff options
| -rw-r--r-- | admin/users.php | 4 | ||||
| -rw-r--r-- | lib/class/browse.class.php | 2 | ||||
| -rw-r--r-- | templates/show_playlist.inc.php | 4 | ||||
| -rw-r--r-- | templates/show_playlists.inc.php | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/admin/users.php b/admin/users.php index d6593218..44e8e23c 100644 --- a/admin/users.php +++ b/admin/users.php @@ -148,7 +148,7 @@ switch ($_REQUEST['action']) { break; case 'confirm_delete': if (Config::get('demo_mode')) { break; } - $clint = new User($_REQUEST['user_id']); + $client = new User($_REQUEST['user_id']); if ($client->delete()) { show_confirmation(_('User Deleted'), "$client->username has been Deleted","admin/users.php"); } @@ -161,7 +161,7 @@ switch ($_REQUEST['action']) { $client = new User($_REQUEST['user_id']); show_confirmation(_('Deletion Request'), _('Are you sure you want to permanently delete') . " $client->fullname ($client->username)?", - "admin/users.php?action=confirm_delete&user_id=$user_id",1); + "admin/users.php?action=confirm_delete&user_id=" . $_REQUEST['user_id'],1); break; /* Show IP History for the Specified User */ case 'show_ip_history': diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php index 2767b749..d74d2514 100644 --- a/lib/class/browse.class.php +++ b/lib/class/browse.class.php @@ -169,7 +169,7 @@ class Browse { $valid_array = array('name','year'); break; case 'playlist': - $valid_array = array('name'); + $valid_array = array('name','user'); break; case 'live_stream': $valid_array = array('name','call_sign','frequency'); diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php index 1b8b899d..cd31488a 100644 --- a/templates/show_playlist.inc.php +++ b/templates/show_playlist.inc.php @@ -28,8 +28,8 @@ $web_path = Config::get('web_path'); <div id="information_actions"> <ul> <li><a href="<?php echo $web_path; ?>/playlist.php?action=normalize_tracks&playlist_id=<?php echo $playlist->id; ?>"><?php echo _('Normalize Tracks'); ?></a></li> - <li><?php echo Ajax::text('?action=basket&type=playlist&id=' . $playlist->id,_('Play All'),'play_playlist'); ?></li> - <li><?php echo Ajax::text('?action=basket&type=playlist_random&id=' . $playlist->id,_('Play Random'),'play_playlist'); ?></li> + <li><?php echo Ajax::text('?action=basket&type=playlist&id=' . $playlist->id,_('Add All'),'play_playlist'); ?></li> + <li><?php echo Ajax::text('?action=basket&type=playlist_random&id=' . $playlist->id,_('Add Random'),'play_playlist'); ?></li> </ul> </div> <?php show_box_bottom(); ?> diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php index ae2d6ecb..5707c772 100644 --- a/templates/show_playlists.inc.php +++ b/templates/show_playlists.inc.php @@ -33,7 +33,7 @@ <th class="cel_add"><?php echo _('Add'); ?></th> <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Playlist Name'),'playlist_sort_name'); ?></th> <th class="cel_songs"><?php echo _('# Songs'); ?></th> - <th class="cel_owner"><?php echo _('Owner'); ?></th> + <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&sort=user',_('Owner'),'playlist_sort_owner'); ?></th> <th class="cel_action"><?php echo _('Actions'); ?></th> </tr> <?php @@ -50,7 +50,7 @@ foreach ($object_ids as $playlist_id) { <th class="cel_add"><?php echo _('Add'); ?></th> <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Playlist Name'),'playlist_sort_name_bottom'); ?></th> <th class="cel_songs"><?php echo _('# Songs'); ?></th> - <th class="cel_owner"><?php echo _('Owner'); ?></th> + <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&sort=user',_('Owner'),'playlist_sort_owner'); ?></th> <th class="cel_action"><?php echo _('Actions'); ?></th> </tr> </table> |