From 19035cc6e4d83dad44ebe5ee49d51940b9c8f823 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 17 Nov 2014 13:30:12 +0000 Subject: [PATCH] only add readonly entries if required, saves some time/transfer volumn for hughe participant lists --- calendar/inc/class.calendar_uiforms.inc.php | 9 ++++++--- calendar/setup/timezones.sqlite | Bin 294912 -> 294912 bytes 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index 531c1b5b20..00ea5cc675 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -1424,8 +1424,10 @@ class calendar_uiforms extends calendar_ui $content['participants'][$row]['delete_id'] = strpbrk($uid,'"\'<>') !== false ? md5($uid) : $uid; //echo "

$uid ($quantity): $role --> {$content['participants'][$row]['role']}

\n"; - $readonlys['participants'][$row]['status'] = !$this->bo->check_status_perms($uid,$event); - $readonlys['participants']['delete'][$uid] = $preserv['hide_delete'] || !$this->bo->check_perms(EGW_ACL_EDIT,$event); + if (!$this->bo->check_status_perms($uid,$event)) + $readonlys['participants'][$row]['status'] = true; + if ($preserv['hide_delete'] || !$this->bo->check_perms(EGW_ACL_EDIT,$event)) + $readonlys['participants']['delete'][$uid] = true; // todo: make the participants available as links with email as title $content['participants'][$row++]['title'] = $this->get_title($uid); // enumerate group-invitations, so people can accept/reject them @@ -1446,7 +1448,8 @@ class calendar_uiforms extends calendar_ui ); $readonlys['participants'][$row]['quantity'] = $readonlys['participants']['delete'][$member] = true; // read access is enough to invite participants, but you need edit rights to change status - $readonlys['participants'][$row]['status'] = !$this->bo->check_perms(EGW_ACL_EDIT,0,$member); + if (!$this->bo->check_perms(EGW_ACL_EDIT,0,$member)) + $readonlys['participants'][$row]['status'] = true; //$readonlys[$row.'[status]'] = !$this->bo->check_perms(EGW_ACL_EDIT,0,$member); $content['participants'][$row++]['title'] = common::grab_owner_name($member); } diff --git a/calendar/setup/timezones.sqlite b/calendar/setup/timezones.sqlite index b7e014abf865a83538d29bbfe745c7a347edcb35..9484230f0afca17185c6e128ef94f7290ad2a6fd 100644 GIT binary patch delta 3996 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 delta 4103 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