summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BitThemes.php2
-rw-r--r--admin/menus.php2
-rw-r--r--modules/mod_switch_theme.php4
-rw-r--r--switch_theme.php10
-rw-r--r--templates/admin_themes_menus.tpl2
-rw-r--r--templates/header_inc.tpl6
-rw-r--r--templates/popup_header_inc.tpl4
-rw-r--r--templates/theme_control.tpl2
-rw-r--r--templates/theme_control_objects.tpl2
9 files changed, 17 insertions, 17 deletions
diff --git a/BitThemes.php b/BitThemes.php
index b7c69b1..01e9c5b 100644
--- a/BitThemes.php
+++ b/BitThemes.php
@@ -28,7 +28,7 @@ class BitThemes extends BitBase {
closedir( $h );
}
- if( $bIncludeCustom && $gBitSystem->getPreference( 'themes_edit_css' ) ) {
+ if( $bIncludeCustom && $gBitSystem->getConfig( 'themes_edit_css' ) ) {
// Include the users custom css if they have created one
$customCSSPath = $gBitUser->getStoragePath( NULL,$gBitUser->mUserId );
$customCSSFile = $customCSSPath.'custom.css';
diff --git a/admin/menus.php b/admin/menus.php
index 2b962bb..a89e672 100644
--- a/admin/menus.php
+++ b/admin/menus.php
@@ -9,7 +9,7 @@ if( !empty( $_REQUEST['update_menus'] ) ) {
if( empty($_REQUEST["menu_$menuPackage"] ) ) {
// the package menu is off - store it off
$gBitSystem->storePreference( "menu_$menuPackage", 'n', 'themes', THEMES_PKG_NAME );
- } elseif( $gBitSystem->getPreference( "menu_$menuPackage" ) == 'n' ) {
+ } elseif( $gBitSystem->getConfig( "menu_$menuPackage" ) == 'n' ) {
// the package menu was off and now is on. Just delete the pref since on is the assumed state
$gBitSystem->storePreference( "menu_$menuPackage", NULL, 'themes', THEMES_PKG_NAME );
}
diff --git a/modules/mod_switch_theme.php b/modules/mod_switch_theme.php
index 5dd5f6d..c260f40 100644
--- a/modules/mod_switch_theme.php
+++ b/modules/mod_switch_theme.php
@@ -1,5 +1,5 @@
<?php
-$change_theme = $gBitSystem->getPreference('users_themes');
+$change_theme = $gBitSystem->getConfig('users_themes');
$gBitSmarty->assign('change_theme', $change_theme);
$style = $gBitSystem->getStyle();
@@ -7,7 +7,7 @@ if( $change_theme == 'y' ) {
if (isset($_COOKIE['tiki-theme'])) {
$style = $_COOKIE['tiki-theme'];
}
- if ($gBitUser->isValid() && $gBitSystem->getPreference('users_preferences') == 'y') {
+ if ($gBitUser->isValid() && $gBitSystem->getConfig('users_preferences') == 'y') {
$userStyle = $gBitUser->getPreference('theme');
$style = empty($userStyle) ? $style : $userStyle;
}
diff --git a/switch_theme.php b/switch_theme.php
index 33a82c5..30b2013 100644
--- a/switch_theme.php
+++ b/switch_theme.php
@@ -10,16 +10,16 @@ if (isset($_SERVER['HTTP_REFERER'])) {
$orig_url = $bit_index;
}
-if (isset($_GET['theme']) && $gBitSystem->getPreference('users_themes') == 'y'){
+if (isset($_GET['theme']) && $gBitSystem->getConfig('users_themes') == 'y'){
$new_theme = $_GET['theme'];
- if(isset($user) && $gBitSystem->getPreference('users_preferences') == 'y' ) {
+ if(isset($user) && $gBitSystem->getConfig('users_preferences') == 'y' ) {
$gBitUser->storePreference('theme',$new_theme);
- setcookie('tiki-theme', '', time()-3600*24*30*12, $gBitSystem->getPreference('cookie_path'), $gBitSystem->getPreference('cookie_domain'));
+ setcookie('tiki-theme', '', time()-3600*24*30*12, $gBitSystem->getConfig('cookie_path'), $gBitSystem->getConfig('cookie_domain'));
} else {
- setcookie('tiki-theme', $new_theme, time()+3600*24*30*12, $gBitSystem->getPreference('cookie_path'), $gBitSystem->getPreference('cookie_domain'));
+ setcookie('tiki-theme', $new_theme, time()+3600*24*30*12, $gBitSystem->getConfig('cookie_path'), $gBitSystem->getConfig('cookie_domain'));
}
} else{
- setcookie('tiki-theme', '', time()-3600*24*30*12, $gBitSystem->getPreference('cookie_path'), $gBitSystem->getPreference('cookie_domain'));
+ setcookie('tiki-theme', '', time()-3600*24*30*12, $gBitSystem->getConfig('cookie_path'), $gBitSystem->getConfig('cookie_domain'));
}
header("location: $orig_url");
diff --git a/templates/admin_themes_menus.tpl b/templates/admin_themes_menus.tpl
index 74c10f1..633873d 100644
--- a/templates/admin_themes_menus.tpl
+++ b/templates/admin_themes_menus.tpl
@@ -14,7 +14,7 @@
<ul class="data">
{foreach from=$gBitSystem->mAppMenu key=pkgName item=menu}
-<li class="item"><input type="checkbox" name="menu_{$pkgName}" {if $gBitSystem->getPreference("menu_`$pkgName`",'y')=='y'}checked="checked"{/if}/>{$menu.title}</li>
+<li class="item"><input type="checkbox" name="menu_{$pkgName}" {if $gBitSystem->getConfig("menu_`$pkgName`",'y')=='y'}checked="checked"{/if}/>{$menu.title}</li>
{/foreach}
</ul>
{/forminput}
diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
index 4cd56a8..4bdaa26 100644
--- a/templates/header_inc.tpl
+++ b/templates/header_inc.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_themes/templates/header_inc.tpl,v 1.12 2006/02/22 12:54:34 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_themes/templates/header_inc.tpl,v 1.13 2006/03/01 18:35:18 spiderr Exp $ *}
{strip}
{if $gBitSystem->mStyles.styleSheet}
<link rel="stylesheet" title="{$style}" type="text/css" href="{$gBitSystem->mStyles.styleSheet}" media="all" />
@@ -13,7 +13,7 @@
<link rel="alternate stylesheet" title="{$alt_name}" type="text/css" href="{$alt_path}" media="screen" />
{/foreach}
-{if $gBitSystemPrefs.disable_jstabs ne 'y'}
+{if $gBitSystem->getConfig('disable_jstabs') ne 'y'}
<script type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/libs/tabpane.js"></script>
{/if}
{/strip}
@@ -57,7 +57,7 @@
}
//]]></script>
{/literal}
-{elseif !$gBitSystemPrefs.disable_fat}
+{elseif !$gBitSystem->getConfig('disable_fat')}
<script type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/libs/fat.js"></script>
{/if}
diff --git a/templates/popup_header_inc.tpl b/templates/popup_header_inc.tpl
index 0b4170c..c72d393 100644
--- a/templates/popup_header_inc.tpl
+++ b/templates/popup_header_inc.tpl
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <title>{$browserTitle} - {$gBitSystemPrefs.site_title}</title>
+ <title>{$browserTitle} - {$gBitSystem->getConfig('site_title')}</title>
<link rel="stylesheet" title="{$style}" type="text/css" href="{$gBitSystem->getStyleCss($smarty.request.site_style)}" media="all" />
{include file="bitpackage:kernel/header_inc.tpl"}
@@ -10,7 +10,7 @@
<body id="jspopup">
<div class="display jspopup">
<div class="header">
- <title>{$browserTitle} - {$gBitSystemPrefs.site_title}</title>
+ <title>{$browserTitle} - {$gBitSystem->getConfig('site_title')}</title>
</div>
<div class="body">
diff --git a/templates/theme_control.tpl b/templates/theme_control.tpl
index a273838..55a3104 100644
--- a/templates/theme_control.tpl
+++ b/templates/theme_control.tpl
@@ -96,7 +96,7 @@
{if $gBitSystem->isFeatureActive( 'direct_pagination' )}
<br />
{section loop=$cant_pages name=foo}
-{assign var=selector_offset value=$smarty.section.foo.index|times:"$gBitSystemPrefs.max_records"}
+{assign var=selector_offset value=$smarty.section.foo.index|times:"$gBitSystem->getConfig('max_records')"}
<a href="{$smarty.const.THEMES_PKG_URL}theme_control.php?tasks_use_dates={$tasks_use_dates}&amp;find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">
{$smarty.section.foo.index_next}</a>&nbsp;
{/section}
diff --git a/templates/theme_control_objects.tpl b/templates/theme_control_objects.tpl
index 5250160..dfc71a1 100644
--- a/templates/theme_control_objects.tpl
+++ b/templates/theme_control_objects.tpl
@@ -111,7 +111,7 @@
{if $gBitSystem->isFeatureActive( 'direct_pagination' )}
<br />
{section loop=$cant_pages name=foo}
-{assign var=selector_offset value=$smarty.section.foo.index|times:"$gBitSystemPrefs.max_recor"}
+{assign var=selector_offset value=$smarty.section.foo.index|times:"$gBitSystem->getConfig('max_recor')"}
<a href="{$smarty.const.THEMES_PKG_URL}theme_control_objects.php?tasks_use_dates={$tasks_use_dates}&amp;find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">{$smarty.section.foo.index_next}</a>&nbsp;
{/section}
{/if}