summaryrefslogtreecommitdiffstats
path: root/playlist.php
diff options
context:
space:
mode:
authorPaul Arthur <paul.arthur@flowerysong.com>2013-01-26 03:00:32 -0500
committerPaul Arthur <paul.arthur@flowerysong.com>2013-01-26 03:38:46 -0500
commitef4d3660605efc7f1328d4533b0f4bfb6c1107e2 (patch)
treee4377fb129a899e65aaaf421f8c97098aecaedd5 /playlist.php
parent8a750c3e875d590d351c3042570a134fcdf03e5d (diff)
downloadampache-ef4d3660605efc7f1328d4533b0f4bfb6c1107e2.tar.gz
ampache-ef4d3660605efc7f1328d4533b0f4bfb6c1107e2.tar.bz2
ampache-ef4d3660605efc7f1328d4533b0f4bfb6c1107e2.zip
Cosmetics: death to tabs
The refactoring I've been doing has reminded me of my strong preference for spaces, and I feel inclined to impose my will on the tree.
Diffstat (limited to 'playlist.php')
-rw-r--r--playlist.php236
1 files changed, 118 insertions, 118 deletions
diff --git a/playlist.php b/playlist.php
index b91f0136..480b194f 100644
--- a/playlist.php
+++ b/playlist.php
@@ -1,5 +1,5 @@
<?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -26,13 +26,13 @@ require_once 'lib/init.php';
// We special-case this so we can send a 302 if the delete succeeded
if ($_REQUEST['action'] == 'delete_playlist') {
- // Check rights
- $playlist = new Playlist($_REQUEST['playlist_id']);
- if ($playlist->has_access()) {
- $playlist->delete();
- // Go elsewhere
- header('Location: ' . Config::get('web_path') . '/browse.php?action=playlist');
- }
+ // Check rights
+ $playlist = new Playlist($_REQUEST['playlist_id']);
+ if ($playlist->has_access()) {
+ $playlist->delete();
+ // Go elsewhere
+ header('Location: ' . Config::get('web_path') . '/browse.php?action=playlist');
+ }
}
UI::show_header();
@@ -40,88 +40,88 @@ UI::show_header();
/* Switch on the action passed in */
switch ($_REQUEST['action']) {
- case 'add_dyn_song':
- /* Check Rights */
- if (!$playlist->has_access()) {
- UI::access_denied();
- break;
- }
-
- $playlist->add_dyn_song();
- $_SESSION['data']['playlist_id'] = $playlist->id;
- show_playlist($playlist);
- break;
- case 'create_playlist':
- /* Check rights */
- if (!Access::check('interface','25')) {
- UI::access_denied();
- break;
- }
-
- $playlist_name = scrub_in($_REQUEST['playlist_name']);
- $playlist_type = scrub_in($_REQUEST['type']);
-
- $playlist->create($playlist_name,$playlist_type);
- $_SESSION['data']['playlist_id'] = $playlist->id;
- show_confirmation(T_('Playlist Created'), sprintf(T_('%1$s (%2$s) has been created'), $playlist_name, $playlist_type),'playlist.php');
- break;
- case 'delete_playlist':
- // If we made it here, we didn't have sufficient rights.
- UI::access_denied();
- break;
- case 'remove_song':
- /* Check em for rights */
- if (!$playlist->has_access()) {
- UI::access_denied();
- break;
- }
- $playlist->remove_songs($_REQUEST['song']);
- show_playlist($playlist);
- break;
- case 'show_playlist':
- $playlist = new Playlist($_REQUEST['playlist_id']);
- $playlist->format();
- $object_ids = $playlist->get_items();
- require_once Config::get('prefix') . '/templates/show_playlist.inc.php';
- break;
- case 'show_import_playlist':
- require_once Config::get('prefix') . '/templates/show_import_playlist.inc.php';
- break;
- case 'import_playlist':
- /* first we rename the file to it's original name before importing.
- Otherwise the playlist name will have the $_FILES['filename']['tmp_name'] which doesn't look right... */
- $dir = dirname($_FILES['filename']['tmp_name']) . "/";
- $filename = $dir . basename($_FILES['filename']['name']);
- move_uploaded_file($_FILES['filename']['tmp_name'], $filename );
-
- $catalog = new Catalog();
- $result = $catalog->import_m3u($filename);
-
- if($result['success']) {
- $url = 'show_playlist&amp;playlist_id=' . $result['id'];
- $title = T_('Playlist Imported');
- $body = basename($_FILES['filename']['name']);
- $body .= '<br />' .
- sprintf(
- T_ngettext(
- 'Successfully imported playlist with %d song.',
- 'Successfully imported playlist with %d songs.',
- $result['count']),
- $result['count']);
- }
- else {
- $url = 'show_import_playlist';
- $title = T_('Playlist Not Imported');
- $body = T_($result['error']);
- }
- show_confirmation($title, $body, Config::get('web_path') . '/playlist.php?action=' . $url);
- break;
- case 'set_track_numbers':
- /* Make sure they have permission */
- if (!$playlist->has_access()) {
- UI::access_denied();
- break;
- }
+ case 'add_dyn_song':
+ /* Check Rights */
+ if (!$playlist->has_access()) {
+ UI::access_denied();
+ break;
+ }
+
+ $playlist->add_dyn_song();
+ $_SESSION['data']['playlist_id'] = $playlist->id;
+ show_playlist($playlist);
+ break;
+ case 'create_playlist':
+ /* Check rights */
+ if (!Access::check('interface','25')) {
+ UI::access_denied();
+ break;
+ }
+
+ $playlist_name = scrub_in($_REQUEST['playlist_name']);
+ $playlist_type = scrub_in($_REQUEST['type']);
+
+ $playlist->create($playlist_name,$playlist_type);
+ $_SESSION['data']['playlist_id'] = $playlist->id;
+ show_confirmation(T_('Playlist Created'), sprintf(T_('%1$s (%2$s) has been created'), $playlist_name, $playlist_type),'playlist.php');
+ break;
+ case 'delete_playlist':
+ // If we made it here, we didn't have sufficient rights.
+ UI::access_denied();
+ break;
+ case 'remove_song':
+ /* Check em for rights */
+ if (!$playlist->has_access()) {
+ UI::access_denied();
+ break;
+ }
+ $playlist->remove_songs($_REQUEST['song']);
+ show_playlist($playlist);
+ break;
+ case 'show_playlist':
+ $playlist = new Playlist($_REQUEST['playlist_id']);
+ $playlist->format();
+ $object_ids = $playlist->get_items();
+ require_once Config::get('prefix') . '/templates/show_playlist.inc.php';
+ break;
+ case 'show_import_playlist':
+ require_once Config::get('prefix') . '/templates/show_import_playlist.inc.php';
+ break;
+ case 'import_playlist':
+ /* first we rename the file to it's original name before importing.
+ Otherwise the playlist name will have the $_FILES['filename']['tmp_name'] which doesn't look right... */
+ $dir = dirname($_FILES['filename']['tmp_name']) . "/";
+ $filename = $dir . basename($_FILES['filename']['name']);
+ move_uploaded_file($_FILES['filename']['tmp_name'], $filename );
+
+ $catalog = new Catalog();
+ $result = $catalog->import_m3u($filename);
+
+ if($result['success']) {
+ $url = 'show_playlist&amp;playlist_id=' . $result['id'];
+ $title = T_('Playlist Imported');
+ $body = basename($_FILES['filename']['name']);
+ $body .= '<br />' .
+ sprintf(
+ T_ngettext(
+ 'Successfully imported playlist with %d song.',
+ 'Successfully imported playlist with %d songs.',
+ $result['count']),
+ $result['count']);
+ }
+ else {
+ $url = 'show_import_playlist';
+ $title = T_('Playlist Not Imported');
+ $body = T_($result['error']);
+ }
+ show_confirmation($title, $body, Config::get('web_path') . '/playlist.php?action=' . $url);
+ break;
+ case 'set_track_numbers':
+ /* Make sure they have permission */
+ if (!$playlist->has_access()) {
+ UI::access_denied();
+ break;
+ }
$song_ids = scrub_in($_REQUEST['song']);
foreach ($song_ids as $song_id) {
$track = scrub_in($_REQUEST['tr_' . $song_id]);
@@ -132,34 +132,34 @@ switch ($_REQUEST['action']) {
show_playlist($playlist);
break;
- case 'prune_empty':
- /* Make sure they have permission */
- if (!$GLOBALS['user']->has_access(100)) {
- UI::access_denied();
- break;
- }
-
- prune_empty_playlists();
- $url = Config::get('web_path') . '/playlist.php';
- $title = T_('Empty Playlists Deleted');
- $body = '';
- show_confirmation($title,$body,$url);
- break;
- case 'normalize_tracks':
- $playlist = new Playlist($_REQUEST['playlist_id']);
-
- /* Make sure they have permission */
- if (!$playlist->has_access()) {
- UI::access_denied();
- break;
- }
-
- /* Normalize the tracks */
- $playlist->normalize_tracks();
- $object_ids = $playlist->get_items();
- default:
- require_once Config::get('prefix') . '/templates/show_playlist.inc.php';
- break;
+ case 'prune_empty':
+ /* Make sure they have permission */
+ if (!$GLOBALS['user']->has_access(100)) {
+ UI::access_denied();
+ break;
+ }
+
+ prune_empty_playlists();
+ $url = Config::get('web_path') . '/playlist.php';
+ $title = T_('Empty Playlists Deleted');
+ $body = '';
+ show_confirmation($title,$body,$url);
+ break;
+ case 'normalize_tracks':
+ $playlist = new Playlist($_REQUEST['playlist_id']);
+
+ /* Make sure they have permission */
+ if (!$playlist->has_access()) {
+ UI::access_denied();
+ break;
+ }
+
+ /* Normalize the tracks */
+ $playlist->normalize_tracks();
+ $object_ids = $playlist->get_items();
+ default:
+ require_once Config::get('prefix') . '/templates/show_playlist.inc.php';
+ break;
} // switch on the action
UI::show_footer();