Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix email address case-sensitivity in a few places

Browse source
This commit is contained in:
Aleksander Machniak 2023-05-10 15:20:50 +02:00
parent 0bbc11858a
commit 8d688a4189
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/calendar/calendar_ui.js
View file

@ -765,8 +765,8 @@ function rcube_calendar_ui(settings)
// select the correct organizer identity
var identity_id = 0;
$.each(settings.identities, function(i,v){
if (organizer && typeof organizer == 'object' && v == organizer.email) {
$.each(settings.identities, function(i,v) {
if (organizer && typeof organizer == 'object' && organizer.email && v == organizer.email.toLowerCase()) {
identity_id = i;
return false;
}

2
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -401,7 +401,7 @@ class kolab_calendar extends kolab_storage_folder_api
if (count($partstat_exclude) && !empty($event['attendees'])) {
foreach ($event['attendees'] as $attendee) {
if (
!empty($attendee['email']) && in_array($attendee['email'], $user_emails)
!empty($attendee['email']) && in_array_nocase($attendee['email'], $user_emails)
&& !empty($attendee['status']) && in_array($attendee['status'], $partstat_exclude)
) {
return false;

4
plugins/calendar/drivers/kolab/kolab_invitation_calendar.php
View file

@ -267,8 +267,8 @@ class kolab_invitation_calendar
if (!empty($event['attendees'])) {
foreach ($event['attendees'] as $attendee) {
if (
in_array($attendee['email'], $user_emails)
&& in_array($attendee['status'], $this->partstats)
!empty($attendee['email']) && in_array_nocase($attendee['email'], $user_emails)
&& !empty($attendee['status']) && in_array($attendee['status'], $this->partstats)
) {
$match = true;
break;

3
plugins/libkolab/lib/kolab_format_xcal.php
View file

@ -135,6 +135,7 @@ abstract class kolab_format_xcal extends kolab_format
);
}
// Get the list of attendees (excluding the organizer)
$role_map = array_flip($this->role_map);
$cutype_map = array_flip($this->cutype_map);
$part_status_map = array_flip($this->part_status_map);
@ -142,7 +143,7 @@ abstract class kolab_format_xcal extends kolab_format
for ($i=0; $i < $attvec->size(); $i++) {
$attendee = $attvec->get($i);
$cr = $attendee->contact();
if ($cr->email() != $object['organizer']['email']) {
if (empty($object['organizer']['email']) || strcasecmp($cr->email(), $object['organizer']['email'])) {
$delegators = $delegatees = array();
$vdelegators = $attendee->delegatedFrom();
for ($j=0; $j < $vdelegators->size(); $j++) {