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

Fix rare fatal error in caldav_calendar class and some PHP8 warnings

Browse source
This commit is contained in:
Aleksander Machniak 2023-09-27 09:21:34 +02:00
parent 4bc6a82a13
commit dcfd95fd1f
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar.php
View file

@ -3464,7 +3464,7 @@ $("#rcmfd_new_category").keypress(function(event) {
$update_attendees[] = $attendee;
$metadata['fallback'] = $attendee['status'];
$metadata['attendee'] = $attendee['email'];
$metadata['rsvp'] = !empty($attendee['rsvp']) || $attendee['role'] != 'NON-PARTICIPANT';
$metadata['rsvp'] = !empty($attendee['rsvp']) || empty($attendee['role']) || $attendee['role'] != 'NON-PARTICIPANT';
$existing_attendee_emails = [];

16
plugins/calendar/drivers/caldav/caldav_calendar.php
View file

@ -64,14 +64,17 @@ class caldav_calendar extends kolab_storage_dav_folder
// $this->storage = kolab_storage_dav::get_folder($folder_or_id, 'event');
}
$this->cal = $calendar;
$this->id = $this->storage->id;
$this->attributes = $this->storage->attributes;
$this->ready = true;
$this->alarms = !isset($this->storage->attributes['alarms']) || $this->storage->attributes['alarms'];
$this->cal = $calendar;
$this->ready = !empty($this->storage);
// Set writeable and alarms flags according to folder permissions
if ($this->ready) {
$this->id = $this->storage->id;
$this->attributes = $this->storage->attributes;
$this->default = $this->storage->default;
$this->subtype = $this->storage->subtype;
$this->alarms = !isset($this->attributes['alarms']) || $this->attributes['alarms'];
if ($this->storage->get_namespace() == 'personal') {
$this->editable = true;
$this->rights = 'lrswikxteav';
@ -86,9 +89,6 @@ class caldav_calendar extends kolab_storage_dav_folder
}
}
}
$this->default = $this->storage->default;
$this->subtype = $this->storage->subtype;
}
/**

4
plugins/kolab_addressbook/drivers/carddav/carddav_contacts_driver.php
View file

@ -162,8 +162,8 @@ class carddav_contacts_driver
$result = $storage->folder_update($prop);
if ($result && ($abook = $this->get_address_book($prop['id'] ?: $result))) {
$abook->id = $prop['id'] ?: $result;
$props = $this->abook_prop($abook->id, $abook);
$abook_id = $prop['id'] ?: $result;
$props = $this->abook_prop($abook_id, $abook);
$this->rc->output->show_message('kolab_addressbook.book'.$type.'d', 'confirmation');
$this->rc->output->command('book_update', $props, $prop['id']);