more preference standardisation

11 files changed, 81 insertions, 82 deletions

diff --git a/BitBase.php b/BitBase.php
index 3c198f3..99fb8e6 100755
--- a/BitBase.php
+++ b/BitBase.php
@@ -3,7 +3,7 @@
  * Virtual bitweaver base class
  *
  * @package kernel
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/BitBase.php,v 1.13 2006/01/25 15:40:24 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/BitBase.php,v 1.14 2006/02/06 00:07:32 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
@@ -191,7 +191,7 @@ class BitBase
 		global $gBitSmarty, $gBitSystem;
 
 		// If offset is set use it if not then use offset =0
-		// use the maxRecords php variable to set the limit
+		// use the max_records php variable to set the limit
 		// if sortMode is not set then use last_modified_desc
 		if ( empty( $pListHash['sort_mode'] ) ) {
 			if ( empty( $_REQUEST["sort_mode"] ) ) {
@@ -203,7 +203,7 @@ class BitBase
 
 		if( empty( $pListHash['max_records'] ) ) {
 			global $gBitSystem;
-			$pListHash['max_records'] = $gBitSystem->getPreference( "maxRecords", 10 );
+			$pListHash['max_records'] = $gBitSystem->getPreference( "max_records", 10 );
 		}
 
 		if( empty( $pListHash['offset'] ) ) {
diff --git a/BitSystem.php b/BitSystem.php
index f1266a9..4bb84ff 100755
--- a/BitSystem.php
+++ b/BitSystem.php
@@ -3,7 +3,7 @@
  * Main bitweaver systems functions
  *
  * @package kernel
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/BitSystem.php,v 1.38 2006/02/04 16:08:02 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/BitSystem.php,v 1.39 2006/02/06 00:07:32 squareing Exp $
  * @author spider <spider@steelsun.com>
  */
 // +----------------------------------------------------------------------+
@@ -1022,8 +1022,8 @@ asort( $this->mAppMenu );
 
 	function getDefaultPage() {
 		global $userlib, $gBitUser, $gBitSystem;
-		$bitIndex = $this->getPreference( "bitIndex" );
-		if ( $bitIndex == 'group_home') {
+		$bit_index = $this->getPreference( "bit_index" );
+		if ( $bit_index == 'group_home') {
 			// See if we have first a user assigned default group id, and second a group default system preference
 			if( @$this->verifyId( $gBitUser->mInfo['default_group_id'] ) && ( $group_home = $gBitUser->getGroupHome( $gBitUser->mInfo['default_group_id'] ) ) ) {
 			} elseif( $this->getPreference( 'default_home_group' ) && ( $group_home = $gBitUser->getGroupHome( $this->getPreference( 'default_home_group' ) ) ) ) {
@@ -1038,15 +1038,15 @@ asort( $this->mAppMenu );
 					$url = $group_home;
 				}
 			}
-		} elseif( $bitIndex == 'my_page' || $bitIndex == 'my_home' || $bitIndex == 'user_home'  ) {
+		} elseif( $bit_index == 'my_page' || $bit_index == 'my_home' || $bit_index == 'user_home'  ) {
 			// TODO: my_home is deprecated, but was the default for BWR1. remove in DILLINGER - spiderr
 			if( $gBitUser->isRegistered() ) {
 				if( !$gBitUser->isRegistered() ) {
 					$url = USERS_PKG_URL.'login.php';
 				} else {
-					if( $bitIndex == 'my_page' ) {
+					if( $bit_index == 'my_page' ) {
 						$url = USERS_PKG_URL . 'my.php';
-					} elseif( $bitIndex == 'user_home' ) {
+					} elseif( $bit_index == 'user_home' ) {
 						$url = $gBitUser->getDisplayUrl();
 					} else {
 						$homePage = $gBitUser->getPreference( 'homePage' );
@@ -1062,10 +1062,10 @@ asort( $this->mAppMenu );
 			} else {
 				$url = USERS_PKG_URL . 'login.php';
 			}
-		} elseif( in_array( $bitIndex, array_keys( $gBitSystem->mPackages ) ) ) {
-			$url = constant( strtoupper( $bitIndex ).'_PKG_URL' );
-		} elseif( !empty( $bitIndex ) ) {
-			$url = BIT_ROOT_URL.$bitIndex;
+		} elseif( in_array( $bit_index, array_keys( $gBitSystem->mPackages ) ) ) {
+			$url = constant( strtoupper( $bit_index ).'_PKG_URL' );
+		} elseif( !empty( $bit_index ) ) {
+			$url = BIT_ROOT_URL.$bit_index;
 		}
 
 		// if no special case was matched above, default to users' my page
@@ -1692,7 +1692,7 @@ asort( $this->mAppMenu );
 
 	//********************* CACHE METHODS **************************//
 
-	function list_cache($offset, $maxRecords, $sort_mode, $find) {
+	function list_cache($offset, $max_records, $sort_mode, $find) {
 
 		if ($find) {
 		$findesc = '%' . $find . '%';
@@ -1706,7 +1706,7 @@ asort( $this->mAppMenu );
 
 		$query = "select `cache_id` ,`url`,`refresh` from `".BIT_DB_PREFIX."liberty_link_cache` $mid order by ".$this->mDb->convert_sortmode($sort_mode);
 		$query_cant = "select count(*) from `".BIT_DB_PREFIX."liberty_link_cache` $mid";
-		$result = $this->mDb->query($query,$bindvars,$maxRecords,$offset);
+		$result = $this->mDb->query($query,$bindvars,$max_records,$offset);
 		$cant = $this->mDb->getOne($query_cant,$bindvars);
 		$ret = array();
 
diff --git a/admin/admin_general_inc.php b/admin/admin_general_inc.php
index 3035413..4b34a2e 100644
--- a/admin/admin_general_inc.php
+++ b/admin/admin_general_inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_kernel/admin/Attic/admin_general_inc.php,v 1.4 2006/02/01 20:38:41 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_kernel/admin/Attic/admin_general_inc.php,v 1.5 2006/02/06 00:07:32 squareing 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.
@@ -44,17 +44,17 @@ if ($processForm) {
 
 	$pref_simple_values = array(
 		"site_menu_title",
-		"maxRecords",
-		"urlIndex",
+		"max_records",
+		"url_index",
 	);
 
 	foreach ($pref_simple_values as $svitem) {
 		simple_set_value ($svitem);
 	}
 
-	// Special handling for tied fields: bitIndex and urlIndex
-	if (!empty($_REQUEST["urlIndex"]) && $_REQUEST["bitIndex"] == 'custom_home') {
-		$_REQUEST["bitIndex"] = $_REQUEST["urlIndex"];
+	// Special handling for tied fields: bit_index and url_index
+	if (!empty($_REQUEST["url_index"]) && $_REQUEST["bit_index"] == 'custom_home') {
+		$_REQUEST["bit_index"] = $_REQUEST["url_index"];
 	}
 
 	$pref_byref_values = array(
@@ -62,7 +62,7 @@ if ($processForm) {
 		"long_time_format",
 		"short_date_format",
 		"short_time_format",
-		"bitIndex"
+		"bit_index"
 	);
 
 	foreach ($pref_byref_values as $britem) {
diff --git a/admin/admin_notifications.php b/admin/admin_notifications.php
index 494c897..885aecb 100644
--- a/admin/admin_notifications.php
+++ b/admin/admin_notifications.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_notifications.php,v 1.2 2005/08/01 18:40:34 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_notifications.php,v 1.3 2006/02/06 00:07:32 squareing 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.
@@ -48,21 +48,21 @@ if (isset($_REQUEST["find"])) {
 $gBitSmarty->assign('find', $find);
 
 $gBitSmarty->assign_by_ref('sort_mode', $sort_mode);
-$channels = $notificationlib->list_mail_events($offset, $maxRecords, $sort_mode, $find);
+$channels = $notificationlib->list_mail_events($offset, $max_records, $sort_mode, $find);
 
-$cant_pages = ceil($channels["cant"] / $maxRecords);
+$cant_pages = ceil($channels["cant"] / $max_records);
 $gBitSmarty->assign_by_ref('cant_pages', $cant_pages);
-$gBitSmarty->assign('actual_page', 1 + ($offset / $maxRecords));
+$gBitSmarty->assign('actual_page', 1 + ($offset / $max_records));
 
-if ($channels["cant"] > ($offset + $maxRecords)) {
-	$gBitSmarty->assign('next_offset', $offset + $maxRecords);
+if ($channels["cant"] > ($offset + $max_records)) {
+	$gBitSmarty->assign('next_offset', $offset + $max_records);
 } else {
 	$gBitSmarty->assign('next_offset', -1);
 }
 
 // If offset is > 0 then prev_offset
 if ($offset > 0) {
-	$gBitSmarty->assign('prev_offset', $offset - $maxRecords);
+	$gBitSmarty->assign('prev_offset', $offset - $max_records);
 } else {
 	$gBitSmarty->assign('prev_offset', -1);
 }
diff --git a/admin/admin_server_inc.php b/admin/admin_server_inc.php
index 8309844..e0dbf52 100644
--- a/admin/admin_server_inc.php
+++ b/admin/admin_server_inc.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_server_inc.php,v 1.2 2005/08/01 18:40:34 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_kernel/admin/admin_server_inc.php,v 1.3 2006/02/06 00:07:32 squareing 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.
@@ -37,7 +37,7 @@ if( $processForm ) {
 	}
 
 	$pref_byref_values = array(
-		"siteTitle",
+		"site_title",
 		"site_slogan",
 		"site_description",
 		"site_keywords",
@@ -47,16 +47,16 @@ if( $processForm ) {
 		byref_set_value ($britem);
 	}
 
-	// Special handling for tmpDir, which has a default value
-	if (isset($_REQUEST["tmpDir"])) {
-		$gBitSystem->storePreference("tmpDir", $_REQUEST["tmpDir"]);
+	// Special handling for temp_dir, which has a default value
+	if (isset($_REQUEST["temp_dir"])) {
+		$gBitSystem->storePreference("temp_dir", $_REQUEST["temp_dir"]);
 
-		$gBitSmarty->assign_by_ref("tmpDir", $_REQUEST["tmpDir"]);
+		$gBitSmarty->assign_by_ref("temp_dir", $_REQUEST["temp_dir"]);
 	} else {
 		$tdir = BitSystem::tempdir();
 
-		$gBitSystem->storePreference("tmpDir", $tdir);
-		$gBitSmarty->assign("tmpDir", $tdir);
+		$gBitSystem->storePreference("temp_dir", $tdir);
+		$gBitSmarty->assign("temp_dir", $tdir);
 	}
 
 	// Special handling for centralissed_upload_dir, which has a default value
diff --git a/admin/list_cache.php b/admin/list_cache.php
index 4227100..e309cd6 100644
--- a/admin/list_cache.php
+++ b/admin/list_cache.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_kernel/admin/list_cache.php,v 1.3 2006/01/27 21:55:42 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_kernel/admin/list_cache.php,v 1.4 2006/02/06 00:07:32 squareing 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.
@@ -32,7 +32,7 @@ if ( empty( $_REQUEST["sort_mode"] ) ) {
 $gBitSmarty->assign_by_ref('sort_mode', $sort_mode);
 
 // If offset is set use it if not then use offset =0
-// use the maxRecords php variable to set the limit
+// use the max_records php variable to set the limit
 // if sortMode is not set then use last_modified_desc
 if (!isset($_REQUEST["offset"])) {
 	$offset = 0;
@@ -51,22 +51,22 @@ if (!isset($_REQUEST["find"])) {
 $gBitSmarty->assign('find', $find);
 
 // Get a list of last changes to the Wiki database
-$listpages = $gBitSystem->list_cache($offset, $maxRecords, $sort_mode, $find);
+$listpages = $gBitSystem->list_cache($offset, $max_records, $sort_mode, $find);
 
 // If there're more records then assign next_offset
-$cant_pages = ceil($listpages["cant"] / $maxRecords);
+$cant_pages = ceil($listpages["cant"] / $max_records);
 $gBitSmarty->assign_by_ref('cant_pages', $cant_pages);
-$gBitSmarty->assign('actual_page', 1 + ($offset / $maxRecords));
+$gBitSmarty->assign('actual_page', 1 + ($offset / $max_records));
 
-if ($listpages["cant"] > ($offset + $maxRecords)) {
-	$gBitSmarty->assign('next_offset', $offset + $maxRecords);
+if ($listpages["cant"] > ($offset + $max_records)) {
+	$gBitSmarty->assign('next_offset', $offset + $max_records);
 } else {
 	$gBitSmarty->assign('next_offset', -1);
 }
 
 // If offset is > 0 then prev_offset
 if ($offset > 0) {
-	$gBitSmarty->assign('prev_offset', $offset - $maxRecords);
+	$gBitSmarty->assign('prev_offset', $offset - $max_records);
 } else {
 	$gBitSmarty->assign('prev_offset', -1);
 }
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index bb35c52..18abbef 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -47,42 +47,41 @@ $gBitInstaller->registerPreferences( KERNEL_PKG_NAME, array(
 	array(KERNEL_PKG_NAME,'feature_helpnotes','y'),
 	array(KERNEL_PKG_NAME,'short_date_format','%d %b %Y'),
 	array(KERNEL_PKG_NAME,'short_time_format','%H:%M %Z'),
-	array(KERNEL_PKG_NAME,'siteTitle',''),
+	//array(KERNEL_PKG_NAME,'site_title',''),
 	array(KERNEL_PKG_NAME,'centralized_upload_dir','storage'),
-	array(KERNEL_PKG_NAME,'tmpDir','temp'),
-	array(KERNEL_PKG_NAME,'use_proxy','n'),
-	array(KERNEL_PKG_NAME,'proxy_host',''),
-	array(KERNEL_PKG_NAME,'proxy_port',''),
-	array(KERNEL_PKG_NAME,'user_assigned_modules','n'),
-	array(KERNEL_PKG_NAME,'http_domain',''),
+	array(KERNEL_PKG_NAME,'temp_dir','temp'),
+	//array(KERNEL_PKG_NAME,'use_proxy','n'),
+	//array(KERNEL_PKG_NAME,'proxy_host',''),
+	//array(KERNEL_PKG_NAME,'proxy_port',''),
+	//array(KERNEL_PKG_NAME,'user_assigned_modules','n'),
+	//array(KERNEL_PKG_NAME,'http_domain',''),
 	array(KERNEL_PKG_NAME,'http_port','80'),
 	array(KERNEL_PKG_NAME,'http_prefix','/'),
-	array(KERNEL_PKG_NAME,'https_domain',''),
-	array(KERNEL_PKG_NAME,'https_login','n'),
-	array(KERNEL_PKG_NAME,'https_login_required','n'),
+	//array(KERNEL_PKG_NAME,'https_domain',''),
+	//array(KERNEL_PKG_NAME,'https_login','n'),
+	//array(KERNEL_PKG_NAME,'https_login_required','n'),
 	array(KERNEL_PKG_NAME,'https_port','443'),
 	array(KERNEL_PKG_NAME,'https_prefix','/'),
 	array(KERNEL_PKG_NAME,'feature_bot_bar','y'),
 	array(KERNEL_PKG_NAME,'feature_top_bar','y'),
-	array(KERNEL_PKG_NAME,'feature_banning','n'),
-	array(KERNEL_PKG_NAME,'feature_contact','n'),
+	//array(KERNEL_PKG_NAME,'feature_banning','n'),
+	//array(KERNEL_PKG_NAME,'feature_contact','n'),
 	array(KERNEL_PKG_NAME,'feature_jstabs','y' ),
 	array(KERNEL_PKG_NAME,'contact_user','admin'),
 	array(KERNEL_PKG_NAME,'count_admin_pvs','y'),
-	array(KERNEL_PKG_NAME,'direct_pagination','n'),
+	//array(KERNEL_PKG_NAME,'direct_pagination','n'),
 	array(KERNEL_PKG_NAME,'display_timezone','UTC'),
 	array(KERNEL_PKG_NAME,'long_date_format','%A %d of %B, %Y'),
 	array(KERNEL_PKG_NAME,'long_time_format','%H:%M:%S %Z'),
 	array(KERNEL_PKG_NAME,'feature_left_column','y'),
 	array(KERNEL_PKG_NAME,'feature_right_column','y'),
-	array(KERNEL_PKG_NAME,'maxRecords','10'),
+	array(KERNEL_PKG_NAME,'max_records','10'),
 	array(KERNEL_PKG_NAME,'language','en'),
 	array(KERNEL_PKG_NAME,'sender_email',''),
-	array(KERNEL_PKG_NAME,'urlIndex',''),
-	array(THEMES_PKG_NAME,'feature_bidi','n' ),
+	array(KERNEL_PKG_NAME,'url_index',''),
+	//array(THEMES_PKG_NAME,'feature_bidi','n' ),
 	array(THEMES_PKG_NAME,'slide_style', DEFAULT_THEME ),
 	array(THEMES_PKG_NAME,'style', DEFAULT_THEME ),
-	array(THEMES_PKG_NAME,'feature_theme_control','n' ),
 	array(THEMES_PKG_NAME,'feature_top_bar_dropdown','y' )
 ) );
 
diff --git a/list_cache.php b/list_cache.php
index 58ebe71..1028bfc 100644
--- a/list_cache.php
+++ b/list_cache.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/Attic/list_cache.php,v 1.4 2006/01/27 21:55:42 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/Attic/list_cache.php,v 1.5 2006/02/06 00:07:32 squareing Exp $
  * @package kernel
  * @subpackage functions
  */
@@ -37,7 +37,7 @@ if ( empty( $_REQUEST["sort_mode"] ) ) {
 $gBitSmarty->assign_by_ref('sort_mode', $sort_mode);
 
 // If offset is set use it if not then use offset =0
-// use the maxRecords php variable to set the limit
+// use the max_records php variable to set the limit
 // if sortMode is not set then use lastModif_desc
 if (!isset($_REQUEST["offset"])) {
 	$offset = 0;
@@ -46,7 +46,7 @@ if (!isset($_REQUEST["offset"])) {
 }
 if (isset($_REQUEST['page'])) {
 	$page = &$_REQUEST['page'];
-	$offset = ($page - 1) * $maxRecords;
+	$offset = ($page - 1) * $max_records;
 }
 $gBitSmarty->assign_by_ref('offset', $offset);
 
@@ -59,22 +59,22 @@ if (!isset($_REQUEST["find"])) {
 $gBitSmarty->assign('find', $find);
 
 // Get a list of last changes to the Wiki database
-$listpages = $gBitSystem->list_cache($offset, $maxRecords, $sort_mode, $find);
+$listpages = $gBitSystem->list_cache($offset, $max_records, $sort_mode, $find);
 
 // If there're more records then assign next_offset
-$cant_pages = ceil($listpages["cant"] / $maxRecords);
+$cant_pages = ceil($listpages["cant"] / $max_records);
 $gBitSmarty->assign_by_ref('cant_pages', $cant_pages);
-$gBitSmarty->assign('actual_page', 1 + ($offset / $maxRecords));
+$gBitSmarty->assign('actual_page', 1 + ($offset / $max_records));
 
-if ($listpages["cant"] > ($offset + $maxRecords)) {
-	$gBitSmarty->assign('next_offset', $offset + $maxRecords);
+if ($listpages["cant"] > ($offset + $max_records)) {
+	$gBitSmarty->assign('next_offset', $offset + $max_records);
 } else {
 	$gBitSmarty->assign('next_offset', -1);
 }
 
 // If offset is > 0 then prev_offset
 if ($offset > 0) {
-	$gBitSmarty->assign('prev_offset', $offset - $maxRecords);
+	$gBitSmarty->assign('prev_offset', $offset - $max_records);
 } else {
 	$gBitSmarty->assign('prev_offset', -1);
 }
diff --git a/notification_lib.php b/notification_lib.php
index 8d828d5..56ff57e 100644
--- a/notification_lib.php
+++ b/notification_lib.php
@@ -3,7 +3,7 @@
  * eMail Notification Library
  *
  * @package kernel
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/notification_lib.php,v 1.5 2006/02/02 08:59:46 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/notification_lib.php,v 1.6 2006/02/06 00:07:32 squareing Exp $
  * @author awcolley
  *
  * created 2003/06/03
@@ -36,12 +36,12 @@ class NotificationLib extends BitBase
     /**
     * Lists registered notification events
     * @param offset the location to begin listing from
-    * @param maxRecords the maximum number of records returned
+    * @param max_records the maximum number of records returned
     * @param sort_mode the method of sorting used in the listing
     * @param find text used to filter listing
     * @return array of registered notification events
     */
-    function list_mail_events($offset, $maxRecords, $sort_mode, $find)
+    function list_mail_events($offset, $max_records, $sort_mode, $find)
     {
         if ($find)
         {
@@ -56,7 +56,7 @@ class NotificationLib extends BitBase
         }
         $query = "select * from `".BIT_DB_PREFIX."mail_notifications` $mid order by ".$this->mDb->convert_sortmode($sort_mode);
         $query_cant = "select count(*) from `".BIT_DB_PREFIX."mail_notifications` $mid";
-        $result = $this->mDb->query($query,$bindvars,$maxRecords,$offset);
+        $result = $this->mDb->query($query,$bindvars,$max_records,$offset);
         $cant = $this->mDb->getOne($query_cant,$bindvars);
         $ret = array();
         while ($res = $result->fetchRow())
diff --git a/setup_inc.php b/setup_inc.php
index 97f083e..7cf3a2c 100644
--- a/setup_inc.php
+++ b/setup_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/setup_inc.php,v 1.29 2006/02/01 20:38:41 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/setup_inc.php,v 1.30 2006/02/06 00:07:32 squareing Exp $
  * @package kernel
  * @subpackage functions
  */
@@ -146,7 +146,7 @@ if( $gBitSystem->isDatabaseValid() ) {
 		if (isset($_COOKIE['tiki-theme'])) {
 			$theme = $_COOKIE['tiki-theme'];
 		}
-		if ( $gBitUser->isRegistered() && $gBitSystem->isFeatureActive( 'feature_userPreferences' ) ) {
+		if ( $gBitUser->isRegistered() && $gBitSystem->isFeatureActive( 'feature_user_preferences' ) ) {
 			if( $userStyle = $gBitUser->getPreference('theme') ) {
 				$theme = $userStyle;
 			}
@@ -269,7 +269,7 @@ if( $gBitSystem->isDatabaseValid() ) {
 	$https_prefix = $gBitSystem->getPreference('https_prefix', '/');
 	$modallgroups = $gBitSystem->getPreference("modallgroups", 'y');
 	$modseparateanon = $gBitSystem->getPreference("modseparateanon", 'n');
-	$maxRecords = $gBitSystem->getPreference("maxRecords", 10);
+	$max_records = $gBitSystem->getPreference("max_records", 10);
 
 	$gBitSmarty->assign('http_domain', $http_domain);
 	$gBitSmarty->assign('http_port', $http_port);
@@ -280,12 +280,12 @@ if( $gBitSystem->isDatabaseValid() ) {
 
 	$gBitSmarty->assign('title', $title);
 	$gBitSmarty->assign('feature_server_name', $gBitSystem->getPreference( 'feature_server_name', $_SERVER["SERVER_NAME"] ));
-	$gBitSmarty->assign('tmpDir', getTempDir());
+	$gBitSmarty->assign('temp_dir', getTempDir());
 	$gBitSmarty->assign('contact_user', $contact_user);
 	$gBitSmarty->assign('count_admin_pvs', 'y');
 	$gBitSmarty->assign('modallgroups', $modallgroups);
 	$gBitSmarty->assign('modseparateanon', $modseparateanon);
-	$gBitSmarty->assign('maxRecords', $maxRecords);
+	$gBitSmarty->assign('max_records', $max_records);
 	$gBitSmarty->assign('direct_pagination', 'n');
 
 	if (ini_get('zlib.output_compression') == 1) {
diff --git a/view_cache.php b/view_cache.php
index c63dec8..25face2 100644
--- a/view_cache.php
+++ b/view_cache.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_kernel/view_cache.php,v 1.3 2005/08/01 18:40:33 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_kernel/view_cache.php,v 1.4 2006/02/06 00:07:32 squareing Exp $
  * @package kernel
  * @subpackage functions
  */
@@ -16,7 +16,7 @@ require_once( '../bit_setup_inc.php' );
 require_once( WIKI_PKG_PATH.'BitPage.php' );
 
 /*
-if($gBitSystem->getPreference('feature_listPages') != 'y') {
+if($gBitSystem->getPreference('feature_list_pages') != 'y') {
   $gBitSmarty->assign('msg',tra("This feature is disabled"));
   $gBitSystem->display( 'error.tpl' );
   die;