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

5 files changed, 13 insertions, 13 deletions

diff --git a/Pigeonholes.php b/Pigeonholes.php
index 46d5945..35fb92f 100644
--- a/Pigeonholes.php
+++ b/Pigeonholes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.48 2006/02/24 12:06:07 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.49 2006/03/01 20:16:23 spiderr Exp $
  *
  * +----------------------------------------------------------------------+
  * | Copyright ( c ) 2004, bitweaver.org
@@ -17,7 +17,7 @@
  * Pigeonholes class
  *
  * @author   xing <xing@synapse.plus.com>
- * @version  $Revision: 1.48 $
+ * @version  $Revision: 1.49 $
  * @package  pigeonholes
  */
 
@@ -376,7 +376,7 @@ class Pigeonholes extends LibertyAttachable {
 				$aux['display_path'] = Pigeonholes::getDisplayPath( $aux['path'] );
 				$aux['members'] = $this->getMemberList( array( 'content_id' => $aux['content_id'] ) );
 				$aux['members_count'] = count( $aux['members'] );
-				if( $gBitSystem->getPreference( 'pigeonholes_list_style' ) == 'table' ) {
+				if( $gBitSystem->getConfig( 'pigeonholes_list_style' ) == 'table' ) {
 					$this->alphabetiseMembers( $aux['members'] );
 				}
 			}
@@ -404,7 +404,7 @@ class Pigeonholes extends LibertyAttachable {
 	**/
 	function checkPathPermissions( $pPath ) {
 		global $gBitUser, $gBitSystem;
-		if( $gBitSystem->getPreference( 'pigeonholes_permissions' ) || $gBitSystem->getPreference( 'pigeonholes_groups' ) ) {
+		if( $gBitSystem->getConfig( 'pigeonholes_permissions' ) || $gBitSystem->getConfig( 'pigeonholes_groups' ) ) {
 			foreach( $pPath as $path ) {
 				$contentIds[] = $path['content_id'];
 			}
@@ -431,7 +431,7 @@ class Pigeonholes extends LibertyAttachable {
 		global $gBitSystem;
 		if( !empty( $pMememberHash ) ) {
 			usort( $pMememberHash, "pigeonholes_alphabetiser" );
-			$per_column = ceil( count( $pMememberHash ) / $gBitSystem->getPreference( 'pigeonhole_display_columns', 3 ) );
+			$per_column = ceil( count( $pMememberHash ) / $gBitSystem->getConfig( 'pigeonhole_display_columns', 3 ) );
 			$i = 1;
 			$j = 1;
 			foreach( $pMememberHash as $member ) {
diff --git a/templates/admin_pigeonholes.tpl b/templates/admin_pigeonholes.tpl
index a871232..7d4bad2 100644
--- a/templates/admin_pigeonholes.tpl
+++ b/templates/admin_pigeonholes.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_pigeonholes/templates/admin_pigeonholes.tpl,v 1.2 2006/01/14 19:55:19 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_pigeonholes/templates/admin_pigeonholes.tpl,v 1.3 2006/03/01 20:16:23 spiderr Exp $ *}
 {strip}
 {form}
 	{legend legend="Category Settings"}
@@ -7,7 +7,7 @@
 			<div class="row">
 				{formlabel label=`$output.label` for=$feature}
 				{forminput}
-					{html_checkboxes name="$feature" values="y" checked=`$gBitSystemPrefs.$feature` labels=false id=$feature}
+					{html_checkboxes name="$feature" values="y" checked=`$gBitSystem->getConfig('')$feature` labels=false id=$feature}
 					{formhelp note=`$output.note` page=`$output.page`}
 				{/forminput}
 			</div>
@@ -16,7 +16,7 @@
 		<div class="row">
 			{formlabel label="List style" for="pigeonholes_list_style"}
 			{forminput}
-				{html_options name="pigeonholes_list_style" options=$listStyles values=$listStyles selected=`$gBitSystemPrefs.pigeonholes_list_style` id=pigeonholes_list_style}
+				{html_options name="pigeonholes_list_style" options=$listStyles values=$listStyles selected=`$gBitSystem->getConfig('pigeonholes_list_style')` id=pigeonholes_list_style}
 				{formhelp note="Select the display method. Table listing is better suited for large categories.<br />Custom sorting only works with the dynamic list method."}
 			{/forminput}
 		</div>
@@ -24,7 +24,7 @@
 		<div class="row">
 			{formlabel label="Number of Members" for="member_number"}
 			{forminput}
-				{html_options name="limit_member_number" options=$memberLimit values=$memberLimit selected=`$gBitSystemPrefs.limit_member_number` id=member_number}
+				{html_options name="limit_member_number" options=$memberLimit values=$memberLimit selected=`$gBitSystem->getConfig('limit_member_number')` id=member_number}
 				{formhelp note="Here you can specify what number of members are displayed at the bottom of a page."}
 			{/forminput}
 		</div>
diff --git a/templates/display_members.tpl b/templates/display_members.tpl
index 3c5c9be..f141f15 100644
--- a/templates/display_members.tpl
+++ b/templates/display_members.tpl
@@ -1,7 +1,7 @@
 {strip}
 {if $gBitSystem->isFeatureActive( 'display_pigeonhole_members' ) and $pigeonData}
 	<div class="display pigeonholes">
-		{if $gBitSystemPrefs.limit_member_number == 0}
+		{if $gBitSystem->getConfig('limit_member_number') == 0}
 			<h2>{tr}Categories{/tr}</h2>
 			{foreach from=$pigeonData item=pigeonItem}
 				{$pigeonItem.display_path}
@@ -30,7 +30,7 @@
 
 								{if $ctg1 ne $ctg2}{if $ctg2}<br />{/if}{$gLibertySystem->mContentTypes.$ctg1.content_description}:&nbsp;{/if}
 
-								{if !$gBitSystemPrefs.limit_member_number or $member_count lt $gBitSystemPrefs.limit_member_number}
+								{if !$gBitSystem->getConfig('limit_member_number') or $member_count lt $gBitSystem->getConfig('limit_member_number')}
 									{if $serviceHash.content_id == $member.content_id}<strong>{/if}
 										{$member.display_link}
 									{if $serviceHash.content_id == $member.content_id}</strong>{/if}
diff --git a/templates/section_inc.tpl b/templates/section_inc.tpl
index e8ca2b8..df4b385 100644
--- a/templates/section_inc.tpl
+++ b/templates/section_inc.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $gBitSystemPrefs.pigeonholes_list_style == "dynamic" && !$no_details}
+{if $gBitSystem->getConfig('pigeonholes_list_style') == "dynamic" && !$no_details}
 
 	<h3 class="highlight"><a href="{$smarty.const.PIGEONHOLES_PKG_URL}view.php?structure_id={$subtree[ix].structure_id}">{$subtree[ix].title|escape}</a></h3>
 
diff --git a/templates/view_structure.tpl b/templates/view_structure.tpl
index 17d1f9e..8737b67 100644
--- a/templates/view_structure.tpl
+++ b/templates/view_structure.tpl
@@ -5,7 +5,7 @@
 	</div>
 
 	<div class="body">
-		{if $gBitSystemPrefs.pigeonholes_list_style == "table"}
+		{if $gBitSystem->getConfig('pigeonholes_list_style') == "table"}
 			{include file="bitpackage:pigeonholes/view_structure_inc.tpl" no_details=true no_edit=true}
 			{formfeedback hash=$memberFeedback}
 			{include file="bitpackage:pigeonholes/view_table_inc.tpl" no_details=true no_edit=true}