summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BitPermUser.php10
-rw-r--r--admin/edit_group.php36
-rw-r--r--register.php9
-rw-r--r--templates/admin_group_edit.tpl18
-rw-r--r--templates/register.tpl8
5 files changed, 43 insertions, 38 deletions
diff --git a/BitPermUser.php b/BitPermUser.php
index b48c0ad..c7632d3 100644
--- a/BitPermUser.php
+++ b/BitPermUser.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/BitPermUser.php,v 1.24 2006/02/18 09:16:09 lsces Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/BitPermUser.php,v 1.25 2006/02/20 16:28:40 spiderr 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: BitPermUser.php,v 1.24 2006/02/18 09:16:09 lsces Exp $
+ * $Id: BitPermUser.php,v 1.25 2006/02/20 16:28:40 spiderr Exp $
* @package users
*/
@@ -25,7 +25,7 @@ require_once( dirname( __FILE__ ).'/BitUser.php' );
* Class that holds all information for a given user
*
* @author spider <spider@steelsun.com>
- * @version $Revision: 1.24 $
+ * @version $Revision: 1.25 $
* @package users
* @subpackage BitPermUser
*/
@@ -796,14 +796,14 @@ class BitPermUser extends BitUser {
/**
* Return a list of packages that the user has permission to access
- */
+ */
function getContentTypeList($pUserId) {
foreach( $gLibertySystem->mContentTypes as $contentType ) {
$perm = $contentType["content_type_guid"].'_p_view';
if (!empty( $perm ) and $gBitUser->hasPermission( $perm )) {
$contentTypes[$contentType["content_type_guid"]] = $contentType["content_description"];
}
- }
+ }
}
}
diff --git a/admin/edit_group.php b/admin/edit_group.php
index 71fe461..4d18509 100644
--- a/admin/edit_group.php
+++ b/admin/edit_group.php
@@ -1,5 +1,5 @@
<?php
-// $Header: /cvsroot/bitweaver/_bit_users/admin/edit_group.php,v 1.10 2006/02/08 21:51:15 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_users/admin/edit_group.php,v 1.11 2006/02/20 16:28:40 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.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
@@ -85,19 +85,19 @@ if( !empty( $_REQUEST["cancel"] ) ) {
// $mid = 'bitpackage:users/admin_groups_list.tpl';
} elseif (isset($_REQUEST['allper'])) {
if ($_REQUEST['oper'] == 'assign') {
- $gBitUser->assign_level_permissions($_REQUEST['group_id'], $_REQUEST['level']);
+ $gBitUser->assign_level_permissions($_REQUEST['group_id'], $_REQUEST['perm_level']);
} else {
- $gBitUser->remove_level_permissions($_REQUEST['group_id'], $_REQUEST['level']);
+ $gBitUser->remove_level_permissions($_REQUEST['group_id'], $_REQUEST['perm_level']);
}
} elseif (isset($_REQUEST["createlevel"])) {
- $gBitUser->create_dummy_level($_REQUEST['level']);
+ $gBitUser->create_dummy_level($_REQUEST['perm_level']);
} elseif (isset($_REQUEST['updateperms'])) {
$updatePerms = $gBitUser->getgroupPermissions( $_REQUEST['group_id'] );
- if (!empty($_REQUEST['level'])) {
- foreach (array_keys($_REQUEST['level'])as $per) {
- if( $allPerms[$per]['level'] != $_REQUEST['level'][$per] ) {
+ if (!empty($_REQUEST['perm_level'])) {
+ foreach (array_keys($_REQUEST['perm_level'])as $per) {
+ if( $allPerms[$per]['perm_level'] != $_REQUEST['perm_level'][$per] ) {
// we changed level. perm[] checkbox is not taken into account
- $gBitUser->change_permission_level($per, $_REQUEST['level'][$per]);
+ $gBitUser->change_permission_level($per, $_REQUEST['perm_level'][$per]);
}
if( isset($_REQUEST['perm'][$per]) && !isset($updatePerms[$per]) ) {
// we have an unselected perm that is now selected
@@ -147,18 +147,18 @@ if( !empty( $_REQUEST["cancel"] ) ) {
}
}
-// get content and pass it on to the template
-include_once( LIBERTY_PKG_PATH.'get_content_list_inc.php' );
-foreach( $contentList['data'] as $cItem ) {
- $cList[$contentTypes[$cItem['content_type_guid']]][$cItem['content_id']] = $cItem['title'].' [id: '.$cItem['content_id'].']';
-}
-$gBitSmarty->assign( 'contentList', $cList );
-$gBitSmarty->assign( 'contentSelect', $contentSelect );
-$gBitSmarty->assign( 'contentTypes', $contentTypes );
-
-if( !empty( $_REQUEST['group_id'] ) ) {
+if( !empty( $_REQUEST['group_id'] ) || (!empty( $_REQUEST["action"] ) && $_REQUEST["action"] == 'create' ) ) {
// get grouplist separately from the $users stuff to avoid splitting of data due to pagination
$listHash = array( 'sort_mode' => 'group_name_asc' );
+
+ // get content and pass it on to the template
+ include_once( LIBERTY_PKG_PATH.'get_content_list_inc.php' );
+ foreach( $contentList['data'] as $cItem ) {
+ $cList[$contentTypes[$cItem['content_type_guid']]][$cItem['content_id']] = $cItem['title'].' [id: '.$cItem['content_id'].']';
+ }
+ $gBitSmarty->assign( 'contentList', $cList );
+ $gBitSmarty->assign( 'contentSelect', $contentSelect );
+ $gBitSmarty->assign( 'contentTypes', $contentTypes );
} else {
// get grouplist separately from the $users stuff to avoid splitting of data due to pagination
$listHash = array( 'sort_mode' => !empty( $_REQUEST['sort_mode'] ) ? $_REQUEST['sort_mode'] : 'group_name_asc' );
diff --git a/register.php b/register.php
index b4e8544..b703f57 100644
--- a/register.php
+++ b/register.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/register.php,v 1.9 2006/02/09 10:41:47 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/register.php,v 1.10 2006/02/20 16:28:40 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: register.php,v 1.9 2006/02/09 10:41:47 squareing Exp $
+ * $Id: register.php,v 1.10 2006/02/20 16:28:40 spiderr Exp $
* @package users
* @subpackage functions
*/
@@ -16,6 +16,11 @@
/**
* required setup
*/
+// Avoid user hell
+if( isset( $_REQUEST['tk'] ) ) {
+ unset( $_REQUEST['tk'] );
+}
+
require_once( '../bit_setup_inc.php' );
require_once( KERNEL_PKG_PATH.'BitBase.php' );
include_once( KERNEL_PKG_PATH.'notification_lib.php' );
diff --git a/templates/admin_group_edit.tpl b/templates/admin_group_edit.tpl
index 4079bb2..0674d18 100644
--- a/templates/admin_group_edit.tpl
+++ b/templates/admin_group_edit.tpl
@@ -1,8 +1,8 @@
-{* $Header: /cvsroot/bitweaver/_bit_users/templates/admin_group_edit.tpl,v 1.5 2006/02/10 23:33:42 lsces Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_users/templates/admin_group_edit.tpl,v 1.6 2006/02/20 16:28:42 spiderr Exp $ *}
{strip}
<div class="floaticon">
- <a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php">{tr}&laquo; Group List{/tr}</a>
+ <a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php">{tr}&laquo; Group List{/tr}</a>
{bithelp}
</div>
@@ -119,7 +119,7 @@
{forminput}
{smartlink ititle="All packages" group_id=$groupInfo.group_id}
{foreach from=$gBitSystem->mPackages key=packageKey item=packageItem}
- {if $packageItem.installed and $packageItem.defaults}
+ {if $packageItem.installed and $packageItem.defaults}
&nbsp;&bull; {smartlink ititle=$gBitSystem->mPackages.$packageKey.name group_id=$groupInfo.group_id package=$packageKey}
{/if}
{/foreach}
@@ -150,7 +150,7 @@
</td>
{/if}
<td><label for="{$permName}">{$permName}</label></td>
- <td>{html_options name="level[$permName]" output=$levels values=$levels selected=$perm.level}</td>
+ <td>{html_options name="perm_level[$permName]" output=$levels values=$levels selected=$perm.perm_level}</td>
<td>{tr}{$perm.package}{/tr}</td>
<td>{tr}{$perm.perm_desc}{/tr}</td>
</tr>
@@ -181,11 +181,11 @@
<option value="remove">{tr}Remove{/tr}</option>
</select>
<br />
- {tr}all permissions in level{/tr}
+ {tr}all permissions in level{/tr}
<br />
- <select name="level">
- {html_options output=$levels values=$levels selected=$perms[user].level}
- </select>
+ <select name="perm_level">
+ {html_options output=$levels values=$levels selected=$perms[user].perm_level}
+ </select>
<br />
{tr}to / from {$groupInfo.group_name}{/tr}
{/forminput}
@@ -202,7 +202,7 @@
<div class="row">
{formlabel label="Level" for="level"}
{forminput}
- <input type="text" name="level" id="level" />
+ <input type="text" name="perm_level" id="level" />
{formhelp note="Levels can be used to group certain permissions and thus easily assign a set of permissions to a group. Assinging a permission to a level has no outcome on the users or groups. It's merely a way to organise permissions."}
{/forminput}
</div>
diff --git a/templates/register.tpl b/templates/register.tpl
index 08dd97e..f5478aa 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -30,7 +30,7 @@
<div class="row">
{formlabel label="Real name" for="real_name"}
{forminput}
- <input type="text" name="real_name" id="real_name" />
+ <input type="text" name="real_name" id="real_name" value="{$smarty.request.real_name}" />
{/forminput}
</div>
{/if}
@@ -99,7 +99,7 @@
<div class="row">
{formlabel label="HomePage" for="homePage"}
{forminput}
- <input size="50" type="text" name="prefs[homePage]" id="homePage" />
+ <input size="50" type="text" name="prefs[homePage]" id="homePage" value="{$smarty.request.prefs.homePage}" />
{formhelp note="If you have a personal or professional homepage, enter it here."}
{/forminput}
</div>
@@ -113,7 +113,7 @@
<option value="" />
{sortlinks}
{section name=ix loop=$flags}
- <option value="{$flags[ix]|escape}" {if $userPrefs.flag eq $flags[ix]}selected="selected"{/if}>{tr}{$flags[ix]|replace:'_':' '}{/tr}</option>
+ <option value="{$flags[ix]|escape}" {if $smarty.request.prefs.country eq $flags[ix]}selected="selected"{/if}>{tr}{$flags[ix]|replace:'_':' '}{/tr}</option>
{/section}
{/sortlinks}
</select>
@@ -154,7 +154,7 @@
<div class="row">
{formlabel label="$customFields[f]}
{forminput}
- <input type="text" name="CUSTOM[{$customFields[f]|escape}" />
+ <input type="text" name="CUSTOM[{$customFields[f]|escape}" value="{$smarty.request.CUSTOM.$customFields[f]}" />
{/forminput}
</div>
{/section}
generated by cgit v1.3 (git 2.53.0) at 2026-07-05 04:57:38 +0000