summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdocs/CHANGELOG2
-rw-r--r--lib/class/song.class.php7
-rw-r--r--song.php10
3 files changed, 8 insertions, 11 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index c80a1395..f58636d8 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
--------------------------------------------------------------------------
v.3.3.2-Beta2
+ - Fixed disable/enable functions which were incorrectly referencing
+ session variables to check for permission (always failed)
- Fixed lack of default amazon web url which prevented searching
from working at all if you had not updated yoru config
file
diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index 44e90096..b722670c 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -561,10 +561,11 @@ class Song {
@discussion sets the enabled flag
*/
function update_enabled($new_enabled,$song_id=0) {
+
+ /* This should really be integrated into the update_item thing */
+ if (!$GLOBALS['user']->has_access(100)) { return false; }
- if ($_SESSION['userdata']['access'] === 'admin' || $_SESSION['userdata']['access'] === '100') {
- $this->update_item('enabled',$new_enabled,$song_id);
- }
+ $this->update_item('enabled',$new_enabled,$song_id);
} // update_enabled
diff --git a/song.php b/song.php
index 0a446010..8e1afcc4 100644
--- a/song.php
+++ b/song.php
@@ -126,7 +126,7 @@ elseif ( $_REQUEST['your_popular_songs'] ) {
$song_ids = get_popular_songs($_REQUEST['your_popular_songs'], 'your', $user->username);
}
-
+/* FIXME! */
if ( !$_REQUEST['action'] or $_REQUEST['action'] == 'm3u' ) {
$stream_type = conf('playlist_type');
@@ -138,10 +138,4 @@ if ( !$_REQUEST['action'] or $_REQUEST['action'] == 'm3u' ) {
$stream->start();
} // if streaming
-elseif ( $_REQUEST['action'] == 'show' ) {
- // Show the song details, or the list
- // of songs.
- // TODO
-}
-
-
+?>