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

4 files changed, 8 insertions, 8 deletions

diff --git a/admin/admin_search_inc.php b/admin/admin_search_inc.php
index 6b60548..6cd913b 100644
--- a/admin/admin_search_inc.php
+++ b/admin/admin_search_inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_search/admin/admin_search_inc.php,v 1.8 2006/02/09 10:59:59 lsces Exp $
+// $Header: /cvsroot/bitweaver/_bit_search/admin/admin_search_inc.php,v 1.9 2006/03/01 20:16:28 spiderr Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
@@ -69,7 +69,7 @@ if (isset($_REQUEST["searchaction"])) {
 	}
 } else {
 	foreach( $formSearchInts as $item => $data ) {
-		$formSearchInts[$item]['value'] = $gBitSystem->getPreference( $item );
+		$formSearchInts[$item]['value'] = $gBitSystem->getConfig( $item );
 	}
 }
 $gBitSmarty->assign( 'formSearchToggles',$formSearchToggles );
diff --git a/index.php b/index.php
index 611d606..db33d7c 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_search/index.php,v 1.15 2006/02/16 13:48:12 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_search/index.php,v 1.16 2006/03/01 20:16:28 spiderr Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
@@ -93,7 +93,7 @@ if ( $cant > 0 ) {
 	}
 }
 // calculate page number
-$numPages = ceil( $cant / $gBitSystem->getPreference( 'max_records' ) );
+$numPages = ceil( $cant / $gBitSystem->getConfig( 'max_records' ) );
 $gBitSmarty->assign( 'numPages', $numPages );
 
 $_REQUEST['cant'] = $cant;
diff --git a/refresh_functions.php b/refresh_functions.php
index ea721b7..d8a071d 100644
--- a/refresh_functions.php
+++ b/refresh_functions.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_search/refresh_functions.php,v 1.24 2006/02/24 23:15:16 seannerd Exp $
+ * $Header: /cvsroot/bitweaver/_bit_search/refresh_functions.php,v 1.25 2006/03/01 20:16:28 spiderr Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: refresh_functions.php,v 1.24 2006/02/24 23:15:16 seannerd Exp $
+ * $Id: refresh_functions.php,v 1.25 2006/03/01 20:16:28 spiderr Exp $
  * @author  Luis Argerich (lrargerich@yahoo.com)
  * @package search
  * @subpackage functions
@@ -148,7 +148,7 @@ function insert_index( &$words, $location, $pContentId ) {
 		delete_index($pContentId);
 		$now = $gBitSystem->getUTCTime();
 		foreach ($words as $key=>$value) {
-			if (strlen($key) >= $gBitSystem->getPreference( 'search_min_wordlength') ) {
+			if (strlen($key) >= $gBitSystem->getConfig( 'search_min_wordlength') ) {
 				// todo: stopwords + common words.
 				$query = "INSERT INTO `" . BIT_DB_PREFIX . "searchindex`
 					(`content_id`,`searchword`,`i_count`,`last_update`) values (?,?,?,?)";
diff --git a/templates/admin_search.tpl b/templates/admin_search.tpl
index e1cc7d7..daf0ff7 100644
--- a/templates/admin_search.tpl
+++ b/templates/admin_search.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>