diff options
author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-26 00:57:06 -0500 |
---|---|---|
committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-26 00:57:40 -0500 |
commit | 42133f38d223a2b3b81d309f2d1a983ef2012485 (patch) | |
tree | a9a01095cbb54474e83f8ec220a15991542819e1 /play/index.php | |
parent | 5f02e4f43cb1423653c156e612da53e4c5938583 (diff) | |
download | ampache-42133f38d223a2b3b81d309f2d1a983ef2012485.tar.gz ampache-42133f38d223a2b3b81d309f2d1a983ef2012485.tar.bz2 ampache-42133f38d223a2b3b81d309f2d1a983ef2012485.zip |
Move access_denied() from lib/ui.lib.php to UI
Diffstat (limited to 'play/index.php')
-rw-r--r-- | play/index.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/play/index.php b/play/index.php index cc3f9437..6b3dbf14 100644 --- a/play/index.php +++ b/play/index.php @@ -75,7 +75,7 @@ Preference::init(); /* If the user has been disabled (true value) */ if (make_bool($GLOBALS['user']->disabled)) { - debug_event('access_denied', "$user->username is currently disabled, stream access denied",'3'); + debug_event('UI::access_denied', "$user->username is currently disabled, stream access denied",'3'); header('HTTP/1.1 403 User Disabled'); exit; } @@ -86,7 +86,7 @@ if (Config::get('require_session')) { debug_event('play', 'Streaming access allowed for local network IP ' . $_SERVER['REMOTE_ADDR'],'5'); } elseif(!Stream::session_exists($sid)) { - debug_event('access_denied', 'Streaming access denied: ' . $GLOBALS['user']->username . "'s session has expired", 3); + debug_event('UI::access_denied', 'Streaming access denied: ' . $GLOBALS['user']->username . "'s session has expired", 3); header('HTTP/1.1 403 Session Expired'); exit; } @@ -102,8 +102,8 @@ $GLOBALS['user']->update_last_seen(); /* If we are in demo mode.. die here */ if (Config::get('demo_mode') || (!Access::check('interface','25') )) { - debug_event('access_denied', "Streaming Access Denied:" .Config::get('demo_mode') . "is the value of demo_mode. Current user level is " . $GLOBALS['user']->access,'3'); - access_denied(); + debug_event('UI::access_denied', "Streaming Access Denied:" .Config::get('demo_mode') . "is the value of demo_mode. Current user level is " . $GLOBALS['user']->access,'3'); + UI::access_denied(); exit; } @@ -114,8 +114,8 @@ if (Config::get('demo_mode') || (!Access::check('interface','25') )) { if (Config::get('access_control')) { if (!Access::check_network('stream',$GLOBALS['user']->id,'25') AND !Access::check_network('network',$GLOBALS['user']->id,'25')) { - debug_event('access_denied', "Streaming Access Denied: " . $_SERVER['REMOTE_ADDR'] . " does not have stream level access",'3'); - access_denied(); + debug_event('UI::access_denied', "Streaming Access Denied: " . $_SERVER['REMOTE_ADDR'] . " does not have stream level access",'3'); + UI::access_denied(); exit; } } // access_control is enabled @@ -125,7 +125,7 @@ if ($type == 'playlist') { $playlist = new Stream_Playlist($oid); // Some rudimentary security if ($uid != $playlist->user) { - access_denied(); + UI::access_denied(); exit; } $playlist->generate_playlist($playlist_type, false); |