summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BitUser.php16
-rw-r--r--admin/admin_users_inc.php6
-rw-r--r--admin/schema_inc.php2
-rw-r--r--bit_setup_inc.php10
-rw-r--r--modules/mod_user_profile.tpl2
-rw-r--r--my_images.php6
-rw-r--r--preferences.php8
-rw-r--r--templates/admin_users.tpl14
-rw-r--r--templates/center_user_wiki_page.tpl2
-rw-r--r--templates/menu_users.tpl6
-rw-r--r--templates/user_assigned_modules.tpl4
-rw-r--r--templates/user_information_inc.tpl4
12 files changed, 40 insertions, 40 deletions
diff --git a/BitUser.php b/BitUser.php
index a369b12..ae4b139 100644
--- a/BitUser.php
+++ b/BitUser.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.47 2006/02/08 23:24:28 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.48 2006/02/13 10:06:24 squareing Exp $
*
* Lib for user administration, groups and permissions
* This lib uses pear so the constructor requieres
@@ -12,7 +12,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: BitUser.php,v 1.47 2006/02/08 23:24:28 spiderr Exp $
+ * $Id: BitUser.php,v 1.48 2006/02/13 10:06:24 squareing Exp $
* @package users
*/
@@ -40,7 +40,7 @@ define("ACCOUNT_DISABLED", -6);
* Class that holds all information for a given user
*
* @author spider <spider@steelsun.com>
- * @version $Revision: 1.47 $
+ * @version $Revision: 1.48 $
* @package users
* @subpackage BitUser
*/
@@ -166,7 +166,7 @@ class BitUser extends LibertyAttachable {
function defaults() {
global $gBitSystem;
if( !$this->getPreference( 'user_information' ) ) { $this->setPreference( 'user_information', 'public' ); }
- if( !$this->getPreference( 'allowMsgs' ) ) { $this->setPreference( 'allowMsgs', 'y' ); }
+ if( !$this->getPreference( 'messages_allow_messages' ) ) { $this->setPreference( 'messages_allow_messages', 'y' ); }
if( !$this->getPreference( 'display_timezone' ) ) {
$server_time = new BitDate();
$this->setPreference( 'display_timezone', $server_time->display_offset );
@@ -1180,7 +1180,7 @@ echo "userAuthPresent: $userAuthPresent<br>";
function canCustomizeTheme() {
global $gBitSystem;
- return( $this->hasPermission( 'bit_p_custom_home_theme' ) || $gBitSystem->getPreference('feature_user_theme') == 'y' || $gBitSystem->getPreference('feature_user_theme') == 'h' );
+ return( $this->hasPermission( 'bit_p_custom_home_theme' ) || $gBitSystem->getPreference('users_themes') == 'y' || $gBitSystem->getPreference('users_themes') == 'h' );
}
@@ -1188,7 +1188,7 @@ echo "userAuthPresent: $userAuthPresent<br>";
function canCustomizeLayout() {
global $gBitSystem;
- return( $this->hasPermission( 'bit_p_custom_home_layout' ) || $gBitSystem->getPreference('feature_user_layout') == 'y' || $gBitSystem->getPreference('feature_user_layout') == 'h' );
+ return( $this->hasPermission( 'bit_p_custom_home_layout' ) || $gBitSystem->getPreference('users_layouts') == 'y' || $gBitSystem->getPreference('users_layouts') == 'h' );
}
@@ -1495,10 +1495,10 @@ echo "userAuthPresent: $userAuthPresent<br>";
} else {
global $gBitSystem;
- $rewrite_tag = $gBitSystem->isFeatureActive( 'feature_pretty_urls_extended' ) ? 'view/':'';
+ $rewrite_tag = $gBitSystem->isFeatureActive( 'pretty_urls_extended' ) ? 'view/':'';
if ($gBitSystem->isFeatureActive( 'pretty_urls' )
- || $gBitSystem->isFeatureActive( 'feature_pretty_urls_extended' ) ) {
+ || $gBitSystem->isFeatureActive( 'pretty_urls_extended' ) ) {
$ret = USERS_PKG_URL . $rewrite_tag;
$ret .= urlencode( $pUserName );
}
diff --git a/admin/admin_users_inc.php b/admin/admin_users_inc.php
index b5687bb..e736273 100644
--- a/admin/admin_users_inc.php
+++ b/admin/admin_users_inc.php
@@ -1,6 +1,6 @@
<?php
$formFeatures = array(
- 'feature_user_preferences' => array(
+ 'users_preferences' => array(
'label' => 'User Preferences',
'note' => 'Users can view and modify their personal preferences.',
'page' => 'UserPreferences',
@@ -35,8 +35,8 @@ if( isset( $_REQUEST['settings'] ) ) {
}
$gBitSystem->storePreference( 'custom_user_fields', $customFields, USERS_PKG_NAME );
$gBitSystem->storePreference( 'display_name', (isset( $_REQUEST['settings']['display_name'] ) ? $_REQUEST['settings']['display_name'] : 'real_name'), USERS_PKG_NAME );
- $gBitSystem->storePreference( 'feature_user_theme', (isset( $_REQUEST['settings']['feature_user_theme'][0] ) ? $_REQUEST['settings']['feature_user_theme'][0] : NULL), USERS_PKG_NAME );
- $gBitSystem->storePreference( 'feature_user_layout', (isset( $_REQUEST['settings']['feature_user_layout'][0] ) ? $_REQUEST['settings']['feature_user_layout'][0] : NULL), USERS_PKG_NAME );
+ $gBitSystem->storePreference( 'users_themes', (isset( $_REQUEST['settings']['users_themes'][0] ) ? $_REQUEST['settings']['users_themes'][0] : NULL), USERS_PKG_NAME );
+ $gBitSystem->storePreference( 'users_layouts', (isset( $_REQUEST['settings']['users_layouts'][0] ) ? $_REQUEST['settings']['users_layouts'][0] : NULL), USERS_PKG_NAME );
}
// Handle Admin Password Change Request
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 44fe611..8542251 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -203,7 +203,7 @@ $gBitInstaller->registerPreferences( USERS_PKG_NAME, array(
//array(USERS_PKG_NAME,'user_bookmarks','n'),
//array(USERS_PKG_NAME,'feature_tasks','n'),
//array(USERS_PKG_NAME,'usermenu','n'),
- array(USERS_PKG_NAME,'feature_user_preferences','y'),
+ array(USERS_PKG_NAME,'users_preferences','y'),
array(USERS_PKG_NAME,'display_name','real_name'),
array(USERS_PKG_NAME,'change_language','y'),
array(USERS_PKG_NAME,'case_sensitive_login','y'),
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 2bb5e41..67d9e88 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -212,21 +212,21 @@ if( !defined( 'LOGO_MAX_DIM' ) ) {
}
}
- $allowMsgs = 'n';
+ $messages_allow_messages = 'n';
if( $gBitUser->isRegistered() ) {
- global $tasks_use_dates, $tasks_max_records, $allowMsgs;
- $allowMsgs = $gBitUser->getPreference( 'allowMsgs', 'y');
+ global $tasks_use_dates, $tasks_max_records, $messages_allow_messages;
+ $messages_allow_messages = $gBitUser->getPreference( 'messages_allow_messages', 'y');
$tasks_use_dates = $gBitUser->getPreference( 'tasks_use_dates');
$tasks_max_records = $gBitUser->getPreference( 'tasks_max_records');
$gBitSmarty->assign('tasks_use_dates', $tasks_use_dates);
$gBitSmarty->assign('tasks_max_records', $tasks_max_records);
- $gBitSmarty->assign('allowMsgs', $allowMsgs);
+ $gBitSmarty->assign('messages_allow_messages', $messages_allow_messages);
}
// register 'my' menu
if( $gBitUser->isValid() && ( $gBitUser->isRegistered() || !$gBitSystem->isFeatureActive( 'hide_my_top_bar_link' ) ) ) {
$site_menu_title = $gBitSystem->getPreference( 'site_menu_title' );
$displayTitle = !empty( $site_menu_title ) ? $site_menu_title : $gBitSystem->getPreference( 'site_title', 'Site' );
- $gBitSystem->registerAppMenu( USERS_PKG_NAME, 'My '.$displayTitle, ($gBitSystem->getPreference('feature_user_preferences') == 'y' ? USERS_PKG_URL.'my.php':''), 'bitpackage:users/menu_users.tpl' );
+ $gBitSystem->registerAppMenu( USERS_PKG_NAME, 'My '.$displayTitle, ($gBitSystem->getPreference('users_preferences') == 'y' ? USERS_PKG_URL.'my.php':''), 'bitpackage:users/menu_users.tpl' );
}
?>
diff --git a/modules/mod_user_profile.tpl b/modules/mod_user_profile.tpl
index ffaf5ff..e6ff881 100644
--- a/modules/mod_user_profile.tpl
+++ b/modules/mod_user_profile.tpl
@@ -2,7 +2,7 @@
{bitmodule title="$moduleTitle"}
<h2 style="text-align:center;">
{displayname hash=$userInfo}
- {if $gQueryUserId and $gBitSystem->isPackageActive( 'messages' ) and $gBitUser->hasPermission( 'bit_p_messages' ) and $userPrefs.allowMsgs eq 'y'}
+ {if $gQueryUserId and $gBitSystem->isPackageActive( 'messages' ) and $gBitUser->hasPermission( 'bit_p_messages' ) and $userPrefs.messages_allow_messages eq 'y'}
&nbsp;<a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$userInfo.login}">{biticon ipackage="messages" iname="send_mail" iexplain="Send user a personal message" iforce="icon"}</a>
{/if}
</h2>
diff --git a/my_images.php b/my_images.php
index 9f9fd2a..94ce274 100644
--- a/my_images.php
+++ b/my_images.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/my_images.php,v 1.7 2006/02/06 00:12:08 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/my_images.php,v 1.8 2006/02/13 10:06:24 squareing 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: my_images.php,v 1.7 2006/02/06 00:12:08 squareing Exp $
+ * $Id: my_images.php,v 1.8 2006/02/13 10:06:24 squareing Exp $
* @package users
* @subpackage functions
*/
@@ -21,7 +21,7 @@ $gEditMode = 'images';
require_once( '../bit_setup_inc.php' );
// User preferences screen
-$gBitSystem->verifyFeature( 'feature_user_preferences' );
+$gBitSystem->verifyFeature( 'users_preferences' );
if (!$gBitUser->isRegistered()) {
$gBitSmarty->assign('msg', tra("You are not logged in"));
diff --git a/preferences.php b/preferences.php
index 21dc71f..86c67fc 100644
--- a/preferences.php
+++ b/preferences.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.20 2006/02/09 10:41:47 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.21 2006/02/13 10:06:24 squareing 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: preferences.php,v 1.20 2006/02/09 10:41:47 squareing Exp $
+ * $Id: preferences.php,v 1.21 2006/02/13 10:06:24 squareing Exp $
* @package users
* @subpackage functions
*/
@@ -25,7 +25,7 @@ if( $gBitSystem->isPackageActive( 'blogs' ) ) {
include_once( BLOGS_PKG_PATH.'BitBlog.php' );
}
// User preferences screen
-$gBitSystem->verifyFeature( 'feature_user_preferences' );
+$gBitSystem->verifyFeature( 'users_preferences' );
if( !$gBitUser->isRegistered() ) {
$gBitSmarty->assign( 'msg', tra( "You are not logged in" ) );
@@ -152,7 +152,7 @@ if (isset($_REQUEST['messprefs'])) {
$editUser->storePreference( 'mess_max_records', $_REQUEST['mess_max_records'], 'users' );
$editUser->storePreference( 'minPrio', $_REQUEST['minPrio'], 'users' );
$editUser->storePreference( 'message_alert', !empty( $_REQUEST['message_alert'] ) ? 'y' : 'n', 'users' );
- $editUser->storePreference( 'allowMsgs', !empty( $_REQUEST['allowMsgs'] ) ? 'y' : 'n', 'users' );
+ $editUser->storePreference( 'messages_allow_messages', !empty( $_REQUEST['messages_allow_messages'] ) ? 'y' : 'n', 'users' );
}
if (isset($_REQUEST['tasksprefs'])) {
diff --git a/templates/admin_users.tpl b/templates/admin_users.tpl
index d236fc7..29bf2a2 100644
--- a/templates/admin_users.tpl
+++ b/templates/admin_users.tpl
@@ -23,23 +23,23 @@
{/foreach}
<div class="row">
- {formlabel label="Users Can Customize Their Layout" for="feature_user_layout"}
+ {formlabel label="Users Can Customize Their Layout" for="users_layouts"}
{forminput}
- <select name="settings[feature_user_layout]" id="feature_user_layout">
+ <select name="settings[users_layouts]" id="users_layouts">
<option value="">Never</option>
- <option value="h" {if $gBitSystemPrefs.feature_user_layout eq 'h'}selected="selected"{/if}>{tr}Just For Their Homepage{/tr}</option>
+ <option value="h" {if $gBitSystemPrefs.users_layouts eq 'h'}selected="selected"{/if}>{tr}Just For Their Homepage{/tr}</option>
</select>
{formhelp note="Allows users to position and display their own set of modules" page="UsersConfigureModules"}
{/forminput}
</div>
<div class="row">
- {formlabel label="Users Can Change Their Theme" for="feature_user_theme"}
+ {formlabel label="Users Can Change Their Theme" for="users_themes"}
{forminput}
- <select name="settings[feature_user_theme]" id="feature_user_theme">
+ <select name="settings[users_themes]" id="users_themes">
<option value="">Never</option>
- <option value="h" {if $gBitSystemPrefs.feature_user_theme eq 'h'}selected="selected"{/if}>{tr}Just For Their Homepage{/tr}</option>
- <option value="y" {if $gBitSystem->isFeatureActive( 'feature_user_theme' )}selected="selected"{/if}>{tr}For the Entire Site{/tr}</option>
+ <option value="h" {if $gBitSystemPrefs.users_themes eq 'h'}selected="selected"{/if}>{tr}Just For Their Homepage{/tr}</option>
+ <option value="y" {if $gBitSystem->isFeatureActive( 'users_themes' )}selected="selected"{/if}>{tr}For the Entire Site{/tr}</option>
</select>
{formhelp note="Allows users to choose their own theme." page="UserTheme"}
{/forminput}
diff --git a/templates/center_user_wiki_page.tpl b/templates/center_user_wiki_page.tpl
index bfd72e8..0e37115 100644
--- a/templates/center_user_wiki_page.tpl
+++ b/templates/center_user_wiki_page.tpl
@@ -19,7 +19,7 @@
{/if}
{if $gBitUser->mUserId eq $gQueryUser->mUserId}
- {if $gBitSystem->isFeatureActive('feature_user_preferences')}
+ {if $gBitSystem->isFeatureActive('users_preferences')}
{smartlink ipackage=users ifile="preferences.php" ititle="Edit personal profile and images" ibiticon="liberty/config"}
{/if}
{if $gBitUser->hasPermission('bit_p_edit_user_homepage')}
diff --git a/templates/menu_users.tpl b/templates/menu_users.tpl
index 0679196..f105053 100644
--- a/templates/menu_users.tpl
+++ b/templates/menu_users.tpl
@@ -20,9 +20,9 @@
</a>
</li>
{/if}
- {if $gBitSystemPrefs.feature_user_layout eq 'h'}
+ {if $gBitSystemPrefs.users_layouts eq 'h'}
{assign var="myLayoutConfig" value="My Homepage"}
- {else if $gBitSystem->isFeatureActive( 'feature_user_layout' )}
+ {else if $gBitSystem->isFeatureActive( 'users_layouts' )}
{assign var="myLayoutConfig" value="My Site Layout"}
{/if}
{if $gBitUser->canCustomizeTheme() || $gBitUser->canCustomizeLayout() }
@@ -32,7 +32,7 @@
</a>
</li>
{/if}
- {if $gBitSystem->isFeatureActive( 'feature_user_preferences' )}
+ {if $gBitSystem->isFeatureActive( 'users_preferences' )}
<li>
<a class="item" href="{$smarty.const.USERS_PKG_URL}preferences.php">
{biticon ipackage=liberty iname=settings iexplain=Preferences iforce=icon}{if !$icons_only} {tr}Preferences{/tr}{/if}
diff --git a/templates/user_assigned_modules.tpl b/templates/user_assigned_modules.tpl
index eee7031..54fdfa4 100644
--- a/templates/user_assigned_modules.tpl
+++ b/templates/user_assigned_modules.tpl
@@ -184,7 +184,7 @@
for instance, i don't know where the page heading stuff is used.
<table width="100%">
-{if $gBitSystem->isFeatureActive( 'feature_user_layout' ) or $gBitSystemPrefs.feature_user_layout eq 'h'}
+{if $gBitSystem->isFeatureActive( 'users_layouts' ) or $gBitSystemPrefs.users_layouts eq 'h'}
{if $canassign eq 'y'}
<tr>
@@ -332,7 +332,7 @@ for instance, i don't know where the page heading stuff is used.
</form>
</td>
<td style="vertical-align:top;">
-{if $gBitSystem->isFeatureActive( 'feature_user_theme' ) || $gBitSystemPrefs.feature_user_theme eq 'h' }
+{if $gBitSystem->isFeatureActive( 'users_themes' ) || $gBitSystemPrefs.users_themes eq 'h' }
<form method="POST" action="{$smarty.const.USERS_PKG_URL}assigned_modules.php">
<table class="panel">
diff --git a/templates/user_information_inc.tpl b/templates/user_information_inc.tpl
index 6e7015f..25a8e0c 100644
--- a/templates/user_information_inc.tpl
+++ b/templates/user_information_inc.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_users/templates/user_information_inc.tpl,v 1.7 2006/02/08 18:32:11 mej Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_users/templates/user_information_inc.tpl,v 1.8 2006/02/13 10:06:26 squareing Exp $ *}
{strip}
{if $userData->getPreference('user_information') eq 'public' or $gBitUser->mUserId eq $userData->mUserId}
<div class="row">
@@ -83,7 +83,7 @@
{/forminput}
</div>
- {if $gBitSystem->isPackageActive( 'messages' ) and $userData->getPreference('allowMsgs') ne 'n' and $gBitUser->mUserId ne $userData->mUserId}
+ {if $gBitSystem->isPackageActive( 'messages' ) and $userData->getPreference('messages_allow_messages') ne 'n' and $gBitUser->mUserId ne $userData->mUserId}
<div class="row">
{formlabel label="Send Message"}
{forminput}
generated by cgit v1.3 (git 2.53.0) at 2026-07-01 06:02:31 +0000