[Slim-Checkins] r10622 - /trunk/server/Slim/Web/Setup.pm

[kdf at svn.slimdevices.com]

Author: kdf
Date: Tue Nov  7 22:42:36 2006
New Revision: 10622

URL: http://svn.slimdevices.com?rev=10622&view=rev
Log:
Bug: n/a
Description: fix networking handler for locking prefs to proper ranges


Modified:
    trunk/server/Slim/Web/Setup.pm

Modified: trunk/server/Slim/Web/Setup.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Setup.pm?rev=10622&r1=10621&r2=10622&view=diff
==============================================================================
--- trunk/server/Slim/Web/Setup.pm (original)
+++ trunk/server/Slim/Web/Setup.pm Tue Nov  7 22:42:36 2006
@@ -1826,27 +1826,26 @@
 		$paramRef->{'warning'} = "";
 
 		if ($paramRef->{'httpport'} ne Slim::Utils::Prefs::get('httpport')) {
+		
+			if ($paramRef->{'httpport'} < 1025)  { $paramRef->{'httpport'}  = 1025 };
+			if ($paramRef->{'httpport'} > 65535) { $paramRef->{'httpport'} = 65535 };
+		
 			Slim::Utils::Prefs::set('httpport', $paramRef->{'httpport'});
+
 			$paramRef->{'warning'} .= string("SETUP_HTTPPORT_OK").'<blockquote><a target="_top" href="'.Slim::Utils::Prefs::homeURL().'">'
 								. Slim::Utils::Prefs::homeURL()."</a></blockquote><br>";
 		}
 
 		for my $pref (@prefs) {
 
-			if ($pref eq 'bufferSecs') {
-				if ($paramRef->{'bufferSecs'} > 30) {$paramRef->{'bufferSecs'} = 30};
-				if ($paramRef->{'bufferSecs'} < 3) {$paramRef->{'bufferSecs'} = 3};
+			if ($pref =~ /^tcp/ || $pref eq 'validate') {
+				if ($paramRef->{$pref} < 1) {$paramRef->{$pref} = 1};
 			};
 			
 			if ($pref eq 'bufferSecs') {
 				if ($paramRef->{'bufferSecs'} > 30) {$paramRef->{'bufferSecs'} = 30};
 				if ($paramRef->{'bufferSecs'} < 3) {$paramRef->{'bufferSecs'} = 3};
 			};
-			
-			if ($pref eq 'bufferSecs') {
-				if ($paramRef->{'bufferSecs'} > 30) {$paramRef->{'bufferSecs'} = 30};
-				if ($paramRef->{'bufferSecs'} < 3) {$paramRef->{'bufferSecs'} = 3};
-			};
 
 			if ($pref eq 'udpChunkSize') {
 				if ($paramRef->{'udpChunkSize'} < 1) {$paramRef->{'udpChunkSize'} = 1};
@@ -1866,6 +1865,8 @@
 	for my $pref (@prefs) {
 		$paramRef->{$pref} = Slim::Utils::Prefs::get($pref);
 	}
+	
+	$paramRef->{'HomeURL'} = Slim::Utils::Prefs::homeURL();
 	
 	$paramRef->{'wmaoptions'} =  {
 								'9999' => string('NO_LIMIT'),