replace old code with new version of the code - we need to stop babysitting outdated code

2 files changed, 29 insertions, 29 deletions

diff --git a/templates/admin_wiki.tpl b/templates/admin_wiki.tpl
index 83facef..7785bf7 100644
--- a/templates/admin_wiki.tpl
+++ b/templates/admin_wiki.tpl
@@ -19,14 +19,14 @@
 				{formlabel label="Global WikiPage Cache" for="wiki_cache"}
 				{forminput}
 					<select name="wiki_cache" id="wiki_cache">
-						<option value="0" {if $wiki_cache eq 0}selected="selected"{/if}>{tr}0 (no cache){/tr}</option>
-						<option value="60" {if $wiki_cache eq 60}selected="selected"{/if}>{tr}1 minute{/tr}</option>
-						<option value="300" {if $wiki_cache eq 300}selected="selected"{/if}>{tr}5 minutes{/tr}</option>
-						<option value="600" {if $wiki_cache eq 600}selected="selected"{/if}>{tr}10 minutes{/tr}</option>
-						<option value="900" {if $wiki_cache eq 900}selected="selected"{/if}>{tr}15 minutes{/tr}</option>
-						<option value="1800" {if $wiki_cache eq 1800}selected="selected"{/if}>{tr}30 minutes{/tr}</option>
-						<option value="3600" {if $wiki_cache eq 3600}selected="selected"{/if}>{tr}1 hour{/tr}</option>
-						<option value="7200" {if $wiki_cache eq 7200}selected="selected"{/if}>{tr}2 hours{/tr}</option>
+						<option value="0"    {if $gBitSystemPrefs.wiki_cache eq 0}selected="selected"{/if}>{tr}0 (no cache){/tr}</option>
+						<option value="60"   {if $gBitSystemPrefs.wiki_cache eq 60}selected="selected"{/if}>{tr}1 minute{/tr}</option>
+						<option value="300"  {if $gBitSystemPrefs.wiki_cache eq 300}selected="selected"{/if}>{tr}5 minutes{/tr}</option>
+						<option value="600"  {if $gBitSystemPrefs.wiki_cache eq 600}selected="selected"{/if}>{tr}10 minutes{/tr}</option>
+						<option value="900"  {if $gBitSystemPrefs.wiki_cache eq 900}selected="selected"{/if}>{tr}15 minutes{/tr}</option>
+						<option value="1800" {if $gBitSystemPrefs.wiki_cache eq 1800}selected="selected"{/if}>{tr}30 minutes{/tr}</option>
+						<option value="3600" {if $gBitSystemPrefs.wiki_cache eq 3600}selected="selected"{/if}>{tr}1 hour{/tr}</option>
+						<option value="7200" {if $gBitSystemPrefs.wiki_cache eq 7200}selected="selected"{/if}>{tr}2 hours{/tr}</option>
 					</select>
 					{formhelp note="Cache wikipages for the given amount of time."}
 				{/forminput}
@@ -39,12 +39,12 @@
 				{/forminput}
 				{forminput}
 					<select name="warn_on_edit_time">
-						<option value="1" {if $warn_on_edit_time eq 1}selected="selected"{/if}>{tr}1{/tr}</option>
-						<option value="2" {if $warn_on_edit_time eq 2}selected="selected"{/if}>{tr}2{/tr}</option>
-						<option value="5" {if $warn_on_edit_time eq 5}selected="selected"{/if}>{tr}5{/tr}</option>
-						<option value="10" {if $warn_on_edit_time eq 10}selected="selected"{/if}>{tr}10{/tr}</option>
-						<option value="15" {if $warn_on_edit_time eq 15}selected="selected"{/if}>{tr}15{/tr}</option>
-						<option value="30" {if $warn_on_edit_time eq 30}selected="selected"{/if}>{tr}30{/tr}</option>
+						<option value="1"  {if $gBitSystemPrefs.warn_on_edit_time eq 1}selected="selected"{/if}>{tr}1{/tr}</option>
+						<option value="2"  {if $gBitSystemPrefs.warn_on_edit_time eq 2}selected="selected"{/if}>{tr}2{/tr}</option>
+						<option value="5"  {if $gBitSystemPrefs.warn_on_edit_time eq 5}selected="selected"{/if}>{tr}5{/tr}</option>
+						<option value="10" {if $gBitSystemPrefs.warn_on_edit_time eq 10}selected="selected"{/if}>{tr}10{/tr}</option>
+						<option value="15" {if $gBitSystemPrefs.warn_on_edit_time eq 15}selected="selected"{/if}>{tr}15{/tr}</option>
+						<option value="30" {if $gBitSystemPrefs.warn_on_edit_time eq 30}selected="selected"{/if}>{tr}30{/tr}</option>
 					</select> {tr}minutes{/tr}
 					{formhelp note="Display a warning if someone has started editing a page within this time range and somebody else starts editing the same page."}
 				{/forminput}
@@ -198,9 +198,9 @@
 					{formlabel label="Wiki Link Format" for="wiki_page_regex"}
 					{forminput}
 						<select name="wiki_page_regex" id="wiki_page_regex">
-							<option value="complete" {if $wiki_page_regex eq 'complete'}selected="selected"{/if}>{tr}complete{/tr}</option>
-							<option value="full" {if $wiki_page_regex eq 'full'}selected="selected"{/if}>{tr}latin{/tr}</option>
-							<option value="strict" {if $wiki_page_regex eq 'strict'}selected="selected"{/if}>{tr}english{/tr}</option>
+							<option value="complete" {if $gBitSystemPrefs.wiki_page_regex eq 'complete'}selected="selected"{/if}>{tr}complete{/tr}</option>
+							<option value="full"     {if $gBitSystemPrefs.wiki_page_regex eq 'full'}selected="selected"{/if}>{tr}latin{/tr}</option>
+							<option value="strict"   {if $gBitSystemPrefs.wiki_page_regex eq 'strict'}selected="selected"{/if}>{tr}english{/tr}</option>
 						</select>
 						{formhelp note="Controls recognition of Wiki links using the two parenthesis Wiki link syntax <i>((page name))</i>."}
 					{/forminput}
@@ -235,7 +235,7 @@
 				<div class="row">
 					{formlabel label="Enable Feature" for="wiki_feature_copyrights"}
 					{forminput}
-						{html_checkboxes name="wiki_feature_copyrights" values="y" checked=$wiki_feature_copyrights labels=false id="wiki_feature_copyrights"}
+						{html_checkboxes name="wiki_feature_copyrights" values="y" checked=$gBitSystemPrefs.wiki_feature_copyrights labels=false id="wiki_feature_copyrights"}
 					{/forminput}
 				</div>
 
diff --git a/templates/edit_page.tpl b/templates/edit_page.tpl
index 6fbadf9..301d032 100644
--- a/templates/edit_page.tpl
+++ b/templates/edit_page.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/edit_page.tpl,v 1.13 2006/01/10 21:19:20 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/edit_page.tpl,v 1.14 2006/01/27 23:01:25 squareing Exp $ *}
 <div class="floaticon">{bithelp}</div>
 
 <div class="edit wiki">
@@ -151,10 +151,10 @@
 					{/jstab}
 				{/if}
 
-				{if $gBitSystem->isFeatureActive( 'feature_wiki_icache' ) or $wiki_spellcheck eq 'y'}
+				{if $gBitSystem->isFeatureActive( 'feature_wiki_icache' ) or $gBitSystem->isFeatureActive( 'wiki_spellcheck' )}
 					{jstab title="Advanced"}
 						{legend legend="Advanced Options"}
-							{if $wiki_spellcheck eq 'y'}
+							{if $gBitSystem->isFeatureActive( 'wiki_spellcheck' )}
 								<div class="row">
 									{formlabel label="Spellcheck" for="spellcheck"}
 									{forminput}
@@ -169,14 +169,14 @@
 									{formlabel label="Cache" for="wiki_cache"}
 									{forminput}
 										<select name="wiki_cache" id="wiki_cache">
-											<option value="0" {if $wiki_cache eq 0}selected="selected"{/if}>{tr}0 (no cache){/tr}</option>
-											<option value="60" {if $wiki_cache eq 60}selected="selected"{/if}>{tr}1 minute{/tr}</option>
-											<option value="300" {if $wiki_cache eq 300}selected="selected"{/if}>{tr}5 minutes{/tr}</option>
-											<option value="600" {if $wiki_cache eq 600}selected="selected"{/if}>{tr}10 minutes{/tr}</option>
-											<option value="900" {if $wiki_cache eq 900}selected="selected"{/if}>{tr}15 minutes{/tr}</option>
-											<option value="1800" {if $wiki_cache eq 1800}selected="selected"{/if}>{tr}30 minutes{/tr}</option>
-											<option value="3600" {if $wiki_cache eq 3600}selected="selected"{/if}>{tr}1 hour{/tr}</option>
-											<option value="7200" {if $wiki_cache eq 7200}selected="selected"{/if}>{tr}2 hours{/tr}</option>
+											<option value="0"    {if $gBitSystemPrefs.wiki_cache eq 0}selected="selected"{/if}>{tr}0 (no cache){/tr}</option>
+											<option value="60"   {if $gBitSystemPrefs.wiki_cache eq 60}selected="selected"{/if}>{tr}1 minute{/tr}</option>
+											<option value="300"  {if $gBitSystemPrefs.wiki_cache eq 300}selected="selected"{/if}>{tr}5 minutes{/tr}</option>
+											<option value="600"  {if $gBitSystemPrefs.wiki_cache eq 600}selected="selected"{/if}>{tr}10 minutes{/tr}</option>
+											<option value="900"  {if $gBitSystemPrefs.wiki_cache eq 900}selected="selected"{/if}>{tr}15 minutes{/tr}</option>
+											<option value="1800" {if $gBitSystemPrefs.wiki_cache eq 1800}selected="selected"{/if}>{tr}30 minutes{/tr}</option>
+											<option value="3600" {if $gBitSystemPrefs.wiki_cache eq 3600}selected="selected"{/if}>{tr}1 hour{/tr}</option>
+											<option value="7200" {if $gBitSystemPrefs.wiki_cache eq 7200}selected="selected"{/if}>{tr}2 hours{/tr}</option>
 										</select>
 										{formhelp note=""}
 									{/forminput}