[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 10:25:59 +0000 |
CVSROOT: /sources/phpgroupware
Module name: preferences
Changes by: Sigurd Nes <sigurdne> 06/10/04 10:25:59
Modified files:
inc : class.uiadmin_acl.inc.php
Log message:
fix updating of the result fields - also for grants
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/preferences/inc/class.uiadmin_acl.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
Patches:
Index: class.uiadmin_acl.inc.php
===================================================================
RCS file: /sources/phpgroupware/preferences/inc/class.uiadmin_acl.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.uiadmin_acl.inc.php 4 Oct 2006 09:51:22 -0000 1.5
+++ class.uiadmin_acl.inc.php 4 Oct 2006 10:25:59 -0000 1.6
@@ -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.5 2006/10/04 09:51:22
sigurdne Exp $
+ * @version $Id: class.uiadmin_acl.inc.php,v 1.6 2006/10/04 10:25:59
sigurdne Exp $
*/
/**
@@ -109,18 +109,18 @@
'account_id' =>
$user['account_id'],
'lid' =>
$user['account_lid'],
'name' =>
$user['account_firstname'] . ' ' . $user['account_lastname'],
- '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,
- '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,
- '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,
+ '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,
+ '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,
+ '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,
'lang_right' =>
lang('right'),
'lang_mask' =>
lang('mask'),
'lang_result' =>
lang('result'),
@@ -145,18 +145,18 @@
'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,
- '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,
- '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,
+ '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,
+ '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,
+ '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,
'lang_right' =>
lang('right'),
'lang_mask' =>
lang('mask'),
'lang_result' =>
lang('result'),
- [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 <=
- [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