From a55f830acbb3ded3ef3e457d28acd5ccb03e33fb Mon Sep 17 00:00:00 2001
From: Christian Fowler <spider@viovio.com>
Date: Wed, 1 Mar 2006 20:16:18 +0000
Subject: move BitSystem:: preferences methods to get/set/load/storeConfig to
 avoid conflict with new content preferences

---
 templates/admin_newsletters.tpl  | 4 ++--
 templates/edit_edition.tpl       | 2 +-
 templates/unsubscribe_inc.tpl    | 2 +-
 templates/user_subscriptions.tpl | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'templates')

diff --git a/templates/admin_newsletters.tpl b/templates/admin_newsletters.tpl
index 077d843..85ed020 100644
--- a/templates/admin_newsletters.tpl
+++ b/templates/admin_newsletters.tpl
@@ -2,7 +2,7 @@
 {form legend="Newsletter Features"}
 	<input type="hidden" name="page" value="{$page}" />
 
-	{if !$gBitSystem->getPreference( 'feature_server_name' )}
+	{if !$gBitSystem->getConfig( 'feature_server_name' )}
 		{formfeedback error="Server name is not defined!"}
 		{tr}You must <a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=server">define the server name</a> for proper background operation of the mail script.{/tr}
 	{/if}
@@ -11,7 +11,7 @@
 		<div class="row">
 			{formlabel label=`$output.label` for=$item}
 			{forminput}
-				<input type="text" name="{$item}" value="{$gBitSystem->getPreference($item,$output.default)}" id="{$item}" />
+				<input type="text" name="{$item}" value="{$gBitSystem->getConfig($item,$output.default)}" id="{$item}" />
 				{formhelp note=`$output.note` page=`$output.page`}
 			{/forminput}
 		</div>
diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl
index d6ecbb9..b314112 100644
--- a/templates/edit_edition.tpl
+++ b/templates/edit_edition.tpl
@@ -70,7 +70,7 @@
 						<div class="row">
 							{formlabel label="Reply-To" for="replyto"}
 							{forminput}
-								<input type="text" maxlength="250" size="40" name="reply_to" id="replyto" value="{$pageInfo.reply_to|default:$gBitSystem->getPreference('sender_email',$smarty.server.SERVER_ADMIN)|escape:html}" />
+								<input type="text" maxlength="250" size="40" name="reply_to" id="replyto" value="{$pageInfo.reply_to|default:$gBitSystem->getConfig('sender_email',$smarty.server.SERVER_ADMIN)|escape:html}" />
 								{formhelp note="This is the email address to which any replies will be sent."}
 							{/forminput}
 						</div>
diff --git a/templates/unsubscribe_inc.tpl b/templates/unsubscribe_inc.tpl
index 4a91bff..2900d44 100644
--- a/templates/unsubscribe_inc.tpl
+++ b/templates/unsubscribe_inc.tpl
@@ -1,2 +1,2 @@
-{tr}You have received this message because you are registered at{/tr} <a href="{$smarty.const.BIT_ROOT_URL}">{$gBitSystem->getPreference('siteTitle', $smarty.server.HTTP_HOST)}</a>. {tr}You can always cancel your subscription using:{/tr}<br/>
+{tr}You have received this message because you are registered at{/tr} <a href="{$smarty.const.BIT_ROOT_URL}">{$gBitSystem->getConfig('siteTitle', $smarty.server.HTTP_HOST)}</a>. {tr}You can always cancel your subscription using:{/tr}<br/>
 <a href="{$smarty.const.NEWSLETTERS_PKG_URI}?unsubscribe={$code}">{$smarty.const.NEWSLETTERS_PKG_URI}?sub={$url_code}</a>
diff --git a/templates/user_subscriptions.tpl b/templates/user_subscriptions.tpl
index 0533fa9..fd034d3 100644
--- a/templates/user_subscriptions.tpl
+++ b/templates/user_subscriptions.tpl
@@ -40,7 +40,7 @@
 		<div class="row">
 			{formlabel label="Permanent Unsubscribe"}
 			{forminput}
-				<input type="checkbox" name="unsubscribe_all" value="y" {if $subInfo.unsubscribe_all}checked="checked"{/if} /> {tr}Remove myself from all lists, and receive no further mailings from{/tr} {$gBitSystem->getPreference('siteTitle','this site')}.</br>
+				<input type="checkbox" name="unsubscribe_all" value="y" {if $subInfo.unsubscribe_all}checked="checked"{/if} /> {tr}Remove myself from all lists, and receive no further mailings from{/tr} {$gBitSystem->getConfig('siteTitle','this site')}.</br>
 			{/forminput}
 		</div>
 		<div class="row submit">
-- 
cgit v1.3