holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"fixed group invitations got changed to regular invitations, after inviting a second group"

Browse Source
This commit is contained in:
Ralf Becker 2009-06-18 13:21:05 +00:00
parent ca6164f5ce
commit 53e7c66f51
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @package calendar * @package calendar
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2004-8 by RalfBecker-At-outdoor-training.de * @copyright (c) 2004-9 by RalfBecker-At-outdoor-training.de
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
@ -892,25 +892,20 @@ class calendar_uiforms extends calendar_ui
$sel_options['status']['G'] = lang('Select one'); $sel_options['status']['G'] = lang('Select one');
foreach($members as $member) foreach($members as $member)
{ {
if (!isset($participants[$member])) if (!isset($participants[$member]) && $this->bo->check_perms(EGW_ACL_READ,0,$member))
{ {
//IF Readaccess you can also invite participants, but you can only change the status, if you have edit rights $preserv['participants'][$row] = $content['participants'][$row] = array(
if ($this->bo->check_perms(EGW_ACL_READ,0,$member) && !$this->bo->check_perms(EGW_ACL_EDIT,0,$member)) 'app' => 'Group invitation',
'uid' => $member,
'status' => 'G',
);
// read access is enought to invite participants, but you edit rights to change status
if (!$this->bo->check_perms(EGW_ACL_EDIT,0,$member))
{ {
$preserv['participants'][$row] = $content['participants'][$row] = array(
'app' => 'Group invitation',
'uid' => $member,
'status' => $status[0],
);
$readonlys[$row.'[quantity]'] = $readonlys["delete[$member]"] =$readonlys[$row]['status']= true; $readonlys[$row.'[quantity]'] = $readonlys["delete[$member]"] =$readonlys[$row]['status']= true;
} }
elseif ($this->bo->check_perms(EGW_ACL_EDIT,0,$member)) else
{ {
$preserv['participants'][$row] = $content['participants'][$row] = array(
'app' => 'Group invitation',
'uid' => $member,
'status' => 'G',
);
$readonlys[$row.'[quantity]'] = $readonlys["delete[$member]"] = true; $readonlys[$row.'[quantity]'] = $readonlys["delete[$member]"] = true;
} }
$content['participants'][$row++]['title'] = $GLOBALS['egw']->common->grab_owner_name($member); $content['participants'][$row++]['title'] = $GLOBALS['egw']->common->grab_owner_name($member);