From 437e09435ebf3f265b1f8f36715332009b6d30cf Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 16 Oct 2019 19:58:33 +0200 Subject: [PATCH] Calendar 3.5.1 --- README | 51 +- calendar.php | 452 +- calendar_base.js | 70 +- calendar_ui.js | 2084 +- composer.json | 17 +- config.inc.php.dist | 38 +- drivers/calendar_driver.php | 16 +- drivers/database/database_driver.php | 2915 +-- drivers/kolab/SQL/mysql.initial.sql | 2 +- drivers/kolab/SQL/mysql/2012080600.sql | 2 +- drivers/kolab/kolab_calendar.php | 100 +- drivers/kolab/kolab_driver.php | 389 +- drivers/kolab/kolab_invitation_calendar.php | 83 +- drivers/kolab/kolab_user_calendar.php | 11 +- drivers/ldap/resources_driver_ldap.php | 14 +- lib/calendar_ui.php | 386 +- lib/js/fullcalendar.js | 21851 ++++++++++++------ lib/js/moment.js | 4511 ++++ localization/bg_BG.inc | 6 +- localization/ca_ES.inc | 6 +- localization/cs_CZ.inc | 22 +- localization/da_DK.inc | 7 +- localization/de.inc | 268 + localization/de_CH.inc | 8 +- localization/de_DE.inc | 53 +- localization/el.inc | 2 +- localization/en_US.inc | 22 +- localization/es_AR.inc | 21 +- localization/es_ES.inc | 7 +- localization/et_EE.inc | 163 + localization/fi_FI.inc | 22 +- localization/fr_FR.inc | 7 +- localization/hr_HR.inc | 24 + localization/hu_HU.inc | 7 +- localization/it_IT.inc | 7 +- localization/ja_JP.inc | 7 +- localization/ko_KR.inc | 4 +- localization/lv.inc | 6 +- localization/nl_NL.inc | 7 +- localization/pl.inc | 267 + localization/pl_PL.inc | 42 +- localization/pt_BR.inc | 89 +- localization/pt_PT.inc | 5 +- localization/ru_RU.inc | 28 +- localization/sk_SK.inc | 2 +- localization/sl_SI.inc | 6 +- localization/sv.inc | 260 + localization/sv_SE.inc | 11 +- localization/th_TH.inc | 6 +- localization/uk_UA.inc | 5 +- localization/zh_CN.inc | 4 + print.js | 210 +- skins/classic/README | 5 - skins/classic/calendar.css | 1796 -- skins/classic/fullcalendar.css | 1 - skins/classic/iehacks.css | 80 - skins/classic/images/attendee-status.gif | Bin 3487 -> 0 bytes skins/classic/images/calendar-blue.png | Bin 896 -> 0 bytes skins/classic/images/calendar.gif | Bin 546 -> 0 bytes skins/classic/images/calendar.png | Bin 888 -> 0 bytes skins/classic/images/calendars.gif | Bin 2734 -> 0 bytes skins/classic/images/calendars.png | Bin 1872 -> 0 bytes skins/classic/images/eventicons.gif | Bin 107 -> 0 bytes skins/classic/images/export.png | Bin 746 -> 0 bytes skins/classic/images/freebusy-colors.gif | Bin 408 -> 0 bytes skins/classic/images/freebusy-colors.png | Bin 631 -> 0 bytes skins/classic/images/invitation.png | Bin 1909 -> 0 bytes skins/classic/images/listheader.gif | Bin 322 -> 0 bytes skins/classic/images/loading_blue.gif | Bin 847 -> 0 bytes skins/classic/images/preview.png | Bin 1131 -> 0 bytes skins/classic/images/print.png | Bin 869 -> 0 bytes skins/classic/images/spacer.gif | Bin 807 -> 0 bytes skins/classic/images/toggle.gif | Bin 110 -> 0 bytes skins/classic/images/toolbar.gif | Bin 6186 -> 0 bytes skins/classic/images/toolbar.png | Bin 15166 -> 0 bytes skins/classic/print.css | 209 - skins/classic/print.iehacks.css | 25 - skins/classic/templates/attachment.html | 26 - skins/classic/templates/calendar.html | 261 - skins/classic/templates/eventedit.html | 128 - skins/classic/templates/freebusylegend.html | 7 - skins/classic/templates/itipattend.html | 21 - skins/classic/templates/kolabacl.html | 13 - skins/classic/templates/kolabform.html | 7 - skins/classic/templates/print.html | 28 - skins/elastic/templates/calendar.html | 384 + skins/elastic/templates/dialog.html | 7 + skins/elastic/templates/eventedit.html | 158 + skins/elastic/templates/freebusylegend.html | 9 + skins/elastic/templates/itipattend.html | 11 + skins/elastic/templates/print.html | 19 + skins/larry/calendar.css | 412 +- skins/larry/fullcalendar.css | 1846 +- skins/larry/images/badge.png | Bin 746 -> 0 bytes skins/larry/print.css | 117 +- skins/larry/print.iehacks.css | 25 - skins/larry/templates/attachment.html | 64 - skins/larry/templates/calendar.html | 10 +- skins/larry/templates/dialog.html | 77 +- skins/larry/templates/eventedit.html | 16 +- skins/larry/templates/eventshow.html | 80 - skins/larry/templates/kolabacl.html | 26 - skins/larry/templates/kolabform.html | 9 - skins/larry/templates/print.html | 1 - 104 files changed, 26314 insertions(+), 14167 deletions(-) create mode 100644 lib/js/moment.js create mode 100644 localization/de.inc create mode 100644 localization/et_EE.inc create mode 100644 localization/hr_HR.inc create mode 100644 localization/pl.inc create mode 100644 localization/sv.inc delete mode 100644 skins/classic/README delete mode 100644 skins/classic/calendar.css delete mode 120000 skins/classic/fullcalendar.css delete mode 100644 skins/classic/iehacks.css delete mode 100644 skins/classic/images/attendee-status.gif delete mode 100644 skins/classic/images/calendar-blue.png delete mode 100644 skins/classic/images/calendar.gif delete mode 100644 skins/classic/images/calendar.png delete mode 100644 skins/classic/images/calendars.gif delete mode 100644 skins/classic/images/calendars.png delete mode 100644 skins/classic/images/eventicons.gif delete mode 100644 skins/classic/images/export.png delete mode 100644 skins/classic/images/freebusy-colors.gif delete mode 100644 skins/classic/images/freebusy-colors.png delete mode 100644 skins/classic/images/invitation.png delete mode 100644 skins/classic/images/listheader.gif delete mode 100644 skins/classic/images/loading_blue.gif delete mode 100644 skins/classic/images/preview.png delete mode 100644 skins/classic/images/print.png delete mode 100644 skins/classic/images/spacer.gif delete mode 100644 skins/classic/images/toggle.gif delete mode 100644 skins/classic/images/toolbar.gif delete mode 100644 skins/classic/images/toolbar.png delete mode 100644 skins/classic/print.css delete mode 100644 skins/classic/print.iehacks.css delete mode 100644 skins/classic/templates/attachment.html delete mode 100644 skins/classic/templates/calendar.html delete mode 100644 skins/classic/templates/eventedit.html delete mode 100644 skins/classic/templates/freebusylegend.html delete mode 100644 skins/classic/templates/itipattend.html delete mode 100644 skins/classic/templates/kolabacl.html delete mode 100644 skins/classic/templates/kolabform.html delete mode 100644 skins/classic/templates/print.html create mode 100644 skins/elastic/templates/calendar.html create mode 100644 skins/elastic/templates/dialog.html create mode 100644 skins/elastic/templates/eventedit.html create mode 100644 skins/elastic/templates/freebusylegend.html create mode 100644 skins/elastic/templates/itipattend.html create mode 100644 skins/elastic/templates/print.html delete mode 100644 skins/larry/images/badge.png delete mode 100644 skins/larry/print.iehacks.css delete mode 100644 skins/larry/templates/attachment.html delete mode 100644 skins/larry/templates/eventshow.html delete mode 100644 skins/larry/templates/kolabacl.html delete mode 100644 skins/larry/templates/kolabform.html diff --git a/README b/README index c824261..025be65 100644 --- a/README +++ b/README @@ -6,24 +6,14 @@ server as backends for calendar and event storage. For both drivers, some initialization of the local database is necessary. To do so, execute the SQL commands in drivers//SQL/.initial.sql -The client-side calendar UI relies on the "fullcalendar" project by Adam Arshaw -with extensions made for the use in Roundcube. All changes are published in -an official fork at https://github.com/roundcube/fullcalendar - For some general calendar-based operations such as alarms handling or iCal -parsing/exporting this plugins requires the `libcalendaring` plugin which -is also part of the Kolab Roundcube Plugins repository. Make sure that plugin -is installed and configured correctly. +parsing/exporting and UI widgets/style this plugins requires the `libcalendaring` +and `libkolab` plugins which are also part of the Kolab Roundcube Plugins repository. +Make sure these plugins are installed and configured correctly. For recurring event computation, some utility classes from the Horde project are used. They are packaged in a slightly modified version with this plugin. -IMPORTANT ---------- - -The calendar module makes heavy use of PHP's DateTime as well as DateInterval -classes. The latter one requires at least PHP 5.3.0 to run. - REQUIREMENTS ------------ @@ -33,15 +23,12 @@ library plugins. Thus in order to run the calendar plugin, you also need the following plugins installed: * libcalendaring [1] -* libkolab [1] (when using the 'kolab' driver) +* libkolab [1] INSTALLATION ------------ -The preferred and automated way to install the calendar with all requirements -is via the Roundcube plugin repository: https://plugins.roundcube.net - For a manual installation of the calendar plugin (and its dependencies), execute the following steps. This will set it up with the database backend driver. @@ -53,29 +40,25 @@ driver. $ cd //plugins $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/calendar . $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/libcalendaring . + $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/libkolab . -2. Install the dependencies with Composer - -(This has to be done from the Roundcube root directory) - - $ cd / - $ php composer.phar require sabre/vobject 3.3.3 - -Download the composer.phar script from https://getcomposer.org - -3. Create calendar plugin configuration +2. Create calendar plugin configuration $ cd calendar/ $ cp config.inc.php.dist config.inc.php $ edit config.inc.php -4. Initialize the calendar database tables +3. Initialize the calendar database tables - $ mysql roundcubemail < drivers/database/SQL/mysql.initial.sql + $ cd ../../ + $ bin/initdb.sh --dir=plugins/calendar/drivers/database/SQL + +4. Build css styles for the Elastic skin + + $ lessc --relative-urls -x plugins/libkolab/skins/elastic/libkolab.less > plugins/libkolab/skins/elastic/libkolab.min.css 5. Enable the calendar plugin - $ cd ../../ $ edit config/config.inc.php Add 'calendar' to the list of active plugins: @@ -86,5 +69,13 @@ Add 'calendar' to the list of active plugins: ); +IMPORTANT +--------- + +This plugin doesn't work with the Classic skin of Roundcube because no +templates are available for that skin. + +Use Roundcube `skins_allowed` option to limit skins available to the user +or remove incompatible skins from the skins folder. [1] https://git.kolab.org/diffusion/RPK/ diff --git a/calendar.php b/calendar.php index d1b8eab..ba2db5c 100644 --- a/calendar.php +++ b/calendar.php @@ -50,7 +50,6 @@ class calendar extends rcube_plugin 'calendar_work_start' => 6, 'calendar_work_end' => 18, 'calendar_agenda_range' => 60, - 'calendar_agenda_sections' => 'smart', 'calendar_event_coloring' => 0, 'calendar_time_indicator' => true, 'calendar_allow_invite_shared' => false, @@ -97,6 +96,7 @@ class calendar extends rcube_plugin protected function setup() { $this->require_plugin('libcalendaring'); + $this->require_plugin('libkolab'); $this->lib = libcalendaring::get_instance(); $this->timezone = $this->lib->timezone; @@ -152,8 +152,7 @@ class calendar extends rcube_plugin $this->register_action('print', array($this,'print_view')); $this->register_action('mailimportitip', array($this, 'mail_import_itip')); $this->register_action('mailimportattach', array($this, 'mail_import_attachment')); - $this->register_action('mailtoevent', array($this, 'mail_message2event')); - $this->register_action('inlineui', array($this, 'get_inline_ui')); + $this->register_action('dialog-ui', array($this, 'mail_message2event')); $this->register_action('check-recent', array($this, 'check_recent')); $this->register_action('itip-status', array($this, 'event_itip_status')); $this->register_action('itip-remove', array($this, 'event_itip_remove')); @@ -188,14 +187,14 @@ class calendar extends rcube_plugin } // add 'Create event' item to message menu - if ($this->api->output->type == 'html') { - $this->api->add_content(html::tag('li', null, + if ($this->api->output->type == 'html' && $_GET['_rel'] != 'event') { + $this->api->add_content(html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array( 'command' => 'calendar-create-from-mail', 'label' => 'calendar.createfrommail', 'type' => 'link', 'classact' => 'icon calendarlink active', - 'class' => 'icon calendarlink', + 'class' => 'icon calendarlink disabled', 'innerclass' => 'icon calendar', ))), 'messagemenu'); @@ -296,7 +295,6 @@ class calendar extends rcube_plugin return $calendar ?: $first; } - /** * Render the main calendar view from skin template */ @@ -304,9 +302,6 @@ class calendar extends rcube_plugin { $this->rc->output->set_pagetitle($this->gettext('calendar')); - // Add CSS stylesheets to the page header - $this->ui->addCSS(); - // Add JS files to the page header $this->ui->addJS(); @@ -319,10 +314,14 @@ class calendar extends rcube_plugin $this->rc->output->set_env('timezone', $this->timezone->getName()); $this->rc->output->set_env('calendar_driver', $this->rc->config->get('calendar_driver'), false); $this->rc->output->set_env('calendar_resources', (bool)$this->rc->config->get('calendar_resources_driver')); - $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array('id' => 'edit-identities-list', 'aria-label' => $this->gettext('roleorganizer')))); + $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array( + 'id' => 'edit-identities-list', + 'aria-label' => $this->gettext('roleorganizer'), + 'class' => 'form-control custom-select', + ))); $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC); - if (in_array($view, array('agendaWeek', 'agendaDay', 'month', 'table'))) + if (in_array($view, array('agendaWeek', 'agendaDay', 'month', 'list'))) $this->rc->output->set_env('view', $view); if ($date = rcube_utils::get_input_value('date', rcube_utils::INPUT_GPC)) @@ -374,14 +373,15 @@ class calendar extends rcube_plugin } $field_id = 'rcmfd_default_view'; + $view = $this->rc->config->get('calendar_default_view', $this->defaults['calendar_default_view']); $select = new html_select(array('name' => '_default_view', 'id' => $field_id)); $select->add($this->gettext('day'), "agendaDay"); $select->add($this->gettext('week'), "agendaWeek"); $select->add($this->gettext('month'), "month"); - $select->add($this->gettext('agenda'), "table"); + $select->add($this->gettext('agenda'), "list"); $p['blocks']['view']['options']['default_view'] = array( 'title' => html::label($field_id, rcube::Q($this->gettext('default_view'))), - 'content' => $select->show($this->rc->config->get('calendar_default_view', $this->defaults['calendar_default_view'])), + 'content' => $select->show($view == 'table' ? 'list' : $view), ); } @@ -446,11 +446,16 @@ class calendar extends rcube_plugin return $p; } - $field_id = 'rcmfd_workstart'; + $field_id = 'rcmfd_workstart'; + $work_start = $this->rc->config->get('calendar_work_start', $this->defaults['calendar_work_start']); + $work_end = $this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']); $p['blocks']['view']['options']['workinghours'] = array( - 'title' => html::label($field_id, rcube::Q($this->gettext('workinghours'))), - 'content' => $select_hours->show($this->rc->config->get('calendar_work_start', $this->defaults['calendar_work_start']), array('name' => '_work_start', 'id' => $field_id)) . - ' — ' . $select_hours->show($this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']), array('name' => '_work_end', 'id' => $field_id)), + 'title' => html::label($field_id, rcube::Q($this->gettext('workinghours'))), + 'content' => html::div('input-group', + $select_hours->show($work_start, array('name' => '_work_start', 'id' => $field_id)) + . html::span('input-group-append input-group-prepend', html::span('input-group-text',' — ')) + . $select_hours->show($work_end, array('name' => '_work_end', 'id' => $field_id)) + ) ); } @@ -468,7 +473,7 @@ class calendar extends rcube_plugin $select_colors->add($this->gettext('coloringmode3'), 3); $p['blocks']['view']['options']['eventcolors'] = array( - 'title' => html::label($field_id . 'value', rcube::Q($this->gettext('eventcoloring'))), + 'title' => html::label($field_id, rcube::Q($this->gettext('eventcoloring'))), 'content' => $select_colors->show($this->rc->config->get('calendar_event_coloring', $this->defaults['calendar_event_coloring'])), ); } @@ -511,7 +516,7 @@ class calendar extends rcube_plugin $p['blocks']['view']['options']['alarmtype'] = array( 'title' => html::label($field_id, rcube::Q($this->gettext('defaultalarmtype'))), - 'content' => $alarm_type . ' ' . $alarm_offset, + 'content' => html::div('input-group', $alarm_type . ' ' . $alarm_offset), ); } @@ -521,19 +526,38 @@ class calendar extends rcube_plugin return $p; } // default calendar selection - $field_id = 'rcmfd_default_calendar'; + $field_id = 'rcmfd_default_calendar'; + $filter = calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_ACTIVE | calendar_driver::FILTER_INSERTABLE; $select_cal = new html_select(array('name' => '_default_calendar', 'id' => $field_id, 'is_escaped' => true)); - foreach ((array)$this->driver->list_calendars(calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_ACTIVE) as $id => $prop) { + foreach ((array)$this->driver->list_calendars($filter) as $id => $prop) { $select_cal->add($prop['name'], strval($id)); if ($prop['default']) $default_calendar = $id; } $p['blocks']['view']['options']['defaultcalendar'] = array( - 'title' => html::label($field_id . 'value', rcube::Q($this->gettext('defaultcalendar'))), + 'title' => html::label($field_id, rcube::Q($this->gettext('defaultcalendar'))), 'content' => $select_cal->show($this->rc->config->get('calendar_default_calendar', $default_calendar)), ); } + if (!isset($no_override['calendar_show_weekno'])) { + if (!$p['current']) { + $p['blocks']['view']['content'] = true; + return $p; + } + + $field_id = 'rcmfd_show_weekno'; + $select = new html_select(array('name' => '_show_weekno', 'id' => $field_id)); + $select->add($this->gettext('weeknonone'), -1); + $select->add($this->gettext('weeknodatepicker'), 0); + $select->add($this->gettext('weeknoall'), 1); + + $p['blocks']['view']['options']['show_weekno'] = array( + 'title' => html::label($field_id, rcube::Q($this->gettext('showweekno'))), + 'content' => $select->show(intval($this->rc->config->get('calendar_show_weekno'))), + ); + } + $p['blocks']['itip']['name'] = $this->gettext('itipoptions'); // Invitations handling @@ -570,7 +594,7 @@ class calendar extends rcube_plugin $p['blocks']['itip']['options']['after_action'] = array( 'title' => html::label($field_id, rcube::Q($this->gettext('afteraction'))), - 'content' => $select->show($val) . $folders->show($folder), + 'content' => html::div('input-group input-group-combo', $select->show($val) . $folders->show($folder)), ); } @@ -588,11 +612,17 @@ class calendar extends rcube_plugin foreach ($categories as $name => $color) { $key = md5($name); $field_class = 'rcmfd_category_' . str_replace(' ', '_', $name); - $category_remove = new html_inputfield(array('type' => 'button', 'value' => 'X', 'class' => 'button', 'onclick' => '$(this).parent().remove()', 'title' => $this->gettext('remove_category'))); + $category_remove = html::span('input-group-append', html::a(array( + 'class' => 'button icon delete input-group-text', + 'onclick' => '$(this).parent().parent().remove()', + 'title' => $this->gettext('remove_category'), + 'href' => '#rcmfd_new_category', + ), html::span('inner', $this->gettext('delete')) + )); $category_name = new html_inputfield(array('name' => "_categories[$key]", 'class' => $field_class, 'size' => 30, 'disabled' => $this->driver->categoriesimmutable)); $category_color = new html_inputfield(array('name' => "_colors[$key]", 'class' => "$field_class colors", 'size' => 6)); $hidden = $this->driver->categoriesimmutable ? html::tag('input', array('type' => 'hidden', 'name' => "_categories[$key]", 'value' => $name)) : ''; - $categories_list .= html::div(null, $hidden . $category_name->show($name) . ' ' . $category_color->show($color) . ' ' . $category_remove->show()); + $categories_list .= $hidden . html::div('input-group', $category_name->show($name) . $category_color->show($color) . $category_remove); } $p['blocks']['categories']['options']['category_' . $name] = array( @@ -601,24 +631,37 @@ class calendar extends rcube_plugin $field_id = 'rcmfd_new_category'; $new_category = new html_inputfield(array('name' => '_new_category', 'id' => $field_id, 'size' => 30)); - $add_category = new html_inputfield(array('type' => 'button', 'class' => 'button', 'value' => $this->gettext('add_category'), 'onclick' => "rcube_calendar_add_category()")); + $add_category = html::span('input-group-append', html::a(array( + 'type' => 'button', + 'class' => 'button create input-group-text', + 'title' => $this->gettext('add_category'), + 'onclick' => 'rcube_calendar_add_category()', + 'href' => '#rcmfd_new_category', + ), html::span('inner', $this->gettext('add_category')) + )); $p['blocks']['categories']['options']['categories'] = array( - 'content' => $new_category->show('') . ' ' . $add_category->show(), + 'content' => html::div('input-group', $new_category->show('') . $add_category), ); - $this->rc->output->add_script('function rcube_calendar_add_category(){ + $this->rc->output->add_label('delete', 'calendar.remove_category'); + $this->rc->output->add_script('function rcube_calendar_add_category() { var name = $("#rcmfd_new_category").val(); if (name.length) { - var input = $("").attr("type", "text").attr("name", "_categories[]").attr("size", 30).val(name); - var color = $("").attr("type", "text").attr("name", "_colors[]").attr("size", 6).addClass("colors").val("000000"); - var button = $("").attr("type", "button").attr("value", "X").addClass("button").click(function(){ $(this).parent().remove() }); - $("
").append(input).append(" ").append(color).append(" ").append(button).appendTo("#calendarcategories"); - color.miniColors({ colorValues:(rcmail.env.mscolors || []) }); + var button_label = rcmail.gettext("calendar.remove_category"); + var input = $("").attr({type: "text", name: "_categories[]", size: 30, "class": "form-control"}).val(name); + var color = $("").attr({type: "text", name: "_colors[]", size: 6, "class": "colors form-control"}).val("000000"); + var button = $("").attr({"class": "button icon delete input-group-text", title: button_label, href: "#rcmfd_new_category"}) + .click(function() { $(this).parent().parent().remove(); }) + .append($("").addClass("inner").text(rcmail.gettext("delete"))); + + $("
").addClass("input-group").append(input).append(color).append($("").append(button)) + .appendTo("#calendarcategories"); + color.minicolors(rcmail.env.minicolors_config || {}); $("#rcmfd_new_category").val(""); } - }'); + }', 'foot'); - $this->rc->output->add_script('$("#rcmfd_new_category").keypress(function(event){ + $this->rc->output->add_script('$("#rcmfd_new_category").keypress(function(event) { if (event.which == 13) { rcube_calendar_add_category(); event.preventDefault(); @@ -656,12 +699,12 @@ class calendar extends rcube_plugin $checkbox = new html_checkbox(array('name' => '_birthday_adressbooks[]') + $input_attrib); foreach ($this->rc->get_address_sources(false, true) as $source) { $active = in_array($source['id'], (array)$this->rc->config->get('calendar_birthday_adressbooks', array())) ? $source['id'] : ''; - $sources[] = html::label(null, $checkbox->show($active, array('value' => $source['id'])) . ' ' . rcube::Q($source['realname'] ?: $source['name'])); + $sources[] = html::tag('li', null, html::label(null, $checkbox->show($active, array('value' => $source['id'])) . rcube::Q($source['realname'] ?: $source['name']))); } $p['blocks']['birthdays']['options']['birthday_adressbooks'] = array( 'title' => rcube::Q($this->gettext('birthdayscalendarsources')), - 'content' => join(html::br(), $sources), + 'content' => html::tag('ul', 'proplist', implode("\n", $sources)), ); $field_id = 'rcmfd_birthdays_alarm'; @@ -676,10 +719,12 @@ class calendar extends rcube_plugin foreach (array('-M','-H','-D') as $trigger) $select_offset->add($this->rc->gettext('trigger' . $trigger, 'libcalendaring'), $trigger); - $preset = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_birthdays_alarm_offset', '-1D')); + $preset = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_birthdays_alarm_offset', '-1D')); + $preset_type = $this->rc->config->get('calendar_birthdays_alarm_type', ''); + $p['blocks']['birthdays']['options']['birthdays_alarmoffset'] = array( - 'title' => html::label($field_id . 'value', rcube::Q($this->gettext('showalarms'))), - 'content' => $select_type->show($this->rc->config->get('calendar_birthdays_alarm_type', '')) . ' ' . $input_value->show($preset[0]) . ' ' . $select_offset->show($preset[1]), + 'title' => html::label($field_id, rcube::Q($this->gettext('showalarms'))), + 'content' => html::div('input-group', $select_type->show($preset_type) . $input_value->show($preset[0]) . ' ' . $select_offset->show($preset[1])), ); } @@ -714,6 +759,7 @@ class calendar extends rcube_plugin 'calendar_first_hour' => intval(rcube_utils::get_input_value('_first_hour', rcube_utils::INPUT_POST)), 'calendar_work_start' => intval(rcube_utils::get_input_value('_work_start', rcube_utils::INPUT_POST)), 'calendar_work_end' => intval(rcube_utils::get_input_value('_work_end', rcube_utils::INPUT_POST)), + 'calendar_show_weekno' => intval(rcube_utils::get_input_value('_show_weekno', rcube_utils::INPUT_POST)), 'calendar_event_coloring' => intval(rcube_utils::get_input_value('_event_coloring', rcube_utils::INPUT_POST)), 'calendar_default_alarm_type' => rcube_utils::get_input_value('_alarm_type', rcube_utils::INPUT_POST), 'calendar_default_alarm_offset' => $default_alarm, @@ -742,6 +788,10 @@ class calendar extends rcube_plugin $colors = (array) rcube_utils::get_input_value('_colors', rcube_utils::INPUT_POST); foreach ($categories as $key => $name) { + if (!isset($colors[$key])) { + continue; + } + $color = preg_replace('/^#/', '', strval($colors[$key])); // rename categories in existing events -> driver's job @@ -839,12 +889,12 @@ class calendar extends rcube_plugin } // report more results available if ($this->driver->search_more_results) - $this->rc->output->show_message('autocompletemore', 'info'); + $this->rc->output->show_message('autocompletemore', 'notice'); $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC)); return; } - + if ($success) $this->rc->output->show_message('successfullysaved', 'confirmation'); else { @@ -868,10 +918,6 @@ class calendar extends rcube_plugin $event = rcube_utils::get_input_value('e', rcube_utils::INPUT_POST, true); $success = $reload = $got_msg = false; - // force notify if hidden + active - if ((int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']) === 1) - $event['_notify'] = 1; - // read old event data in order to find changes if (($event['_notify'] || $event['_decline']) && $action != 'new') { $old = $this->driver->get_event($event); @@ -933,8 +979,7 @@ class calendar extends rcube_plugin case "remove": // remove previous deletes $undo_time = $this->driver->undelete ? $this->rc->config->get('undo_timeout', 0) : 0; - $this->rc->session->remove('calendar_event_undo'); - + // search for event if only UID is given if (!isset($event['calendar']) && $event['uid']) { if (!($event = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE))) { @@ -943,11 +988,12 @@ class calendar extends rcube_plugin $undo_time = 0; } + // Note: the driver is responsible for setting $_SESSION['calendar_event_undo'] + // containing 'ts' and 'data' elements $success = $this->driver->remove_event($event, $undo_time < 1); $reload = (!$success || $event['_savemode']) ? 2 : 1; if ($undo_time > 0 && $success) { - $_SESSION['calendar_event_undo'] = array('ts' => time(), 'data' => $event); // display message with Undo link. $msg = html::span(null, $this->gettext('successremoval')) . ' ' . html::a(array('onclick' => sprintf("%s.http_request('event', 'action=undo', %s.display_message('', 'loading'))", @@ -1001,16 +1047,14 @@ class calendar extends rcube_plugin case "undo": // Restore deleted event - $event = $_SESSION['calendar_event_undo']['data']; - - if ($event) + if ($event = $_SESSION['calendar_event_undo']['data']) $success = $this->driver->restore_event($event); if ($success) { $this->rc->session->remove('calendar_event_undo'); $this->rc->output->show_message('calendar.successrestore', 'confirmation'); $got_msg = true; - $reload = 2; + $reload = 2; } break; @@ -1190,10 +1234,10 @@ class calendar extends rcube_plugin } // unlock client - $this->rc->output->command('plugin.unlock_saving'); + $this->rc->output->command('plugin.unlock_saving', $success); // update event object on the client or trigger a complete refresh if too complicated - if ($reload) { + if ($reload && empty($_REQUEST['_framed'])) { $args = array('source' => $event['calendar']); if ($reload > 1) $args['refetch'] = true; @@ -1269,12 +1313,21 @@ class calendar extends rcube_plugin */ function load_events() { - $events = $this->driver->load_events( - rcube_utils::get_input_value('start', rcube_utils::INPUT_GET), - rcube_utils::get_input_value('end', rcube_utils::INPUT_GET), - ($query = rcube_utils::get_input_value('q', rcube_utils::INPUT_GET)), - rcube_utils::get_input_value('source', rcube_utils::INPUT_GET) - ); + $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GET); + $end = rcube_utils::get_input_value('end', rcube_utils::INPUT_GET); + $query = rcube_utils::get_input_value('q', rcube_utils::INPUT_GET); + $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GET); + + if (!is_numeric($start) || strpos($start, 'T')) { + $start = new DateTime($start, $this->timezone); + $start = $start->getTimestamp(); + } + if (!is_numeric($end) || strpos($end, 'T')) { + $end = new DateTime($end, $this->timezone); + $end = $end->getTimestamp(); + } + + $events = $this->driver->load_events($start, $end, $query, $source); echo $this->encode($events, !empty($query)); exit; } @@ -1308,7 +1361,7 @@ class calendar extends rcube_plugin public function itip_events($msgref) { $path = explode('/', $msgref); - $msg = array_pop($path); + $msg = array_pop($path); $mbox = join('/', $path); list($uid, $mime_id) = explode('#', $msg); $events = array(); @@ -1324,23 +1377,27 @@ class calendar extends rcube_plugin } } */ - $event['id'] = $event['uid']; + $event['id'] = $event['uid']; $event['temporary'] = true; - $event['readonly'] = true; - $event['calendar'] = '--invitation--itip'; + $event['readonly'] = true; + $event['calendar'] = '--invitation--itip'; $event['className'] = 'fc-invitation-' . strtolower($partstat); - $event['_mbox'] = $mbox; - $event['_uid'] = $uid; - $event['_part'] = $mime_id; + $event['_mbox'] = $mbox; + $event['_uid'] = $uid; + $event['_part'] = $mime_id; $events[] = $this->_client_event($event, true); // add recurring instances if (!empty($event['recurrence'])) { - foreach ($this->driver->get_recurring_events($event, $event['start']) as $recurring) { + // Some installations can't handle all occurrences (aborting the request w/o an error in log) + $end = clone $event['start']; + $end->add(new DateInterval($event['recurrence']['FREQ'] == 'DAILY' ? 'P1Y' : 'P10Y')); + + foreach ($this->driver->get_recurring_events($event, $event['start'], $end) as $recurring) { $recurring['temporary'] = true; - $recurring['readonly'] = true; - $recurring['calendar'] = '--invitation--itip'; + $recurring['readonly'] = true; + $recurring['calendar'] = '--invitation--itip'; $events[] = $this->_client_event($recurring, true); } } @@ -1711,22 +1768,25 @@ class calendar extends rcube_plugin $settings = array(); // configuration + $settings['default_view'] = (string) $this->rc->config->get('calendar_default_view', $this->defaults['calendar_default_view']); + $settings['timeslots'] = (int) $this->rc->config->get('calendar_timeslots', $this->defaults['calendar_timeslots']); + $settings['first_day'] = (int) $this->rc->config->get('calendar_first_day', $this->defaults['calendar_first_day']); + $settings['first_hour'] = (int) $this->rc->config->get('calendar_first_hour', $this->defaults['calendar_first_hour']); + $settings['work_start'] = (int) $this->rc->config->get('calendar_work_start', $this->defaults['calendar_work_start']); + $settings['work_end'] = (int) $this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']); + $settings['agenda_range'] = (int) $this->rc->config->get('calendar_agenda_range', $this->defaults['calendar_agenda_range']); + $settings['event_coloring'] = (int) $this->rc->config->get('calendar_event_coloring', $this->defaults['calendar_event_coloring']); + $settings['time_indicator'] = (int) $this->rc->config->get('calendar_time_indicator', $this->defaults['calendar_time_indicator']); + $settings['invite_shared'] = (int) $this->rc->config->get('calendar_allow_invite_shared', $this->defaults['calendar_allow_invite_shared']); + $settings['itip_notify'] = (int) $this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']); + $settings['show_weekno'] = (int) $this->rc->config->get('calendar_show_weekno', $this->defaults['calendar_show_weekno']); $settings['default_calendar'] = $this->rc->config->get('calendar_default_calendar'); - $settings['default_view'] = (string)$this->rc->config->get('calendar_default_view', $this->defaults['calendar_default_view']); - $settings['date_agenda'] = (string)$this->rc->config->get('calendar_date_agenda', $this->defaults['calendar_date_agenda']); + $settings['invitation_calendars'] = (bool) $this->rc->config->get('kolab_invitation_calendars', false); - $settings['timeslots'] = (int)$this->rc->config->get('calendar_timeslots', $this->defaults['calendar_timeslots']); - $settings['first_day'] = (int)$this->rc->config->get('calendar_first_day', $this->defaults['calendar_first_day']); - $settings['first_hour'] = (int)$this->rc->config->get('calendar_first_hour', $this->defaults['calendar_first_hour']); - $settings['work_start'] = (int)$this->rc->config->get('calendar_work_start', $this->defaults['calendar_work_start']); - $settings['work_end'] = (int)$this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']); - $settings['agenda_range'] = (int)$this->rc->config->get('calendar_agenda_range', $this->defaults['calendar_agenda_range']); - $settings['agenda_sections'] = $this->rc->config->get('calendar_agenda_sections', $this->defaults['calendar_agenda_sections']); - $settings['event_coloring'] = (int)$this->rc->config->get('calendar_event_coloring', $this->defaults['calendar_event_coloring']); - $settings['time_indicator'] = (int)$this->rc->config->get('calendar_time_indicator', $this->defaults['calendar_time_indicator']); - $settings['invite_shared'] = (int)$this->rc->config->get('calendar_allow_invite_shared', $this->defaults['calendar_allow_invite_shared']); - $settings['invitation_calendars'] = (bool)$this->rc->config->get('kolab_invitation_calendars', false); - $settings['itip_notify'] = (int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']); + // 'table' view has been replaced by 'list' view + if ($settings['default_view'] == 'table') { + $settings['default_view'] = 'list'; + } // get user identity to create default attendee if ($this->ui->screen == 'calendar') { @@ -1834,24 +1894,32 @@ class calendar extends rcube_plugin $event['description'] = trim($h2t->get_text()); } - // mapping url => vurl because of the fullcalendar client script + // mapping url => vurl, allday => allDay because of the fullcalendar client script $event['vurl'] = $event['url']; + $event['allDay'] = !empty($event['allday']); unset($event['url']); + unset($event['allday']); + + $event['className'] = $event['className'] ? explode(' ', $event['className']) : array(); + + if ($event['allDay']) { + $event['end'] = $event['end']->add(new DateInterval('P1D')); + } + + if ($_GET['mode'] == 'print') { + $event['editable'] = false; + } return array( '_id' => $event['calendar'] . ':' . $event['id'], // unique identifier for fullcalendar - 'start' => $this->lib->adjust_timezone($event['start'], $event['allday'])->format('c'), - 'end' => $this->lib->adjust_timezone($event['end'], $event['allday'])->format('c'), + 'start' => $this->lib->adjust_timezone($event['start'], $event['allDay'])->format('c'), + 'end' => $this->lib->adjust_timezone($event['end'], $event['allDay'])->format('c'), // 'changed' might be empty for event recurrences (Bug #2185) 'changed' => $event['changed'] ? $this->lib->adjust_timezone($event['changed'])->format('c') : null, 'created' => $event['created'] ? $this->lib->adjust_timezone($event['created'])->format('c') : null, 'title' => strval($event['title']), 'description' => strval($event['description']), 'location' => strval($event['location']), - 'className' => ($addcss ? 'fc-event-cal-'.asciiwords($event['calendar'], true).' ' : '') . - 'fc-event-cat-' . asciiwords(strtolower(join('-', (array)$event['categories'])), true) . - rtrim(' ' . $event['className']), - 'allDay' => ($event['allday'] == 1), ) + $event; } @@ -1926,7 +1994,8 @@ class calendar extends rcube_plugin */ public function attachment_upload() { - $this->lib->attachment_upload(self::SESSION_KEY, 'cal-'); + $handler = new kolab_attachments_handler(); + $handler->attachment_upload(self::SESSION_KEY, 'cal-'); } /** @@ -1934,9 +2003,11 @@ class calendar extends rcube_plugin */ public function attachment_get() { + $handler = new kolab_attachments_handler(); + // show loading page if (!empty($_GET['_preload'])) { - return $this->lib->attachment_loading_page(); + return $handler->attachment_loading_page(); } $event_id = rcube_utils::get_input_value('_event', rcube_utils::INPUT_GPC); @@ -1961,10 +2032,7 @@ class calendar extends rcube_plugin // show part page if (!empty($_GET['_frame'])) { - $this->lib->attachment = $attachment; - $this->register_handler('plugin.attachmentframe', array($this->lib, 'attachment_frame')); - $this->register_handler('plugin.attachmentcontrols', array($this->lib, 'attachment_header')); - $this->rc->output->send('calendar.attachment'); + $handler->attachment_page($attachment); } // deliver attachment content else if ($attachment) { @@ -1972,7 +2040,7 @@ class calendar extends rcube_plugin $attachment['body'] = $this->driver->get_attachment_body($id, $event); } - $this->lib->attachment_get($attachment); + $handler->attachment_get($attachment); } // if we arrive here, the requested part was not found @@ -1994,10 +2062,15 @@ class calendar extends rcube_plugin */ private function write_preprocess(&$event, $action) { + // Remove double timezone specification (T2313) + $event['start'] = preg_replace('/\s*\(.*\)/', '', $event['start']); + $event['end'] = preg_replace('/\s*\(.*\)/', '', $event['end']); + // convert dates into DateTime objects in user's current timezone $event['start'] = new DateTime($event['start'], $this->timezone); $event['end'] = new DateTime($event['end'], $this->timezone); - $event['allday'] = (bool)$event['allday']; + $event['allday'] = !empty($event['allDay']); + unset($event['allDay']); // start/end is all we need for 'move' action (#1480) if ($action == 'move') { @@ -2351,10 +2424,10 @@ class calendar extends rcube_plugin $title = $this->gettext('print'); $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC); - if (!in_array($view, array('agendaWeek', 'agendaDay', 'month', 'table'))) + if (!in_array($view, array('agendaWeek', 'agendaDay', 'month', 'list'))) $view = 'agendaDay'; - $this->rc->output->set_env('view',$view); + $this->rc->output->set_env('view', $view); if ($date = rcube_utils::get_input_value('date', rcube_utils::INPUT_GPC)) $this->rc->output->set_env('date', $date); @@ -2362,52 +2435,19 @@ class calendar extends rcube_plugin if ($range = rcube_utils::get_input_value('range', rcube_utils::INPUT_GPC)) $this->rc->output->set_env('listRange', intval($range)); - if (isset($_REQUEST['sections'])) - $this->rc->output->set_env('listSections', rcube_utils::get_input_value('sections', rcube_utils::INPUT_GPC)); - if ($search = rcube_utils::get_input_value('search', rcube_utils::INPUT_GPC)) { $this->rc->output->set_env('search', $search); $title .= ' "' . $search . '"'; } - // Add CSS stylesheets to the page header - $skin_path = $this->local_skin_path(); - $this->include_stylesheet($skin_path . '/fullcalendar.css'); - $this->include_stylesheet($skin_path . '/print.css'); - - // Add JS files to the page header - $this->include_script('print.js'); - $this->include_script('lib/js/fullcalendar.js'); - + // Add JS to the page + $this->ui->addJS(); + $this->register_handler('plugin.calendar_css', array($this->ui, 'calendar_css')); $this->register_handler('plugin.calendar_list', array($this->ui, 'calendar_list')); - - $this->rc->output->set_pagetitle($title); - $this->rc->output->send("calendar.print"); - } - /** - * - */ - public function get_inline_ui() - { - foreach (array('save','cancel','savingdata') as $label) - $texts['calendar.'.$label] = $this->gettext($label); - - $texts['calendar.new_event'] = $this->gettext('createfrommail'); - - $this->ui->init_templates(); - $this->ui->calendar_list(); # set env['calendars'] - echo $this->api->output->parse('calendar.eventedit', false, false); - echo html::tag('script', array('type' => 'text/javascript'), - "rcmail.set_env('calendars', " . rcube_output::json_serialize($this->api->output->env['calendars']) . ");\n". - "rcmail.set_env('deleteicon', '" . $this->api->output->env['deleteicon'] . "');\n". - "rcmail.set_env('cancelicon', '" . $this->api->output->env['cancelicon'] . "');\n". - "rcmail.set_env('loadingicon', '" . $this->api->output->env['loadingicon'] . "');\n". - "rcmail.gui_object('attachmentlist', '" . $this->ui->attachmentlist_id . "');\n". - "rcmail.add_label(" . rcube_output::json_serialize($texts) . ");\n" - ); - exit; + $this->rc->output->set_pagetitle($title); + $this->rc->output->send('calendar.print'); } /** @@ -2419,17 +2459,20 @@ class calendar extends rcube_plugin */ public static function event_diff($a, $b) { - $diff = array(); + $diff = array(); $ignore = array('changed' => 1, 'attachments' => 1); + foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $key) { - if (!$ignore[$key] && $key[0] != '_' && $a[$key] != $b[$key]) + if (!$ignore[$key] && $key[0] != '_' && $a[$key] != $b[$key]) { $diff[] = $key; + } } - + // only compare number of attachments - if (count($a['attachments']) != count($b['attachments'])) + if (count((array) $a['attachments']) != count((array) $b['attachments'])) { $diff[] = 'attachments'; - + } + return $diff; } @@ -2610,8 +2653,13 @@ class calendar extends rcube_plugin && !$data['nosave'] && ($response['action'] == 'rsvp' || $response['action'] == 'import') ) { - $calendars = $this->driver->list_calendars($mode); - $calendar_select = new html_select(array('name' => 'calendar', 'id' => 'itip-saveto', 'is_escaped' => true)); + $calendars = $this->driver->list_calendars($mode); + $calendar_select = new html_select(array( + 'name' => 'calendar', + 'id' => 'itip-saveto', + 'is_escaped' => true, + 'class' => 'form-control custom-select' + )); $calendar_select->add('--', ''); $numcals = 0; foreach ($calendars as $calendar) { @@ -2636,8 +2684,8 @@ class calendar extends rcube_plugin // render small agenda view for the respective day if ($data['method'] == 'REQUEST' && !empty($data['date']) && $response['action'] == 'rsvp') { $event_start = rcube_utils::anytodatetime($data['date']); - $day_start = new Datetime(gmdate('Y-m-d 00:00', $data['date']), $this->lib->timezone); - $day_end = new Datetime(gmdate('Y-m-d 23:59', $data['date']), $this->lib->timezone); + $day_start = new Datetime(gmdate('Y-m-d 00:00', $data['date']), $this->lib->timezone); + $day_end = new Datetime(gmdate('Y-m-d 23:59', $data['date']), $this->lib->timezone); // get events on that day from the user's personal calendars $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL); @@ -2647,9 +2695,15 @@ class calendar extends rcube_plugin $before = $after = array(); foreach ($events as $event) { // TODO: skip events with free_busy == 'free' ? - if ($event['uid'] == $data['uid'] || $event['end'] < $day_start || $event['start'] > $day_end) + if ($event['uid'] == $data['uid'] + || $event['end'] < $day_start || $event['start'] > $day_end + || $event['status'] == 'CANCELLED' + || (!empty($event['className']) && strpos($event['className'], 'declined') !== false) + ) { continue; - else if ($event['start'] < $event_start) + } + + if ($event['start'] < $event_start) $before[] = $this->mail_agenda_event_row($event); else $after[] = $this->mail_agenda_event_row($event); @@ -2817,7 +2871,7 @@ class calendar extends rcube_plugin $this->rc->format_date($event['start'], $this->rc->config->get('time_format')) . ' - ' . $this->rc->format_date($event['end'], $this->rc->config->get('time_format')); - return html::div(rtrim('event-row ' . $class), + return html::div(rtrim('event-row ' . ($class ?: $event['className'])), html::span('event-date', $time) . html::span('event-title', rcube::Q($event['title'])) ); @@ -2837,7 +2891,6 @@ class calendar extends rcube_plugin } else if (in_array($header->ctype, array('multipart/alternative', 'multipart/mixed'))) { // TODO: fetch bodystructure and search for ical parts. Maybe too expensive? - if (!empty($header->structure) && is_array($header->structure->parts)) { foreach ($header->structure->parts as $part) { if (libcalendaring::part_is_vcalendar($part) && !empty($part->ctype_parameters['method'])) { @@ -2875,24 +2928,25 @@ class calendar extends rcube_plugin // get prepared inline UI for this event object if ($ical_objects->method) { - $append = ''; + $append = ''; + $date_str = $this->rc->format_date($event['start'], $this->rc->config->get('date_format'), empty($event['start']->_dateonly)); + $date = new DateTime($event['start']->format('Y-m-d') . ' 12:00:00', new DateTimeZone('UTC')); // prepare a small agenda preview to be filled with actual event data on async request if ($ical_objects->method == 'REQUEST') { $append = html::div('calendar-agenda-preview', - html::tag('h3', 'preview-title', $this->gettext('agenda') . ' ' . - html::span('date', $this->rc->format_date($event['start'], $this->rc->config->get('date_format'))) - ) . '%before%' . $this->mail_agenda_event_row($event, 'current') . '%after%'); + html::tag('h3', 'preview-title', $this->gettext('agenda') . ' ' . html::span('date', $date_str)) + . '%before%' . $this->mail_agenda_event_row($event, 'current') . '%after%'); } - $html .= html::div('calendar-invitebox', + $html .= html::div('calendar-invitebox invitebox boxinformation', $this->itip->mail_itip_inline_ui( $event, $ical_objects->method, $ical_objects->mime_id . ':' . $idx, 'calendar', rcube_utils::anytodatetime($ical_objects->message_date), - $this->rc->url(array('task' => 'calendar')) . '&view=agendaDay&date=' . $event['start']->format('U') + $this->rc->url(array('task' => 'calendar')) . '&view=agendaDay&date=' . $date->format('U') ) . $append ); } @@ -2917,7 +2971,7 @@ class calendar extends rcube_plugin 'type' => 'link', 'wrapper' => 'li', 'command' => 'attachment-save-calendar', - 'class' => 'icon calendarlink', + 'class' => 'icon calendarlink disabled', 'classact' => 'icon calendarlink active', 'innerclass' => 'icon calendar', 'label' => 'calendar.savetocalendar', @@ -2996,13 +3050,13 @@ class calendar extends rcube_plugin $calendar = $this->get_default_calendar($event['sensitivity'], $calendars); $metadata = array( - 'uid' => $event['uid'], + 'uid' => $event['uid'], '_instance' => $event['_instance'], - 'changed' => is_object($event['changed']) ? $event['changed']->format('U') : 0, - 'sequence' => intval($event['sequence']), - 'fallback' => strtoupper($status), - 'method' => $event['_method'], - 'task' => 'calendar', + 'changed' => is_object($event['changed']) ? $event['changed']->format('U') : 0, + 'sequence' => intval($event['sequence']), + 'fallback' => strtoupper($status), + 'method' => $event['_method'], + 'task' => 'calendar', ); // update my attendee status according to submitted method @@ -3029,9 +3083,9 @@ class calendar extends rcube_plugin if (!$reply_sender) { $sender_identity = $this->rc->user->list_emails(true); $event['attendees'][] = array( - 'name' => $sender_identity['name'], - 'email' => $sender_identity['email'], - 'role' => 'OPT-PARTICIPANT', + 'name' => $sender_identity['name'], + 'email' => $sender_identity['email'], + 'role' => 'OPT-PARTICIPANT', 'status' => strtoupper($status), ); $metadata['attendee'] = $sender_identity['email']; @@ -3057,23 +3111,27 @@ class calendar extends rcube_plugin // only update attendee status if ($event['_method'] == 'REPLY') { // try to identify the attendee using the email sender address - $existing_attendee = -1; + $existing_attendee = -1; $existing_attendee_emails = array(); + foreach ($existing['attendees'] as $i => $attendee) { $existing_attendee_emails[] = $attendee['email']; if ($this->itip->compare_email($attendee['email'], $event['_sender'], $event['_sender_utf'])) { $existing_attendee = $i; } } - $event_attendee = null; + + $event_attendee = null; $update_attendees = array(); + foreach ($event['attendees'] as $attendee) { if ($this->itip->compare_email($attendee['email'], $event['_sender'], $event['_sender_utf'])) { - $event_attendee = $attendee; - $update_attendees[] = $attendee; + $event_attendee = $attendee; + $update_attendees[] = $attendee; $metadata['fallback'] = $attendee['status']; $metadata['attendee'] = $attendee['email']; - $metadata['rsvp'] = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT'; + $metadata['rsvp'] = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT'; + if ($attendee['status'] != 'DELEGATED') { break; } @@ -3099,6 +3157,23 @@ class calendar extends rcube_plugin } } + // Accept sender as a new participant (different email in From: and the iTip) + // Use ATTENDEE entry from the iTip with replaced email address + if (!$event_attendee) { + // remove the organizer + $itip_attendees = array_filter($event['attendees'], function($item) { return $item['role'] != 'ORGANIZER'; }); + + // there must be only one attendee + if (is_array($itip_attendees) && count($itip_attendees) == 1) { + $event_attendee = $itip_attendees[key($itip_attendees)]; + $event_attendee['email'] = $event['_sender']; + $update_attendees[] = $event_attendee; + $metadata['fallback'] = $event_attendee['status']; + $metadata['attendee'] = $event_attendee['email']; + $metadata['rsvp'] = $event_attendee['rsvp'] || $event_attendee['role'] != 'NON-PARTICIPANT'; + } + } + // found matching attendee entry in both existing and new events if ($existing_attendee >= 0 && $event_attendee) { $existing['attendees'][$existing_attendee] = $event_attendee; @@ -3109,6 +3184,9 @@ class calendar extends rcube_plugin $existing['attendees'][] = $event_attendee; $success = $this->driver->update_attendees($existing, $update_attendees); } + else if (!$event_attendee) { + $error_msg = $this->gettext('errorunknownattendee'); + } else { $error_msg = $this->gettext('newerversionexists'); } @@ -3340,17 +3418,21 @@ class calendar extends rcube_plugin */ public function mail_message2event() { - $uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST); - $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST); + $this->ui->init(); + $this->ui->addJS(); + $this->ui->init_templates(); + $this->ui->calendar_list(array(), true); // set env['calendars'] + + $uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET); + $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET); $event = array(); // establish imap connection - $imap = $this->rc->get_storage(); - $imap->set_folder($mbox); - $message = new rcube_message($uid); + $imap = $this->rc->get_storage(); + $message = new rcube_message($uid, $mbox); if ($message->headers) { - $event['title'] = trim($message->subject); + $event['title'] = trim($message->subject); $event['description'] = trim($message->first_text_part()); $this->load_driver(); @@ -3392,14 +3474,14 @@ class calendar extends rcube_plugin } } } - - $this->rc->output->command('plugin.mail2event_dialog', $event); + + $this->rc->output->set_env('event_prop', $event); } else { $this->rc->output->command('display_message', $this->gettext('messageopenerror'), 'error'); } - - $this->rc->output->send(); + + $this->rc->output->send('calendar.dialog'); } /** diff --git a/calendar_base.js b/calendar_base.js index 3f00925..c089bbd 100644 --- a/calendar_base.js +++ b/calendar_base.js @@ -33,53 +33,40 @@ function rcube_calendar(settings) // extend base class rcube_libcalendaring.call(this, settings); - // member vars - this.ui_loaded = false; - this.selected_attachment = null; - - // private vars - var me = this; - // create new event from current mail message this.create_from_mail = function(uid) { - if (uid || (uid = rcmail.get_single_uid())) { - // load calendar UI (scripts and edit dialog template) - if (!this.ui_loaded) { - $.when( - $.getScript(rcmail.assets_path('plugins/calendar/calendar_ui.js')), - $.getScript(rcmail.assets_path('plugins/calendar/lib/js/fullcalendar.js')), - $.get(rcmail.url('calendar/inlineui'), function(html) { $(document.body).append(html); }, 'html') - ).then(function() { - // disable attendees feature (autocompletion and stuff is not initialized) - for (var c in rcmail.env.calendars) - rcmail.env.calendars[c].attendees = rcmail.env.calendars[c].resources = false; + if (!uid && !(uid = rcmail.get_single_uid())) { + return; + } - me.ui_loaded = true; - me.ui = new rcube_calendar_ui(me.settings); - me.create_from_mail(uid); // start over + var url = {_mbox: rcmail.env.mailbox, _uid: uid, _framed: 1}, + buttons = {}, + button_classes = ['mainaction save', 'cancel'], + title = rcmail.gettext('calendar.createfrommail'), + dialog = $('