diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-30 02:05:31 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-30 02:05:31 +0000 |
| commit | 5975361e038e17e5f91fd69da4f5df2d3e5af259 (patch) | |
| tree | 10e4d84643d01a6e04ecab6eb6e368d750fd35ad /play/index.php | |
| parent | 318700ad7cd0e67bf02a1e6777cb5c2cd4c3b240 (diff) | |
| download | ampache-5975361e038e17e5f91fd69da4f5df2d3e5af259.tar.gz ampache-5975361e038e17e5f91fd69da4f5df2d3e5af259.tar.bz2 ampache-5975361e038e17e5f91fd69da4f5df2d3e5af259.zip | |
fixed an issue with downsample remote where it required access_control to be on, and also would downsample those inside the local network definition rather then those outside
Diffstat (limited to 'play/index.php')
| -rw-r--r-- | play/index.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/play/index.php b/play/index.php index 38e6bcbf..ff1be7e0 100644 --- a/play/index.php +++ b/play/index.php @@ -239,12 +239,12 @@ if (Config::get('track_user_ip')) { $user->insert_ip_history(); } -/* If access control is on and they aren't local, downsample! */ -if (Config::get('access_control') AND Config::get('downsample_remote')) { - if (Access::check_network('network',$_SERVER['REMOTE_ADDR'],$GLOBALS['user']->id,'25')) { +// If we've got downsample remote enabled +if (Config::get('downsample_remote')) { + if (!Access::check_network('network',$_SERVER['REMOTE_ADDR'],$GLOBALS['user']->id,'25')) { $not_local = true; } -} // if access_control +} // if downsample remote is enabled // If they are downsampling, or if the song is not a native stream or it's non-local if (($GLOBALS['user']->prefs['transcode'] == 'always' || !$song->native_stream() || $not_local) && $GLOBALS['user']->prefs['transcode'] != 'never') { |