From 85829662ba12865da139a085274f5d9d185e8961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20Wei=C3=9F?= Date: Sat, 11 Jun 2005 08:10:22 +0000 Subject: [PATCH] new acl-right: READ_Calender. This is made, cause there might be installations, where useres are not permittet to see how much a resource in used etc... --- resources/inc/class.bo_acl.inc.php | 10 ++++++---- resources/inc/class.ui_acl.inc.php | 9 ++++++--- resources/templates/default/acl.tpl | 18 ++++++++++-------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/resources/inc/class.bo_acl.inc.php b/resources/inc/class.bo_acl.inc.php index f306e7895e..3684a1053b 100755 --- a/resources/inc/class.bo_acl.inc.php +++ b/resources/inc/class.bo_acl.inc.php @@ -34,7 +34,7 @@ { define('EGW_ACL_CAT_ADMIN',64); define('EGW_ACL_DIRECT_BOOKING',128); -// define('EGW_ACL_CUSTOM_3',256); + define('EGW_ACL_CALREAD',256); $this->so =& CreateObject('resources.so_acl'); $this->permissions = $this->so->get_permissions($GLOBALS['egw_info']['user']['account_id'],true); @@ -183,11 +183,12 @@ $this->limit = $data['limit']; } - function set_rights($cat_id,$read,$write,$book,$admin) + function set_rights($cat_id,$read,$write,$calread,$calbook,$admin) { $readcat = $read ? $read : array(); $writecat = $write ? $write : array(); - $bookcat = $book ? $book : array(); + $calreadcat = $calread ? $calread : array(); + $calbookcat = $calbook ? $calbook : array(); $admincat = $admin ? $admin : array(); $this->so->remove_location('L' . $cat_id); @@ -199,7 +200,8 @@ $rights = in_array($account_id,$writecat) ? (EGW_ACL_READ | EGW_ACL_ADD | EGW_ACL_EDIT | EGW_ACL_DELETE) : (in_array($account_id,$readcat) ? EGW_ACL_READ : False); - $rights = in_array($account_id,$bookcat) ? ($rights | EGW_ACL_DIRECT_BOOKING) : $rights; + $rights = in_array($account_id,$calreadcat) ? ($rights | EGW_ACL_CALREAD) : $rights; + $rights = in_array($account_id,$calbookcat) ? ($rights | EGW_ACL_DIRECT_BOOKING) : $rights; $rights = in_array($account_id,$admincat) ? ($rights | EGW_ACL_CAT_ADMIN) : $rights; if ($rights) { diff --git a/resources/inc/class.ui_acl.inc.php b/resources/inc/class.ui_acl.inc.php index 69067f966c..0e8be908af 100755 --- a/resources/inc/class.ui_acl.inc.php +++ b/resources/inc/class.ui_acl.inc.php @@ -57,7 +57,8 @@ { foreach($_POST['catids'] as $cat_id) { - $this->bo->set_rights($cat_id,$_POST['inputread'][$cat_id],$_POST['inputwrite'][$cat_id],$_POST['inputbook'][$cat_id],$_POST['inputadmin'][$cat_id]); + $this->bo->set_rights($cat_id,$_POST['inputread'][$cat_id],$_POST['inputwrite'][$cat_id], + $_POST['inputcalread'][$cat_id],$_POST['inputcalbook'][$cat_id],$_POST['inputadmin'][$cat_id]); } } @@ -71,7 +72,8 @@ 'lang_read' => lang('Read permissions'), 'lang_write' => lang('Write permissions'), 'lang_implies' => lang('implies read permission'), - 'lang_book' => lang('Direct booking permissions'), + 'lang_calread' => lang('Read Calender permissions'), + 'lang_calbook' => lang('Direct booking permissions'), 'lang_cat_admin' => lang('Categories admin') )); @@ -101,7 +103,8 @@ 'catid' => $cat['id'], 'read' => $this->selectlist(EGW_ACL_READ), 'write' => $this->selectlist(EGW_ACL_ADD), - 'book' =>$this->selectlist(EGW_ACL_DIRECT_BOOKING), + 'calread' => $this->selectlist(EGW_ACL_CALREAD), + 'calbook' =>$this->selectlist(EGW_ACL_DIRECT_BOOKING), 'admin' => ''.$this->selectlist(EGW_ACL_CAT_ADMIN,true) )); $GLOBALS['egw']->template->parse('Cblock','cat_list',True); diff --git a/resources/templates/default/acl.tpl b/resources/templates/default/acl.tpl index 8386a5fb24..d0249bacb2 100755 --- a/resources/templates/default/acl.tpl +++ b/resources/templates/default/acl.tpl @@ -1,10 +1,10 @@
- +
- + -
{title}{title}
+ {left} @@ -16,18 +16,19 @@ -
  +
 
- +
- + + @@ -37,11 +38,12 @@ - + + -
{sort_cat}
{lang_cat_admin}		 {lang_read} {lang_write}
({lang_implies})		{lang_book}{lang_calread}{lang_calbook}
+