From 517e9720d45408c6bbad59de587ca9a86a365b06 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Mon, 4 Aug 2014 16:17:45 +0200 Subject: [PATCH 1/4] Remove out-of-office option from UI accrding to #3220 --- plugins/calendar/lib/calendar_ui.php | 3 ++- plugins/calendar/skins/classic/templates/freebusylegend.html | 2 +- plugins/calendar/skins/larry/templates/freebusylegend.html | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php index 1ddb8848..291f365c 100644 --- a/plugins/calendar/lib/calendar_ui.php +++ b/plugins/calendar/lib/calendar_ui.php @@ -418,7 +418,8 @@ class calendar_ui $select = new html_select($attrib); $select->add($this->cal->gettext('free'), 'free'); $select->add($this->cal->gettext('busy'), 'busy'); - $select->add($this->cal->gettext('outofoffice'), 'outofoffice'); + // out-of-office is not supported by libkolabxml (#3220) + // $select->add($this->cal->gettext('outofoffice'), 'outofoffice'); $select->add($this->cal->gettext('tentative'), 'tentative'); return $select->show(null); } diff --git a/plugins/calendar/skins/classic/templates/freebusylegend.html b/plugins/calendar/skins/classic/templates/freebusylegend.html index 85a565c7..54807c24 100644 --- a/plugins/calendar/skins/classic/templates/freebusylegend.html +++ b/plugins/calendar/skins/classic/templates/freebusylegend.html @@ -2,6 +2,6 @@ - + diff --git a/plugins/calendar/skins/larry/templates/freebusylegend.html b/plugins/calendar/skins/larry/templates/freebusylegend.html index 45f627a4..440bb63b 100644 --- a/plugins/calendar/skins/larry/templates/freebusylegend.html +++ b/plugins/calendar/skins/larry/templates/freebusylegend.html @@ -2,6 +2,6 @@ - + From c4dec3203434800106735a38b49a5ce01f174930 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Mon, 4 Aug 2014 19:22:08 +0200 Subject: [PATCH 2/4] Fix method check after refactoring iTip message parsing --- plugins/calendar/calendar.php | 11 +++++------ plugins/tasklist/tasklist.php | 10 +++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php index a17cac02..be364992 100644 --- a/plugins/calendar/calendar.php +++ b/plugins/calendar/calendar.php @@ -2398,7 +2398,7 @@ class calendar extends rcube_plugin 'changed' => is_object($event['changed']) ? $event['changed']->format('U') : 0, 'sequence' => intval($event['sequence']), 'fallback' => strtoupper($status), - 'method' => $this->ical->method, + 'method' => $event['_method'], 'task' => 'calendar', ); @@ -2442,7 +2442,7 @@ class calendar extends rcube_plugin if ($existing) { // only update attendee status - if ($this->ical->method == 'REPLY') { + if ($$event['_method'] == 'REPLY') { // try to identify the attendee using the email sender address $existing_attendee = -1; foreach ($existing['attendees'] as $i => $attendee) { @@ -2502,7 +2502,7 @@ class calendar extends rcube_plugin } // set status=CANCELLED on CANCEL messages - if ($this->ical->method == 'CANCEL') + if ($event['_method'] == 'CANCEL') $event['status'] = 'CANCELLED'; // show me as free when declined (#1670) if ($status == 'declined' || $event['status'] == 'CANCELLED') @@ -2532,7 +2532,7 @@ class calendar extends rcube_plugin } if ($success) { - $message = $this->ical->method == 'REPLY' ? 'attendeupdateesuccess' : ($deleted ? 'successremoval' : ($existing ? 'updatedsuccessfully' : 'importedsuccessfully')); + $message = $event['_method'] == 'REPLY' ? 'attendeupdateesuccess' : ($deleted ? 'successremoval' : ($existing ? 'updatedsuccessfully' : 'importedsuccessfully')); $this->rc->output->command('display_message', $this->gettext(array('name' => $message, 'vars' => array('calendar' => $calendar['name']))), 'confirmation'); $metadata['rsvp'] = intval($metadata['rsvp']); @@ -2543,9 +2543,8 @@ class calendar extends rcube_plugin else if ($error_msg) $this->rc->output->command('display_message', $error_msg, 'error'); - // send iTip reply - if ($this->ical->method == 'REQUEST' && $organizer && !$noreply && !in_array(strtolower($organizer['email']), $emails) && !$error_msg) { + if ($event['_method'] == 'REQUEST' && $organizer && !$noreply && !in_array(strtolower($organizer['email']), $emails) && !$error_msg) { $event['comment'] = get_input_value('_comment', RCUBE_INPUT_POST); $itip = $this->load_itip(); $itip->set_sender_email($reply_sender); diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php index 6820384b..dfd8bd9b 100644 --- a/plugins/tasklist/tasklist.php +++ b/plugins/tasklist/tasklist.php @@ -1555,7 +1555,7 @@ class tasklist extends rcube_plugin 'changed' => is_object($task['changed']) ? $task['changed']->format('U') : 0, 'sequence' => intval($task['sequence']), 'fallback' => strtoupper($status), - 'method' => $this->ical->method, + 'method' => $task['_method'], 'task' => 'tasks', ); @@ -1599,7 +1599,7 @@ class tasklist extends rcube_plugin if ($existing) { // only update attendee status - if ($this->ical->method == 'REPLY') { + if ($task['_method'] == 'REPLY') { // try to identify the attendee using the email sender address $existing_attendee = -1; foreach ($existing['attendees'] as $i => $attendee) { @@ -1660,7 +1660,7 @@ class tasklist extends rcube_plugin } // set status=CANCELLED on CANCEL messages - if ($this->ical->method == 'CANCEL') { + if ($task['_method'] == 'CANCEL') { $task['status'] = 'CANCELLED'; } // show me as free when declined (#1670) @@ -1698,7 +1698,7 @@ class tasklist extends rcube_plugin } if ($success) { - $message = $this->ical->method == 'REPLY' ? 'attendeupdateesuccess' : ($deleted ? 'successremoval' : ($existing ? 'updatedsuccessfully' : 'importedsuccessfully')); + $message = $task['_method'] == 'REPLY' ? 'attendeupdateesuccess' : ($deleted ? 'successremoval' : ($existing ? 'updatedsuccessfully' : 'importedsuccessfully')); $this->rc->output->command('display_message', $this->gettext(array('name' => $message, 'vars' => array('list' => $list['name']))), 'confirmation'); $metadata['rsvp'] = intval($metadata['rsvp']); @@ -1712,7 +1712,7 @@ class tasklist extends rcube_plugin } // send iTip reply - if ($this->ical->method == 'REQUEST' && $organizer && !$noreply && !in_array(strtolower($organizer['email']), $emails) && !$error_msg) { + if ($task['_method'] == 'REQUEST' && $organizer && !$noreply && !in_array(strtolower($organizer['email']), $emails) && !$error_msg) { $task['comment'] = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST); $itip = $this->load_itip(); $itip->set_sender_email($reply_sender); From 23dfdba348a1597c41268d852b9c3d51a04edef8 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 5 Aug 2014 07:59:12 +0200 Subject: [PATCH 3/4] Fix typo in last commit --- plugins/calendar/calendar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php index be364992..cb5b5a3a 100644 --- a/plugins/calendar/calendar.php +++ b/plugins/calendar/calendar.php @@ -2442,7 +2442,7 @@ class calendar extends rcube_plugin if ($existing) { // only update attendee status - if ($$event['_method'] == 'REPLY') { + if ($event['_method'] == 'REPLY') { // try to identify the attendee using the email sender address $existing_attendee = -1; foreach ($existing['attendees'] as $i => $attendee) { From 934b0e4dc94ac1bc7f6cb2c0fd5b63d6f0cba1b2 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 5 Aug 2014 10:48:23 +0200 Subject: [PATCH 4/4] Fix setting ldap debug after Net_LDAP3 integration --- plugins/kolab_auth/kolab_auth_ldap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/kolab_auth/kolab_auth_ldap.php b/plugins/kolab_auth/kolab_auth_ldap.php index 40237ac3..9de58bcf 100644 --- a/plugins/kolab_auth/kolab_auth_ldap.php +++ b/plugins/kolab_auth/kolab_auth_ldap.php @@ -34,11 +34,11 @@ class kolab_auth_ldap extends rcube_ldap_generic { $rcmail = rcube::get_instance(); - $this->debug = (bool) $rcmail->config->get('ldap_debug'); $this->fieldmap = $p['fieldmap']; $this->fieldmap['uid'] = 'uid'; $p['attributes'] = array_values($this->fieldmap); + $p['debug'] = (bool) $rcmail->config->get('ldap_debug'); // Connect to the server (with bind) parent::__construct($p);