extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-24 14:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Using new PHPGW_ACL_PRIVATE ACL type

Browse Source
This commit is contained in:
skeeter 2001-03-18 13:41:29 +00:00
parent 4f6e553e15
commit c9b57e3e5b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/inc/class.calendar.inc.php
View File

@ -73,7 +73,7 @@ class calendar extends calendar_
if(!isset($this->rights)) if(!isset($this->rights))
{ {
$this->rights = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE + 16; $this->rights = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE + PHPGW_ACL_PRIVATE;
} }
$this->template_dir = $phpgw->common->get_tpl_dir('calendar'); $this->template_dir = $phpgw->common->get_tpl_dir('calendar');
@ -214,7 +214,7 @@ class calendar extends calendar_
global $phpgw, $phpgw_info; global $phpgw, $phpgw_info;
$is_private = False; $is_private = False;
if ($owner == $phpgw_info['user']['account_id'] || $owner == 0 || $this->check_perms(16) == True) if ($owner == $phpgw_info['user']['account_id'] || $owner == 0 || $this->check_perms(PHPGW_ACL_PRIVATE) == True)
{ {
} }
elseif ($event->public == False) elseif ($event->public == False)
@ -871,7 +871,7 @@ class calendar extends calendar_
$description = $this->is_private($lr_events,$owner,'description'); $description = $this->is_private($lr_events,$owner,'description');
if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(16)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT)) if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(PHPGW_ACL_PRIVATE)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT))
{ {
$var = Array( $var = Array(
'link_link' => $phpgw->link('/calendar/view.php','id='.$lr_events->id.'&owner='.$owner), 'link_link' => $phpgw->link('/calendar/view.php','id='.$lr_events->id.'&owner='.$owner),
@ -925,7 +925,7 @@ class calendar extends calendar_
$end_time = ''; $end_time = '';
} }
if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(16)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT)) if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(PHPGW_ACL_PRIVATE)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT))
{ {
$close_view_link = '</a>'; $close_view_link = '</a>';
} }
@ -1092,7 +1092,7 @@ class calendar extends calendar_
$description = $this->is_private($event,$this->owner,'description'); $description = $this->is_private($event,$this->owner,'description');
if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(16)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT)) if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(PHPGW_ACL_PRIVATE)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT))
{ {
$time[$ind] .= '<a href="'.$phpgw->link('/calendar/view.php', $time[$ind] .= '<a href="'.$phpgw->link('/calendar/view.php',
'id='.$event->id.'&owner='.$this->owner) 'id='.$event->id.'&owner='.$this->owner)
@ -1134,7 +1134,7 @@ class calendar extends calendar_
$time[$ind] .= '] '; $time[$ind] .= '] ';
$time[$ind] .= '<img src="'.$this->image_dir.'/circle.gif" border="0" alt="' . $description . '">'; $time[$ind] .= '<img src="'.$this->image_dir.'/circle.gif" border="0" alt="' . $description . '">';
if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(16)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT)) if (($this->printer_friendly == False) && (($description == 'private' && $this->check_perms(PHPGW_ACL_PRIVATE)) || ($description != 'private')) && $this->check_perms(PHPGW_ACL_EDIT))
{ {
$time[$ind] .= '</a>'; $time[$ind] .= '</a>';
} }

6
calendar/inc/functions.inc.php
View File

@ -34,7 +34,7 @@
if(!isset($owner) || !$owner || ($owner == $phpgw_info['user']['account_id'])) if(!isset($owner) || !$owner || ($owner == $phpgw_info['user']['account_id']))
{ {
$owner = $phpgw_info['user']['account_id']; $owner = $phpgw_info['user']['account_id'];
$rights = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE + 16; $rights = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE + PHPGW_ACL_PRIVATE;
} }
else else
{ {
@ -44,13 +44,13 @@
if ($rights == 0) if ($rights == 0)
{ {
$owner = $phpgw_info['user']['account_id']; $owner = $phpgw_info['user']['account_id'];
$rights = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE + 16; $rights = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE + PHPGW_ACL_PRIVATE;
} }
} }
else else
{ {
$owner = $phpgw_info['user']['account_id']; $owner = $phpgw_info['user']['account_id'];
$rights = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE + 16; $rights = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE + PHPGW_ACL_PRIVATE;
} }
} }