move BitSystem:: preferences methods to get/set/load/storeConfig to avoid conflict with new content preferences

6 files changed, 23 insertions, 23 deletions

diff --git a/templates/admin_comments.tpl b/templates/admin_comments.tpl
index 3f0ee5c..8b9c03a 100644
--- a/templates/admin_comments.tpl
+++ b/templates/admin_comments.tpl
@@ -12,7 +12,7 @@
 				<div class="row">
 					{formlabel label=`$output.label` for=$item}
 					{forminput}
-						{html_checkboxes name="$item" values="y" checked=`$gBitSystemPrefs.$item` labels=false id=$item}
+						{html_checkboxes name="$item" values="y" checked=`$gBitSystem->getConfig('')$item` labels=false id=$item}
 						{formhelp note=`$output.note` page=`$output.page`}
 					{/forminput}
 				</div>
@@ -22,12 +22,12 @@
 				{formlabel label="Comments per Page" for="comments_per_page"}
 				{forminput}
 					<select name="comments_per_page" id="comments_per_page">
-						<option value="5" {if $gBitSystemPrefs.comments_per_page eq 5}selected="selected"{/if}>5</option>
-						<option value="10" {if $gBitSystemPrefs.comments_per_page eq 10}selected="selected"{/if}>10</option>
-						<option value="20" {if $gBitSystemPrefs.comments_per_page eq 20}selected="selected"{/if}>20</option>
-						<option value="50" {if $gBitSystemPrefs.comments_per_page eq 50}selected="selected"{/if}>50</option>
-						<option value="100" {if $gBitSystemPrefs.comments_per_page eq 100}selected="selected"{/if}>100</option>
-						<option value="999999" {if $gBitSystemPrefs.comments_per_page eq 999999}selected="selected"{/if}>All</option>
+						<option value="5" {if $gBitSystem->getConfig('comments_per_page') eq 5}selected="selected"{/if}>5</option>
+						<option value="10" {if $gBitSystem->getConfig('comments_per_page') eq 10}selected="selected"{/if}>10</option>
+						<option value="20" {if $gBitSystem->getConfig('comments_per_page') eq 20}selected="selected"{/if}>20</option>
+						<option value="50" {if $gBitSystem->getConfig('comments_per_page') eq 50}selected="selected"{/if}>50</option>
+						<option value="100" {if $gBitSystem->getConfig('comments_per_page') eq 100}selected="selected"{/if}>100</option>
+						<option value="999999" {if $gBitSystem->getConfig('comments_per_page') eq 999999}selected="selected"{/if}>All</option>
 					</select>
 					{formhelp note="Default number of comments per page."}
 				{/forminput}
@@ -37,9 +37,9 @@
 				{formlabel label="Default Sort Mode" for="comments_default_ordering"}
 				{forminput}
 					<select name="comments_default_ordering" id="comments_default_ordering">
-						<option value="commentDate_desc" {if $gBitSystemPrefs.comments_default_ordering eq 'commentDate_desc'}selected="selected"{/if}>{tr}Newest first{/tr}</option>
-						<option value="commentDate_asc" {if $gBitSystemPrefs.comments_default_ordering eq 'commentDate_asc'}selected="selected"{/if}>{tr}Oldest first{/tr}</option>
-						{*<option value="points_desc" {if $gBitSystemPrefs.comments_default_ordering eq 'points_desc'}selected="selected"{/if}>{tr}Points{/tr}</option>*}
+						<option value="commentDate_desc" {if $gBitSystem->getConfig('comments_default_ordering') eq 'commentDate_desc'}selected="selected"{/if}>{tr}Newest first{/tr}</option>
+						<option value="commentDate_asc" {if $gBitSystem->getConfig('comments_default_ordering') eq 'commentDate_asc'}selected="selected"{/if}>{tr}Oldest first{/tr}</option>
+						{*<option value="points_desc" {if $gBitSystem->getConfig('comments_default_ordering') eq 'points_desc'}selected="selected"{/if}>{tr}Points{/tr}</option>*}
 					</select>
 					{formhelp note="Select the default sort mode for comments."}
 				{/forminput}
@@ -49,8 +49,8 @@
 				{formlabel label="Comments default display mode" for="comments_default_display_mode"}
 				{forminput}
 					<select name="comments_default_display_mode" id="comments_default_display_mode">
-						<option value="threaded" {if $gBitSystemPrefs.comments_default_display_mode eq 'threaded'}selected="selected"{/if}>{tr}Threaded{/tr}</option>
-						<option value="flat" {if $gBitSystemPrefs.comments_default_display_mode eq 'flat'}selected="selected"{/if}>{tr}Flat{/tr}</option>
+						<option value="threaded" {if $gBitSystem->getConfig('comments_default_display_mode') eq 'threaded'}selected="selected"{/if}>{tr}Threaded{/tr}</option>
+						<option value="flat" {if $gBitSystem->getConfig('comments_default_display_mode') eq 'flat'}selected="selected"{/if}>{tr}Flat{/tr}</option>
 					</select>
 				{/forminput}
 			</div>
diff --git a/templates/admin_liberty.tpl b/templates/admin_liberty.tpl
index 5dfead6..220203e 100644
--- a/templates/admin_liberty.tpl
+++ b/templates/admin_liberty.tpl
@@ -8,7 +8,7 @@
 						<div class="row">
 							{formlabel label=`$output.label` for=$item}
 							{forminput}
-								{html_checkboxes name="$item" values="y" checked=`$gBitSystemPrefs.$item` labels=false id=$item}
+								{html_checkboxes name="$item" values="y" checked=`$gBitSystem->getConfig('')$item` labels=false id=$item}
 								{formhelp note=`$output.note` page=`$output.page`}
 							{/forminput}
 						</div>
@@ -16,7 +16,7 @@
 						<div class="row">
 							{formlabel label="Auto-Display Attachment Thumbnails" for="liberty_auto_display_attachment_thumbs"}
 							{forminput}
-								{html_options options=$thumbSizes name="liberty_auto_display_attachment_thumbs" selected=$gBitSystem->getPreference('liberty_auto_display_attachment_thumbs')}
+								{html_options options=$thumbSizes name="liberty_auto_display_attachment_thumbs" selected=$gBitSystem->getConfig('liberty_auto_display_attachment_thumbs')}
 								{formhelp note='This will automatically display thumbnails of all attachments of a given page (usually in the top right corner of the page). You can still display the items inline as well.' page=''}
 							{/forminput}
 						</div>
@@ -48,7 +48,7 @@
 					"}
 					{forminput}
 						<label>
-							<input type="radio" name="image_processor" value="gd" {if !$gdInstalled}disabled="disabled"{/if} {if !$gBitSystem->getPreference('image_processor') || $gBitSystem->getPreference('image_processor')=='gd'}checked="checked"{/if} /> gdLibrary
+							<input type="radio" name="image_processor" value="gd" {if !$gdInstalled}disabled="disabled"{/if} {if !$gBitSystem->getConfig('image_processor') || $gBitSystem->getConfig('image_processor')=='gd'}checked="checked"{/if} /> gdLibrary
 						</label>
 					{/forminput}
 				</div>
@@ -65,7 +65,7 @@
 					"}
 					{forminput}
 						<label>
-							<input type="radio" name="image_processor" value="magickwand" {if !$magickwandInstalled}disabled="disabled"{/if} {if $gBitSystem->getPreference('image_processor')=='magickwand'}checked="checked"{/if}/> ImageMagick's MagickWand
+							<input type="radio" name="image_processor" value="magickwand" {if !$magickwandInstalled}disabled="disabled"{/if} {if $gBitSystem->getConfig('image_processor')=='magickwand'}checked="checked"{/if}/> ImageMagick's MagickWand
 						</label>
 					{/forminput}
 				</div>
@@ -82,7 +82,7 @@
 					"}
 					{forminput}
 						<label>
-							<input type="radio" name="image_processor" value="imagick" {if !$imagickInstalled}disabled="disabled"{/if} {if $gBitSystem->getPreference('image_processor')=='imagick'}checked="checked"{/if}/> php-imagick
+							<input type="radio" name="image_processor" value="imagick" {if !$imagickInstalled}disabled="disabled"{/if} {if $gBitSystem->getConfig('image_processor')=='imagick'}checked="checked"{/if}/> php-imagick
 						</label>
 					{/forminput}
 				</div>
@@ -91,7 +91,7 @@
 					<div class="row">
 						{formlabel label=`$output.label` for=$item}
 						{forminput}
-							{html_checkboxes name="$item" values="y" checked=`$gBitSystemPrefs.$item` labels=false id=$item}
+							{html_checkboxes name="$item" values="y" checked=`$gBitSystem->getConfig('')$item` labels=false id=$item}
 							{formhelp note=`$output.note` page=`$output.page`}
 						{/forminput}
 					</div>
diff --git a/templates/admin_plugins.tpl b/templates/admin_plugins.tpl
index 313bc20..c367674 100644
--- a/templates/admin_plugins.tpl
+++ b/templates/admin_plugins.tpl
@@ -43,7 +43,7 @@
 										</td>
 										<td>{$guid}</td>
 										{if $plugin_type eq 'format'}
-											<td align="center">{if $plugin.is_active == 'y'}{html_radios values=$guid name="default_format" checked=$gBitSystemPrefs.default_format}{/if}</td>
+											<td align="center">{if $plugin.is_active == 'y'}{html_radios values=$guid name="default_format" checked=$gBitSystem->getConfig('default_format')}{/if}</td>
 										{/if}
 										<td align="center">
 											{if $plugin.is_active=='x'}
diff --git a/templates/comments.tpl b/templates/comments.tpl
index 16fa196..c991e29 100644
--- a/templates/comments.tpl
+++ b/templates/comments.tpl
@@ -65,7 +65,7 @@
 			{/if}
 		{/form}
 
-		{if $comments and $gBitSystemPrefs.comments_display_option_bar eq 'y'}
+		{if $comments and $gBitSystem->isFeatureActive('comments_display_option_bar')}
 			{form action="`$comments_return_url`#editcomments"}
 				<input type="hidden" name="post_comment_reply_id" value="{$post_comment_reply_id}" />
 				<input type="hidden" name="post_comment_id" value="{$post_comment_id}" />
diff --git a/templates/edit_format.tpl b/templates/edit_format.tpl
index 41f3a00..990b488 100644
--- a/templates/edit_format.tpl
+++ b/templates/edit_format.tpl
@@ -7,7 +7,7 @@
 		{forminput}
 			<select name="i18n[lang_code]" id="lang_code">
 				{foreach from=$translationsList key=langCode item=lang}
-					<option value="{$langCode}" {if $smarty.request.i18n.lang_code==$langCode || $pageInfo.lang_code==$langCode || ( $langCode==$gBitSystem->getPreference('bitlanguage') && !$smarty.request.i18n.lang_code && !$gContent->getField('lang_code') )}selected="selected" {/if}>{$lang.native_name}</option>
+					<option value="{$langCode}" {if $smarty.request.i18n.lang_code==$langCode || $pageInfo.lang_code==$langCode || ( $langCode==$gBitSystem->getConfig('bitlanguage') && !$smarty.request.i18n.lang_code && !$gContent->getField('lang_code') )}selected="selected" {/if}>{$lang.native_name}</option>
 				{/foreach}
 			</select>
 			{formhelp note="The language of this page"}
@@ -25,7 +25,7 @@
 					{$plugin.edit_field}
 					{if $pageInfo.format_guid eq $plugin.plugin_guid}
 						checked="checked"
-					{elseif !$pageInfo.format_guid and $plugin.plugin_guid eq $gBitSystemPrefs.default_format}
+					{elseif !$pageInfo.format_guid and $plugin.plugin_guid eq $gBitSystem->getConfig('default_format')}
 						checked="checked"
 					{/if}
 					onclick="
diff --git a/templates/storage_thumbs.tpl b/templates/storage_thumbs.tpl
index 01f364c..eec308d 100644
--- a/templates/storage_thumbs.tpl
+++ b/templates/storage_thumbs.tpl
@@ -5,7 +5,7 @@
 	{/if}
 
 	<div class="storage">
-		{assign var=thumbsize value=$gBitSystem->getPreference('liberty_auto_display_attachment_thumbs')}
+		{assign var=thumbsize value=$gBitSystem->getConfig('liberty_auto_display_attachment_thumbs')}
 		{foreach from=$gContent->mStorage item=attachment }
 			{capture name="size"}{$attachment.size|kbsize}{/capture}
 			{capture name="popup"}{include file="bitpackage:kernel/popup_box.tpl" content="`$attachment.filename`<br />{tr}Size{/tr}: `$smarty.capture.size`" noclose=true}{/capture}