[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php |
|
Date: |
Wed, 04 Oct 2006 09:51:22 +0000 |
CVSROOT: /sources/phpgroupware
Module name: preferences
Changes by: Sigurd Nes <sigurdne> 06/10/04 09:51:22
Modified files:
inc : class.uiadmin_acl.inc.php
Log message:
fix updating of the result fields
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/preferences/inc/class.uiadmin_acl.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
Patches:
Index: class.uiadmin_acl.inc.php
===================================================================
RCS file: /sources/phpgroupware/preferences/inc/class.uiadmin_acl.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.uiadmin_acl.inc.php 4 Oct 2006 05:23:56 -0000 1.4
+++ class.uiadmin_acl.inc.php 4 Oct 2006 09:51:22 -0000 1.5
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage admin
- * @version $Id: class.uiadmin_acl.inc.php,v 1.4 2006/10/04 05:23:56
skwashd Exp $
+ * @version $Id: class.uiadmin_acl.inc.php,v 1.5 2006/10/04 09:51:22
sigurdne Exp $
*/
/**
@@ -137,7 +137,6 @@
$group_list =
$this->bo->get_user_list('groups',true);
}
-
while (is_array($group_list) && list(,$group) =
each($group_list))
{
$processed[] = $group['account_id'];
@@ -193,7 +192,7 @@
'filter' => $this->filter,
'query' => $this->query,
'module' => $this->location,
- 'granting_group'=> $this->granting_group,
+ 'granting_group' =>
$this->granting_group,
'acl_app' => $this->acl_app
);
@@ -215,7 +214,6 @@
'lang_done'
=> lang('done'),
'processed'
=> $processed,
'location'
=> $this->location,
- 'links'
=> $links,
'allow_allrows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
@@ -299,21 +297,21 @@
'account_id' =>
$user['account_id'],
'lid'
=> $user['account_lid'],
'name'
=> $user['account_firstname'] . ' ' . $user['account_lastname'] . ' [' .
$user['account_lid'] . ']',
- 'read_right' =>
isset($user['right'][PHPGW_ACL_READ]) ? !!$user['right'][PHPGW_ACL_READ] :
false,
- 'add_right'
=> isset($user['right'][PHPGW_ACL_ADD]) ? !!$user['right'][PHPGW_ACL_ADD] :
false,
- 'edit_right' =>
isset($user['right'][PHPGW_ACL_EDIT]) ? !!$user['right'][PHPGW_ACL_EDIT] :
false,
- 'delete_right' =>
isset($user['right'][PHPGW_ACL_DELETE]) ? !!$user['right'][PHPGW_ACL_DELETE] :
false,
- 'manage_right' =>
isset($user['right'][PHPGW_ACL_PRIVATE]) ? !!$user['right'][PHPGW_ACL_PRIVATE]
: false, //should be PHPGW_ACL_GROUP_MANAGERS
- 'read_mask'
=> isset($user['mask'][PHPGW_ACL_READ]) ? !!$user['mask'][PHPGW_ACL_READ] :
false,
- 'add_mask'
=> isset($user['mask'][PHPGW_ACL_ADD]) ? !!$user['mask'][PHPGW_ACL_ADD] : false,
- 'edit_mask'
=> isset($user['mask'][PHPGW_ACL_EDIT]) ? !!$user['mask'][PHPGW_ACL_EDIT] :
false,
- 'delete_mask' =>
isset($user['mask'][PHPGW_ACL_DELETE]) ? !!$user['mask'][PHPGW_ACL_DELETE] :
false,
- 'manage_mask' =>
isset($user['mask'][PHPGW_ACL_PRIVATE]) ? !!$user['mask'][PHPGW_ACL_PRIVATE] :
false, //should be PHPGW_ACL_GROUP_MANAGERS
- 'read_result' =>
isset($user['result'][PHPGW_ACL_READ]) ? !!$user['result'][PHPGW_ACL_READ] :
false,
- 'add_result' =>
isset($user['result'][PHPGW_ACL_ADD]) ? !!$user['result'][PHPGW_ACL_ADD] :
false,
- 'edit_result' =>
isset($user['resilt'][PHPGW_ACL_EDIT]) ? !!$user['result'][PHPGW_ACL_EDIT] :
false,
- 'delete_result' =>
isset($user['result'][PHPGW_ACL_DELETE]) ? !!$user['result'][PHPGW_ACL_DELETE]
: false,
- 'manage_result' =>
isset($user['result'][PHPGW_ACL_PRIVATE]) ?
!!$user['result'][PHPGW_ACL_PRIVATE] : false, //should be
PHPGW_ACL_GROUP_MANAGERS
+ 'read_right'
=> isset($user['right'][PHPGW_ACL_READ]) ? $user['right'][PHPGW_ACL_READ] :
false,
+ 'add_right'
=> isset($user['right'][PHPGW_ACL_ADD]) ? $user['right'][PHPGW_ACL_ADD] : false,
+ 'edit_right'
=> isset($user['right'][PHPGW_ACL_EDIT]) ? $user['right'][PHPGW_ACL_EDIT] :
false,
+ 'delete_right'
=> isset($user['right'][PHPGW_ACL_DELETE]) ? $user['right'][PHPGW_ACL_DELETE] :
false,
+ 'manage_right'
=> isset($user['right'][PHPGW_ACL_PRIVATE]) ? $user['right'][PHPGW_ACL_PRIVATE]
: false, //should be PHPGW_ACL_GROUP_MANAGERS
+ 'read_mask'
=> isset($user['mask'][PHPGW_ACL_READ]) ? $user['mask'][PHPGW_ACL_READ] : false,
+ 'add_mask'
=> isset($user['mask'][PHPGW_ACL_ADD]) ? $user['mask'][PHPGW_ACL_ADD] : false,
+ 'edit_mask'
=> isset($user['mask'][PHPGW_ACL_EDIT]) ? $user['mask'][PHPGW_ACL_EDIT] : false,
+ 'delete_mask'
=> isset($user['mask'][PHPGW_ACL_DELETE]) ? $user['mask'][PHPGW_ACL_DELETE] :
false,
+ 'manage_mask'
=> isset($user['mask'][PHPGW_ACL_PRIVATE]) ? $user['mask'][PHPGW_ACL_PRIVATE] :
false, //should be PHPGW_ACL_GROUP_MANAGERS
+ 'read_result'
=> isset($user['result'][PHPGW_ACL_READ]) ? $user['result'][PHPGW_ACL_READ] :
false,
+ 'add_result'
=> isset($user['result'][PHPGW_ACL_ADD]) ? $user['result'][PHPGW_ACL_ADD] :
false,
+ 'edit_result'
=> isset($user['resilt'][PHPGW_ACL_EDIT]) ? $user['result'][PHPGW_ACL_EDIT] :
false,
+ 'delete_result'
=> isset($user['result'][PHPGW_ACL_DELETE]) ? $user['result'][PHPGW_ACL_DELETE]
: false,
+ 'manage_result'
=> isset($user['result'][PHPGW_ACL_PRIVATE]) ?
$user['result'][PHPGW_ACL_PRIVATE] : false, //should be PHPGW_ACL_GROUP_MANAGERS
'lang_right' =>
lang('right'),
'lang_mask'
=> lang('mask'),
'lang_result' =>
lang('result'),
@@ -342,21 +340,21 @@
'account_id' =>
$group['account_id'],
'lid'
=> $group['account_lid'],
'name'
=> $group['account_firstname'],
- 'read_right' =>
isset($group['right'][PHPGW_ACL_READ]) ? !!$group['right'][PHPGW_ACL_READ] :
false,
- 'add_right'
=> isset($group['right'][PHPGW_ACL_ADD]) ? !!$group['right'][PHPGW_ACL_ADD] :
false,
- 'edit_right' =>
isset($group['right'][PHPGW_ACL_EDIT]) ? !!$group['right'][PHPGW_ACL_EDIT] :
false,
- 'delete_right' =>
isset($group['right'][PHPGW_ACL_DELETE]) ? !!$group['right'][PHPGW_ACL_DELETE]
: false,
- 'manage_right' =>
isset($group['right'][PHPGW_ACL_PRIVATE]) ?
!!$group['right'][PHPGW_ACL_PRIVATE] : false, //should be
PHPGW_ACL_GROUP_MANAGERS
- 'read_mask'
=> isset($group['mask'][PHPGW_ACL_READ]) ? !!$group['mask'][PHPGW_ACL_READ] :
false,
- 'add_mask'
=> isset($group['mask'][PHPGW_ACL_ADD]) ? !!$group['mask'][PHPGW_ACL_ADD] :
false,
- 'edit_mask'
=> isset($group['mask'][PHPGW_ACL_EDIT]) ? !!$group['mask'][PHPGW_ACL_EDIT] :
false,
- 'delete_mask' =>
isset($group['mask'][PHPGW_ACL_DELETE]) ? !!$group['mask'][PHPGW_ACL_DELETE] :
false,
- 'manage_mask' =>
isset($group['mask'][PHPGW_ACL_PRIVATE]) ? !!$group['mask'][PHPGW_ACL_PRIVATE]
: false, //should be PHPGW_ACL_GROUP_MANAGERS
- 'read_result' =>
isset($group['result'][PHPGW_ACL_READ]) ? !!$group['result'][PHPGW_ACL_READ] :
false,
- 'add_result' =>
isset($group['result'][PHPGW_ACL_ADD]) ? !!$group['result'][PHPGW_ACL_ADD] :
false,
- 'edit_result' =>
isset($group['resilt'][PHPGW_ACL_EDIT]) ? !!$group['result'][PHPGW_ACL_EDIT] :
false,
- 'delete_result' =>
isset($group['result'][PHPGW_ACL_DELETE]) ?
!!$group['result'][PHPGW_ACL_DELETE] : false,
- 'manage_result' =>
isset($group['result'][PHPGW_ACL_PRIVATE]) ?
!!$group['result'][PHPGW_ACL_PRIVATE] : false, //should be
PHPGW_ACL_GROUP_MANAGERS
+ 'read_right'
=> isset($group['right'][PHPGW_ACL_READ]) ? $group['right'][PHPGW_ACL_READ] :
false,
+ 'add_right'
=> isset($group['right'][PHPGW_ACL_ADD]) ? $group['right'][PHPGW_ACL_ADD] :
false,
+ 'edit_right'
=> isset($group['right'][PHPGW_ACL_EDIT]) ? $group['right'][PHPGW_ACL_EDIT] :
false,
+ 'delete_right'
=> isset($group['right'][PHPGW_ACL_DELETE]) ? $group['right'][PHPGW_ACL_DELETE]
: false,
+ 'manage_right'
=> isset($group['right'][PHPGW_ACL_PRIVATE]) ?
$group['right'][PHPGW_ACL_PRIVATE] : false, //should be PHPGW_ACL_GROUP_MANAGERS
+ 'read_mask'
=> isset($group['mask'][PHPGW_ACL_READ]) ? $group['mask'][PHPGW_ACL_READ] :
false,
+ 'add_mask'
=> isset($group['mask'][PHPGW_ACL_ADD]) ? $group['mask'][PHPGW_ACL_ADD] : false,
+ 'edit_mask'
=> isset($group['mask'][PHPGW_ACL_EDIT]) ? $group['mask'][PHPGW_ACL_EDIT] :
false,
+ 'delete_mask'
=> isset($group['mask'][PHPGW_ACL_DELETE]) ? $group['mask'][PHPGW_ACL_DELETE] :
false,
+ 'manage_mask'
=> isset($group['mask'][PHPGW_ACL_PRIVATE]) ? $group['mask'][PHPGW_ACL_PRIVATE]
: false, //should be PHPGW_ACL_GROUP_MANAGERS
+ 'read_result'
=> isset($group['result'][PHPGW_ACL_READ]) ? $group['result'][PHPGW_ACL_READ] :
false,
+ 'add_result'
=> isset($group['result'][PHPGW_ACL_ADD]) ? $group['result'][PHPGW_ACL_ADD] :
false,
+ 'edit_result'
=> isset($group['resilt'][PHPGW_ACL_EDIT]) ? $group['result'][PHPGW_ACL_EDIT] :
false,
+ 'delete_result'
=> isset($group['result'][PHPGW_ACL_DELETE]) ?
$group['result'][PHPGW_ACL_DELETE] : false,
+ 'manage_result'
=> isset($group['result'][PHPGW_ACL_PRIVATE]) ?
$group['result'][PHPGW_ACL_PRIVATE] : false, //should be
PHPGW_ACL_GROUP_MANAGERS
'lang_right' =>
lang('right'),
'lang_mask'
=> lang('mask'),
'lang_result' =>
lang('result'),
@@ -372,7 +370,6 @@
$processed = implode('_', $processed);
}
-
$table_header[] = array
(
'sort_lid' =>
$this->nextmatchs->show_sort_order(array
@@ -467,7 +464,6 @@
'lang_done'
=> lang('done'),
'processed'
=> $processed,
'location'
=> $this->location,
- //'links'
=> $links, //never initialised
'num_records'
=> $num_records,
'all_records'
=> $this->bo->total_records,
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php,
Sigurd Nes <=
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Sigurd Nes, 2006/10/04
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Sigurd Nes, 2006/10/04
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Dave Hall, 2006/10/04
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Dave Hall, 2006/10/04
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Sigurd Nes, 2006/10/22
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Sigurd Nes, 2006/10/23