[Slim-Checkins] r11787 - in /trunk/server/HTML/EN/settings/server: behavior.html formatting.html interface.html networking.html performance.html security.html

kdf at svn.slimdevices.com kdf at svn.slimdevices.com
Fri Apr 20 17:45:32 PDT 2007


Author: kdf
Date: Fri Apr 20 17:45:32 2007
New Revision: 11787

URL: http://svn.slimdevices.com?rev=11787&view=rev
Log:
Bug: n/a
Description: use the prefs hash where applicable in server setting templates


Modified:
    trunk/server/HTML/EN/settings/server/behavior.html
    trunk/server/HTML/EN/settings/server/formatting.html
    trunk/server/HTML/EN/settings/server/interface.html
    trunk/server/HTML/EN/settings/server/networking.html
    trunk/server/HTML/EN/settings/server/performance.html
    trunk/server/HTML/EN/settings/server/security.html

Modified: trunk/server/HTML/EN/settings/server/behavior.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/behavior.html?rev=11787&r1=11786&r2=11787&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/behavior.html (original)
+++ trunk/server/HTML/EN/settings/server/behavior.html Fri Apr 20 17:45:32 2007
@@ -6,15 +6,15 @@
 		<div class="groupDesc">[% "SETUP_COMPOSERINARTISTS_DESC" | string %]</div>
 
 		<input type=hidden name="composerInArtists" value="0" />
-		<input type=checkbox [% IF composerInArtists %]checked [% END %] class="stdedit" name="composerInArtists" id="composerInArtists" value="1" />
+		<input type=checkbox [% IF prefs.composerInArtists %]checked [% END %] class="stdedit" name="composerInArtists" id="composerInArtists" value="1" />
 		<label for="composerInArtists" class="stdlabel">[% "COMPOSER" | string %]</label><br>
 
 		<input type=hidden name="conductorInArtists" value="0" />
-		<input type=checkbox [% IF conductorInArtists %]checked [% END %] class="stdedit" name="conductorInArtists" id="conductorInArtists" value="1" />
+		<input type=checkbox [% IF prefs.conductorInArtists %]checked [% END %] class="stdedit" name="conductorInArtists" id="conductorInArtists" value="1" />
 		<label for="conductorInArtists" class="stdlabel">[% "CONDUCTOR" | string %]</label><br>
 
 		<input type=hidden name="bandInArtists" value="0" />
-		<input type=checkbox [% IF bandInArtists %]checked [% END %] class="stdedit" name="bandInArtists" id="bandInArtists" value="1" />
+		<input type=checkbox [% IF prefs.bandInArtists %]checked [% END %] class="stdedit" name="bandInArtists" id="bandInArtists" value="1" />
 		<label for="bandInArtists" class="stdlabel">[% "BAND" | string %]</label>
 
 	</div>
@@ -26,8 +26,8 @@
 
 		<select class="stdedit" name="variousArtistAutoIdentification" id="variousArtistAutoIdentification">
 
-			<option [% IF NOT variousArtistAutoIdentification %]selected [% END %]value="0">[% 'SETUP_VARIOUSARTISTAUTOIDENTIFICATION_0' | getstring %]</option>
-			<option [% IF variousArtistAutoIdentification %]selected [% END %]value="1">[% 'SETUP_VARIOUSARTISTAUTOIDENTIFICATION_1' | getstring %]</option>
+			<option [% IF NOT prefs.variousArtistAutoIdentification %]selected [% END %]value="0">[% 'SETUP_VARIOUSARTISTAUTOIDENTIFICATION_0' | getstring %]</option>
+			<option [% IF prefs.variousArtistAutoIdentification %]selected [% END %]value="1">[% 'SETUP_VARIOUSARTISTAUTOIDENTIFICATION_1' | getstring %]</option>
 		
 		</select>
 
@@ -35,14 +35,14 @@
 
 		<select class="stdedit" name="useBandAsAlbumArtist" id="useBandAsAlbumArtist">
 
-			<option [% IF NOT useBandAsAlbumArtist %]selected [% END %]value="0">[% 'SETUP_USEBANDASALBUMARTIST_0' | getstring %]</option>
-			<option [% IF useBandAsAlbumArtist %]selected [% END %]value="1">[% 'SETUP_USEBANDASALBUMARTIST_1' | getstring %]</option>
+			<option [% IF NOT prefs.useBandAsAlbumArtist %]selected [% END %]value="0">[% 'SETUP_USEBANDASALBUMARTIST_0' | getstring %]</option>
+			<option [% IF prefs.useBandAsAlbumArtist %]selected [% END %]value="1">[% 'SETUP_USEBANDASALBUMARTIST_1' | getstring %]</option>
 		
 		</select>
 
 		<div class="prefDesc">[% "SETUP_VARIOUSARTISTSSTRING_DESC" | string %]</div>
 
-		<input type=text class="stdedit" name="variousArtistsString" id="variousArtistsString" value="[% variousArtistsString %]" size="40">
+		<input type=text class="stdedit" name="variousArtistsString" id="variousArtistsString" value="[% prefs.variousArtistsString %]" size="40">
 
 	</div>
 	
@@ -51,15 +51,15 @@
 		<div class="prefHead">[% "SETUP_DISPLAYTEXTTIMEOUT" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_DISPLAYTEXTTIMEOUT_DESC" | string %]</div>
 
-		[% "SETUP_DISPLAYTEXTTIMEOUT_CHOOSE" | string %]<input type=text class="stdedit" name="displaytexttimeout" id="displaytexttimeout" value="[% displaytexttimeout %]" size="15">
+		[% "SETUP_DISPLAYTEXTTIMEOUT_CHOOSE" | string %]<input type=text class="stdedit" name="displaytexttimeout" id="displaytexttimeout" value="[% prefs.displaytexttimeout %]" size="15">
 
 		<div class="prefHead">[% "SETUP_CHECKVERSION" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_CHECKVERSION_DESC" | string %]</div>
 
 		<select class="stdedit" name="checkVersion" id="checkVersion">
 
-			<option [% IF NOT checkVersion %]selected [% END %]value="0">[% 'SETUP_CHECKVERSION_0' | string %]</option>
-			<option [% IF checkVersion %]selected [% END %]value="1">[% 'SETUP_CHECKVERSION_1' | string %]</option>
+			<option [% IF NOT prefs.checkVersion %]selected [% END %]value="0">[% 'SETUP_CHECKVERSION_0' | string %]</option>
+			<option [% IF prefs.checkVersion %]selected [% END %]value="1">[% 'SETUP_CHECKVERSION_1' | string %]</option>
 		
 		</select>
 
@@ -68,8 +68,8 @@
 
 		<select class="stdedit" name="noGenreFilter" id="noGenreFilter">
 
-			<option [% IF NOT noGenreFilter %]selected [% END %]value="0">[% 'SETUP_NOGENREFILTER_0' | string %]</option>
-			<option [% IF noGenreFilter%]selected [% END %]value="1">[% 'SETUP_NOGENREFILTER_1' | string %]</option>
+			<option [% IF NOT prefs.noGenreFilter %]selected [% END %]value="0">[% 'SETUP_NOGENREFILTER_0' | string %]</option>
+			<option [% IF prefs.noGenreFilter%]selected [% END %]value="1">[% 'SETUP_NOGENREFILTER_1' | string %]</option>
 		
 		</select>
 
@@ -78,8 +78,8 @@
 
 		<select class="stdedit" name="playtrackalbum" id="playtrackalbum">
 
-			<option [% IF NOT playtrackalbum %]selected [% END %]value="0">[% 'SETUP_PLAYTRACKALBUM_0' | string %]</option>
-			<option [% IF playtrackalbum %]selected [% END %]value="1">[% 'SETUP_PLAYTRACKALBUM_1' | string %]</option>
+			<option [% IF NOT prefs.playtrackalbum %]selected [% END %]value="0">[% 'SETUP_PLAYTRACKALBUM_0' | string %]</option>
+			<option [% IF prefs.playtrackalbum %]selected [% END %]value="1">[% 'SETUP_PLAYTRACKALBUM_1' | string %]</option>
 		
 		</select>
 
@@ -88,33 +88,33 @@
 
 		<select class="stdedit" name="searchSubString" id="searchSubString">
 
-			<option [% IF NOT searchSubString %]selected [% END %]value="0">[% 'SETUP_SEARCHSUBSTRING_0' | string %]</option>
-			<option [% IF searchSubString %]selected [% END %]value="1">[% 'SETUP_SEARCHSUBSTRING_1' | string %]</option>
+			<option [% IF NOT prefs.searchSubString %]selected [% END %]value="0">[% 'SETUP_SEARCHSUBSTRING_0' | string %]</option>
+			<option [% IF prefs.searchSubString %]selected [% END %]value="1">[% 'SETUP_SEARCHSUBSTRING_1' | string %]</option>
 		
 		</select>
 
 		<div class="prefHead">[% "SETUP_IGNOREDARTICLES" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_IGNOREDARTICLES_DESC" | string %]</div>
 
-		<input type=text class="stdedit" name="ignoredarticles" id="ignoredarticles" value="[% ignoredarticles %]" size="40">
+		<input type=text class="stdedit" name="ignoredarticles" id="ignoredarticles" value="[% prefs.ignoredarticles %]" size="40">
 
 		<div class="prefHead">[% "SETUP_SPLITLIST" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_SPLITLIST_DESC" | string %]</div>
 
-		<input type=text class="stdedit" name="splitList" id="splitList" value="[% splitList %]" size="40">
+		<input type=text class="stdedit" name="splitList" id="splitList" value="[% prefs.splitList %]" size="40">
 
 		<div class="prefHead">[% "SETUP_BROWSEAGELIMIT" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_BROWSEAGELIMIT_DESC" | string %]</div>
 
-		<input type=text class="stdedit" name="browseagelimit" id="browseagelimit" value="[% browseagelimit %]" size="15">
+		<input type=text class="stdedit" name="browseagelimit" id="browseagelimit" value="[% prefs.browseagelimit %]" size="15">
 
 		<div class="prefHead">[% "SETUP_GROUPDISCS" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_GROUPDISCS_DESC" | string %]</div>
 
 		<select class="stdedit" name="groupdiscs" id="groupdiscs">
 
-			<option [% IF NOT groupdiscs %]selected [% END %]value="0">[% 'SETUP_GROUPDISCS_0' | string %]</option>
-			<option [% IF groupdiscs %]selected [% END %]value="1">[% 'SETUP_GROUPDISCS_1' | string %]</option>
+			<option [% IF NOT prefs.groupdiscs %]selected [% END %]value="0">[% 'SETUP_GROUPDISCS_0' | string %]</option>
+			<option [% IF prefs.groupdiscs %]selected [% END %]value="1">[% 'SETUP_GROUPDISCS_1' | string %]</option>
 		
 		</select>
 
@@ -123,8 +123,8 @@
 
 		<select class="stdedit" name="persistPlaylists" id="persistPlaylists">
 
-			<option [% IF NOT persistPlaylists %]selected [% END %]value="0">[% 'SETUP_PERSISTPLAYLISTS_0' | string %]</option>
-			<option [% IF persistPlaylists %]selected [% END %]value="1">[% 'SETUP_PERSISTPLAYLISTS_1' | string %]</option>
+			<option [% IF NOT prefs.persistPlaylists %]selected [% END %]value="0">[% 'SETUP_PERSISTPLAYLISTS_0' | string %]</option>
+			<option [% IF prefs.persistPlaylists %]selected [% END %]value="1">[% 'SETUP_PERSISTPLAYLISTS_1' | string %]</option>
 		
 		</select>
 
@@ -133,8 +133,8 @@
 
 		<select class="stdedit" name="reshuffleOnRepeat" id="reshuffleOnRepeat">
 
-			<option [% IF NOT reshuffleOnRepeat %]selected [% END %]value="0">[% 'SETUP_RESHUFFLEONREPEAT_0' | string %]</option>
-			<option [% IF reshuffleOnRepeat %]selected [% END %]value="1">[% 'SETUP_RESHUFFLEONREPEAT_1' | string %]</option>
+			<option [% IF NOT prefs.reshuffleOnRepeat %]selected [% END %]value="0">[% 'SETUP_RESHUFFLEONREPEAT_0' | string %]</option>
+			<option [% IF prefs.reshuffleOnRepeat %]selected [% END %]value="1">[% 'SETUP_RESHUFFLEONREPEAT_1' | string %]</option>
 		
 		</select>
 
@@ -143,8 +143,8 @@
 
 		<select class="stdedit" name="saveShuffled" id="saveShuffled">
 
-			<option [% IF NOT saveShuffled %]selected [% END %]value="0">[% 'SETUP_SAVESHUFFLED_0' | string %]</option>
-			<option [% IF saveShuffled %]selected [% END %]value="1">[% 'SETUP_SAVESHUFFLED_1' | string %]</option>
+			<option [% IF NOT prefs.saveShuffled %]selected [% END %]value="0">[% 'SETUP_SAVESHUFFLED_0' | string %]</option>
+			<option [% IF prefs.saveShuffled %]selected [% END %]value="1">[% 'SETUP_SAVESHUFFLED_1' | string %]</option>
 		
 		</select>
 

Modified: trunk/server/HTML/EN/settings/server/formatting.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/formatting.html?rev=11787&r1=11786&r2=11787&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/formatting.html (original)
+++ trunk/server/HTML/EN/settings/server/formatting.html Fri Apr 20 17:45:32 2007
@@ -9,7 +9,7 @@
 
 		[% FOREACH option = longdateoptions.keys %]
 
-			<option [% IF longdateFormat == option %]selected [% END %]value="[% option %]">[% longdateoptions.$option %]</option>
+			<option [% IF prefs.longdateFormat == option %]selected [% END %]value="[% option %]">[% longdateoptions.$option %]</option>
 
 		[%- END -%]
 		
@@ -22,7 +22,7 @@
 
 		[% FOREACH option = shortdateoptions.keys %]
 
-			<option [% IF shortdateFormat == option %]selected [% END %]value="[% option %]">[% shortdateoptions.$option %]</option>
+			<option [% IF prefs.shortdateFormat == option %]selected [% END %]value="[% option %]">[% shortdateoptions.$option %]</option>
 
 		[%- END -%]
 		
@@ -35,7 +35,7 @@
 
 		[% FOREACH option = timeoptions.keys %]
 
-			<option [% IF timeFormat == option %]selected [% END %]value="[% option %]">[% timeoptions.$option %]</option>
+			<option [% IF prefs.timeFormat == option %]selected [% END %]value="[% option %]">[% timeoptions.$option %]</option>
 
 		[%- END -%]
 		
@@ -46,8 +46,8 @@
 
 		<select class="stdedit" name="showArtist" id="showArtist">
 
-			<option [% IF NOT showArtist %]selected [% END %]value="0">[% 'DISABLED' | getstring %]</option>
-			<option [% IF showArtist %]selected [% END %]value="1">[% 'ENABLED' | getstring %]</option>
+			<option [% IF NOT prefs.showArtist %]selected [% END %]value="0">[% 'DISABLED' | getstring %]</option>
+			<option [% IF prefs.showArtist %]selected [% END %]value="1">[% 'ENABLED' | getstring %]</option>
 		
 		</select>
 
@@ -56,8 +56,8 @@
 
 		<select class="stdedit" name="showYear" id="showYear">
 
-			<option [% IF NOT showYears %]selected [% END %]value="0">[% 'DISABLED' | getstring %]</option>
-			<option [% IF showYear %]selected [% END %]value="1">[% 'ENABLED' | getstring %]</option>
+			<option [% IF NOT prefs.showYears %]selected [% END %]value="0">[% 'DISABLED' | getstring %]</option>
+			<option [% IF prefs.showYear %]selected [% END %]value="1">[% 'ENABLED' | getstring %]</option>
 		
 		</select>
 
@@ -68,8 +68,8 @@
 		<div class="groupHead">[% "SETUP_TITLEFORMAT" | string | upper %]</div>
 		<div class="groupDesc">[% "SETUP_GROUP_TITLEFORMATS_DESC" | string %]</div>
 		
-		[% FOREACH format = titleFormat %]
-			<input type=radio [% IF titleFormatWeb == loop.index %]checked [% END %]value="[% loop.index %]" name="titleFormatWeb">
+		[% FOREACH format = prefs.titleFormat %]
+			<input type=radio [% IF prefs.titleFormatWeb == loop.index %]checked [% END %]value="[% loop.index %]" name="titleFormatWeb">
 			<input type="text" class="stdedit" name="titleFormat[% loop.index %]" id="titleFormat[% loop.index %]" value="[% format %]" size="40"><br>
 		[% END %]
 	
@@ -80,7 +80,7 @@
 		<div class="groupHead">[% "SETUP_GUESSFILEFORMATS" | string | upper %]</div>
 		<div class="groupDesc">[% "SETUP_GROUP_GUESSFILEFORMATS_DESC" | string %]</div>
 
-		[% FOREACH format = guessFileFormats %]
+		[% FOREACH format = prefs.guessFileFormats %]
 			<input type="text" class="stdedit" name="guessFileFormats[% loop.index %]" id="guessFileFormats[% loop.index %]" value="[% format %]" size="40"><br>
 		[% END %]
 	

Modified: trunk/server/HTML/EN/settings/server/interface.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/interface.html?rev=11787&r1=11786&r2=11787&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/interface.html (original)
+++ trunk/server/HTML/EN/settings/server/interface.html Fri Apr 20 17:45:32 2007
@@ -9,7 +9,7 @@
 
 		[% FOREACH option = skinoptions.keys %]
 
-			<option [% IF skin == option %]selected [% END %]value="[% option %]">[% skinoptions.$option %]</option>
+			<option [% IF prefs.skin == option %]selected [% END %]value="[% option %]">[% skinoptions.$option %]</option>
 
 		[%- END -%]
 		
@@ -18,27 +18,27 @@
 		<div class="prefHead">[% "SETUP_ITEMSPERPAGE" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_ITEMSPERPAGE_DESC" | string %]</div>
 
-		<input type="text" class="stdedit" name="itemsPerPage" id="itemsPerPage" value="[% itemsPerPage %]" size="15">
+		<input type="text" class="stdedit" name="itemsPerPage" id="itemsPerPage" value="[% prefs.itemsPerPage %]" size="15">
 
 		<div class="prefHead">[% "SETUP_REFRESHRATE" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_REFRESHRATE_DESC" | string %]</div>
 
-		<input type="text" class="stdedit" name="refreshRate" id="refreshRate" value="[% refreshRate %]" size="15">
+		<input type="text" class="stdedit" name="refreshRate" id="refreshRate" value="[% prefs.refreshRate %]" size="15">
 
 		<div class="prefHead">[% "SETUP_COVERART" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_COVERART_DESC" | string %]</div>
 
-		<input type="text" class="stdedit" name="coverArt" id="coverArtID" value="[% coverArt %]" size="20">
+		<input type="text" class="stdedit" name="coverArt" id="coverArtID" value="[% prefs.coverArt %]" size="20">
 
 		<div class="prefHead">[% "SETUP_ARTFOLDER" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_ARTFOLDER_DESC" | string %]</div>
 
-		<input type="text" class="stdedit" name="artfolder" id="artfolder" value="[% artfolder %]" size="40">
+		<input type="text" class="stdedit" name="artfolder" id="artfolder" value="[% prefs.artfolder %]" size="40">
 
 		<div class="prefHead">[% "SETUP_THUMBSIZE" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_THUMBSIZE_DESC" | string %]</div>
 
-		<input type="text" class="stdedit" name="thumbSize" id="thumbSize" value="[% thumbSize %]" size="15">
+		<input type="text" class="stdedit" name="thumbSize" id="thumbSize" value="[% prefs.thumbSize %]" size="15">
 
 	</div>
 

Modified: trunk/server/HTML/EN/settings/server/networking.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/networking.html?rev=11787&r1=11786&r2=11787&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/networking.html (original)
+++ trunk/server/HTML/EN/settings/server/networking.html Fri Apr 20 17:45:32 2007
@@ -6,23 +6,23 @@
 		<div class="prefDesc">[% "SETUP_WEBPROXY_DESC" | string %]</div>
 
 		<label for="webproxy" class="stdlabel">[% "SETUP_WEBPROXY_CHOOSE" | string %]</label>
-		<input type=text class="stdedit" name="webproxy" id="webproxy" value="[% webproxy %]" size="40">
+		<input type=text class="stdedit" name="webproxy" id="webproxy" value="[% prefs.webproxy %]" size="40">
 
 		<div class="prefHead">[% "SETUP_HTTPPORT" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_HTTPPORT_DESC" | string %]</div>
 
-		<input type=text class="stdedit" name="httpport" id="httpport" value="[% httpport %]" size="15">
+		<input type=text class="stdedit" name="httpport" id="httpport" value="[% prefs.httpport %]" size="15">
 
 		<div class="prefHead">[% "SETUP_BUFFERSECS" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_BUFFERSECS_DESC" | string %]</div>
 
-		<input type=text class="stdedit" name="bufferSecs" id="bufferSecs" value="[% bufferSecs %]" size="15">
+		<input type=text class="stdedit" name="bufferSecs" id="bufferSecs" value="[% prefs.bufferSecs %]" size="15">
 
 		<div class="prefHead">[% "SETUP_REMOTESTREAMTIMEOUT" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_REMOTESTREAMTIMEOUT_DESC" | string %]</div>
 
 		<label for="remotestreamtimeout" class="stdlabel">[% "SETUP_REMOTESTREAMTIMEOUT_CHOOSE" | string %]</label>
-		<input type=text class="stdedit" name="remotestreamtimeout" id="remotestreamtimeout" value="[% remotestreamtimeout %]" size="15">
+		<input type=text class="stdedit" name="remotestreamtimeout" id="remotestreamtimeout" value="[% prefs.remotestreamtimeout %]" size="15">
 
 		<div class="prefHead">[% "SETUP_MAXWMARATE" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_MAXWMARATE_DESC" | string %]</div>
@@ -30,7 +30,7 @@
 		<select class="stdedit" name="maxWMArate" id="maxWMArate">
 
 		[% FOREACH option = ['9999', '32', '64', '96', '128', '160', '192', '256', '320'] %]
-			<option [% IF maxWMArate == option %]selected [% END %]value="[% option %]">
+			<option [% IF prefs.maxWMArate == option %]selected [% END %]value="[% option %]">
 				[% IF option == 9999 %][% "NO_LIMIT" | string %][% ELSE %][% option %] [% 'KBPS' | string %][% END %]</option>
 		[%- END -%]
 
@@ -41,33 +41,39 @@
 		<div class="prefDesc">[% "SETUP_MDNSNAME_DESC" | string %]</div>
 		
 		<label for="mDNSname" class="stdlabel">[% "SETUP_MDNSNAME_CHOOSE" | string %]</label>
-		<input type=text class="stdedit" name="mDNSname" id="mDNSname" value="[% mDNSname %]" size="20">
+		<input type=text class="stdedit" name="mDNSname" id="mDNSname" value="[% prefs.mDNSname %]" size="20">
 		[% END %]
 
 	</div>
+	[% IF prefs.exists('tcpReadMaximum') || prefs.exists('tcpWriteMaximum') || prefs.exists('udpChunkSize') %]
 	<div class="settingSection">
 
 		<div class="groupHead">[% "SETUP_GROUP_TCP_PARAMS" | string | upper %]</div>
 		<div class="groupDesc">[% "SETUP_GROUP_TCP_PARAMS_DESC" | string %]</div>
 				
 		<table border="0" width="100%">
+		[% IF prefs.exists('tcpReadMaximum') %]
 		<tr>
 		<td><label for="tcpReadMaximum" class="stdlabel">[% "SETUP_TCPREADMAXIMUM_CHOOSE" | string %]</label></td>
-		<td><input type="text" class="stdedit" name="tcpReadMaximum" id="tcpReadMaximum" value="[% tcpReadMaximum %]" size="15"></td>
+		<td><input type="text" class="stdedit" name="tcpReadMaximum" id="tcpReadMaximum" value="[% prefs.tcpReadMaximum %]" size="15"></td>
 		</tr>
-		
+		[% END %]
+		[% IF prefs.exists('tcpWriteMaximum') %]
 		<tr>
 		<td><label for="tcpWriteMaximum" class="stdlabel">[% "SETUP_TCPWRITEMAXIMUM_CHOOSE" | string %]</label></td>
-		<td><input type="text" class="stdedit" name="tcpWriteMaximum" id="tcpWriteMaximum" value="[% tcpWriteMaximum %]" size="15"></td>
+		<td><input type="text" class="stdedit" name="tcpWriteMaximum" id="tcpWriteMaximum" value="[% prefs.tcpWriteMaximum %]" size="15"></td>
 		</tr>
-		
+		[% END %]
+		[% IF prefs.exists('udpChunkSize') %]
 		<tr>
 		<td><label for="udpChunkSize" class="stdlabel">[% "SETUP_UDPCHUNKSIZE_CHOOSE" | string %]</label></td>
-		<td><input type="text" class="stdedit" name="udpChunkSize" id="udpChunkSize" value="[% udpChunkSize %]" size="15"></td>
+		<td><input type="text" class="stdedit" name="udpChunkSize" id="udpChunkSize" value="[% prefs.udpChunkSize %]" size="15"></td>
 		</tr>
+		[% END %]
 		</table>
 		
 	</div>
+	[% END %]
 
 [% PROCESS settings/footer.html %]
 

Modified: trunk/server/HTML/EN/settings/server/performance.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/performance.html?rev=11787&r1=11786&r2=11787&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/performance.html (original)
+++ trunk/server/HTML/EN/settings/server/performance.html Fri Apr 20 17:45:32 2007
@@ -7,15 +7,17 @@
 
 		<select class="stdedit" name="disableStatistics" id="disableStatistics">
 
-			<option [% IF NOT disableStatistics %]selected [% END %]value="0">[% 'SETUP_ENABLE_STATISTICS' | getstring %]</option>
-			<option [% IF disableStatistics %]selected [% END %]value="1">[% 'SETUP_DISABLE_STATISTICS' | getstring %]</option>
+			<option [% IF NOT prefs.disableStatistics %]selected [% END %]value="0">[% 'SETUP_ENABLE_STATISTICS' | getstring %]</option>
+			<option [% IF prefs.disableStatistics %]selected [% END %]value="1">[% 'SETUP_DISABLE_STATISTICS' | getstring %]</option>
 		
 		</select>
 
+		[% IF prefs.exists('forkedWeb') %]
 		<div class="prefHead">[% "SETUP_PREFSWRITEDELAY" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_PREFSWRITEDELAY_DESC" | string %]</div>
 
-		<input type=text class="stdedit" name="prefsWriteDelay" id="prefsWriteDelay" value="[% prefsWriteDelay %]" size="15">
+		<input type=text class="stdedit" name="prefsWriteDelay" id="prefsWriteDelay" value="[% prefs.prefsWriteDelay %]" size="15">
+		[% END %]
 
 		<div class="prefHead">[% "SETUP_SERVERPRIORITY" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_SERVERPRIORITY_DESC" | string %]</div>
@@ -23,9 +25,9 @@
 		<select class="stdedit" name="serverPriority" id="serverPriority">
 
 		[% option = "" %]
-		<option [% IF serverPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
+		<option [% IF prefs.serverPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
 		[% FOREACH option = [-20..20] %]
-			<option [% IF serverPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
+			<option [% IF prefs.serverPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
 		[%- END -%]
 
 		</select>
@@ -36,21 +38,21 @@
 		<select class="stdedit" name="scannerPriority" id="scannerPriority">
 
 		[% option = "" %]
-		<option [% IF scannerPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
+		<option [% IF prefs.scannerPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
 		[% FOREACH option = [-20..20] %]
-			<option [% IF scannerPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
+			<option [% IF prefs.scannerPriority == option %]selected [% END %]value="[% option %]">[% option %] [% options.$option | getstring %]</option>
 		[%- END -%]
 
 		</select>
 
-		[% IF forkingPrefs %]
+		[% IF prefs.exists('forkedWeb') || prefs.exists('forkedStreaming') %]
 		<div class="prefHead">[% "SETUP_FORKEDWEB" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_FORKEDWEB_DESC" | string %]</div>
 
 		<select class="stdedit" name="forkedWeb" id="forkedWeb">
 
-			<option [% IF NOT forkedWeb %]selected [% END %]value="0">[% 'SETUP_FORKEDWEB_DISABLE' | getstring %]</option>
-			<option [% IF forkedWeb %]selected [% END %]value="1">[% 'SETUP_FORKEDWEB_ENABLE' | getstring %]</option>
+			<option [% IF NOT prefs.forkedWeb %]selected [% END %]value="0">[% 'SETUP_FORKEDWEB_DISABLE' | getstring %]</option>
+			<option [% IF prefs.forkedWeb %]selected [% END %]value="1">[% 'SETUP_FORKEDWEB_ENABLE' | getstring %]</option>
 		
 		</select>
 		
@@ -59,8 +61,8 @@
 
 		<select class="stdedit" name="forkedStreaming" id="forkedStreaming">
 
-			<option [% IF NOT forkedStreaming %]selected [% END %]value="0">[% 'SETUP_FORKEDSTREAMING_DISABLE' | getstring %]</option>
-			<option [% IF forkedStreaming %]selected [% END %]value="1">[% 'SETUP_FORKEDSTREAMING_ENABLE' | getstring %]</option>
+			<option [% IF NOT prefs.forkedStreaming %]selected [% END %]value="0">[% 'SETUP_FORKEDSTREAMING_DISABLE' | getstring %]</option>
+			<option [% IF prefs.forkedStreaming %]selected [% END %]value="1">[% 'SETUP_FORKEDSTREAMING_ENABLE' | getstring %]</option>
 		
 		</select>
 		[% END %]

Modified: trunk/server/HTML/EN/settings/server/security.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/security.html?rev=11787&r1=11786&r2=11787&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/security.html (original)
+++ trunk/server/HTML/EN/settings/server/security.html Fri Apr 20 17:45:32 2007
@@ -7,18 +7,18 @@
 
 		<select class="stdedit" name="authorize" id="authorize">
 
-			<option [% IF NOT authorize %]selected [% END %]value="0">[% 'SETUP_NO_AUTHORIZE' | getstring %]</option>
-			<option [% IF authorize %]selected [% END %]value="1">[% 'SETUP_AUTHORIZE' | getstring %]</option>
+			<option [% IF NOT prefs.authorize %]selected [% END %]value="0">[% 'SETUP_NO_AUTHORIZE' | getstring %]</option>
+			<option [% IF prefs.authorize %]selected [% END %]value="1">[% 'SETUP_AUTHORIZE' | getstring %]</option>
 		
 		</select>
 
 		<div class="prefHead">[% "SETUP_USERNAME" | string | upper %]</div>
 
-		<input type="text" class="stdedit" name="username" id="username" value="[% username %]" size="40">
+		<input type="text" class="stdedit" name="username" id="username" value="[% prefs.username %]" size="40">
 
 		<div class="prefHead">[% "SETUP_PASSWORD" | string | upper %]</div>
 
-		<input type="password" class="stdedit" name="password" id="password" value="[% password %]" size="40">
+		<input type="password" class="stdedit" name="password" id="password" value="[% prefs.password %]" size="40">
 	
 	</div>
 
@@ -29,24 +29,24 @@
 
 		<select class="stdedit" name="filterHosts" id="filterHosts">
 
-			<option [% IF NOT filterHosts %]selected [% END %]value="0">[% 'SETUP_NO_IPFILTER' | getstring %]</option>
-			<option [% IF filterHosts %]selected [% END %]value="1">[% 'SETUP_IPFILTER' | getstring %]</option>
+			<option [% IF NOT prefs.filterHosts %]selected [% END %]value="0">[% 'SETUP_NO_IPFILTER' | getstring %]</option>
+			<option [% IF prefs.filterHosts %]selected [% END %]value="1">[% 'SETUP_IPFILTER' | getstring %]</option>
 		
 		</select>
 
 		<div class="prefHead">[% "SETUP_FILTERRULE_HEAD" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_FILTERRULE_DESC" | string %]</div>
 
-		<input type="text" class="stdedit" name="allowedHosts" id="allowedHosts" value="[% allowedHosts %]" size="40">
+		<input type="text" class="stdedit" name="allowedHosts" id="allowedHosts" value="[% prefs.allowedHosts %]" size="40">
 
 		<div class="prefHead">[% "SETUP_CSRFPROTECTIONLEVEL" | string | upper %]</div>
 		<div class="prefDesc">[% "SETUP_CSRFPROTECTIONLEVEL_DESC" | string %]</div>
 
 		<select class="stdedit" name="csrfProtectionLevel" id="csrfProtectionLevel">
 
-			<option [% IF csrfProtectionLevel == 0 %]selected [% END %]value="0">[% 'NONE' | getstring %]</option>
-			<option [% IF csrfProtectionLevel == 1 %]selected [% END %]value="1">[% 'MEDIUM' | getstring %]</option>
-			<option [% IF csrfProtectionLevel == 2 %]selected [% END %]value="2">[% 'HIGH' | getstring %]</option>
+			<option [% IF prefs.csrfProtectionLevel == 0 %]selected [% END %]value="0">[% 'NONE' | getstring %]</option>
+			<option [% IF prefs.csrfProtectionLevel == 1 %]selected [% END %]value="1">[% 'MEDIUM' | getstring %]</option>
+			<option [% IF prefs.csrfProtectionLevel == 2 %]selected [% END %]value="2">[% 'HIGH' | getstring %]</option>
 		
 		</select>
 	



More information about the checkins mailing list