From 5975361e038e17e5f91fd69da4f5df2d3e5af259 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Sun, 30 Dec 2007 02:05:31 +0000
Subject: 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

---
 docs/CHANGELOG                | 2 ++
 play/index.php                | 8 ++++----
 templates/list_header.inc.php | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 5702ecb1..4455ae58 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
 
 --------------------------------------------------------------------------
   v.3.4-Beta2 
+	- Fixed downsample remote so that is downsamples those not in the
+		network def rather then those inside the network def
 	- Fixed issue with page-a-nation on show catalogs page
 	- Fixed removal of rating from db when 'unrating' the object
 	- Fixed Itunes Export (Thx flashk)
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') { 
diff --git a/templates/list_header.inc.php b/templates/list_header.inc.php
index c465a6b0..551c37bc 100644
--- a/templates/list_header.inc.php
+++ b/templates/list_header.inc.php
@@ -34,7 +34,7 @@ $uid	  = Config::get('list_header_uid');
 $sides  = 5;
 
 // ++ the uid
-Config::set('list_header_uid',$uid+1); 
+Config::set('list_header_uid',$uid+1,1); 
 
 // Next
 $next_offset = $start + $limit;
-- 
cgit