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

Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube

Browse source
This commit is contained in:
Aleksander Machniak 2014-08-05 05:34:05 -04:00
commit ea66a94dab
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/calendar/calendar.php
View file

@ -2398,7 +2398,7 @@ class calendar extends rcube_plugin
'changed' => is_object($event['changed']) ? $event['changed']->format('U') : 0, 'changed' => is_object($event['changed']) ? $event['changed']->format('U') : 0,
'sequence' => intval($event['sequence']), 'sequence' => intval($event['sequence']),
'fallback' => strtoupper($status), 'fallback' => strtoupper($status),
'method' => $this->ical->method, 'method' => $event['_method'],
'task' => 'calendar', 'task' => 'calendar',
); );
@ -2442,7 +2442,7 @@ class calendar extends rcube_plugin
if ($existing) { if ($existing) {
// only update attendee status // only update attendee status
if ($this->ical->method == 'REPLY') { if ($event['_method'] == 'REPLY') {
// try to identify the attendee using the email sender address // try to identify the attendee using the email sender address
$existing_attendee = -1; $existing_attendee = -1;
foreach ($existing['attendees'] as $i => $attendee) { foreach ($existing['attendees'] as $i => $attendee) {
@ -2502,7 +2502,7 @@ class calendar extends rcube_plugin
} }
// set status=CANCELLED on CANCEL messages // set status=CANCELLED on CANCEL messages
if ($this->ical->method == 'CANCEL') if ($event['_method'] == 'CANCEL')
$event['status'] = 'CANCELLED'; $event['status'] = 'CANCELLED';
// show me as free when declined (#1670) // show me as free when declined (#1670)
if ($status == 'declined' || $event['status'] == 'CANCELLED') if ($status == 'declined' || $event['status'] == 'CANCELLED')
@ -2532,7 +2532,7 @@ class calendar extends rcube_plugin
} }
if ($success) { 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'); $this->rc->output->command('display_message', $this->gettext(array('name' => $message, 'vars' => array('calendar' => $calendar['name']))), 'confirmation');
$metadata['rsvp'] = intval($metadata['rsvp']); $metadata['rsvp'] = intval($metadata['rsvp']);
@ -2543,9 +2543,8 @@ class calendar extends rcube_plugin
else if ($error_msg) else if ($error_msg)
$this->rc->output->command('display_message', $error_msg, 'error'); $this->rc->output->command('display_message', $error_msg, 'error');
// send iTip reply // 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); $event['comment'] = get_input_value('_comment', RCUBE_INPUT_POST);
$itip = $this->load_itip(); $itip = $this->load_itip();
$itip->set_sender_email($reply_sender); $itip->set_sender_email($reply_sender);

3
plugins/calendar/lib/calendar_ui.php
View file

@ -418,7 +418,8 @@ class calendar_ui
$select = new html_select($attrib); $select = new html_select($attrib);
$select->add($this->cal->gettext('free'), 'free'); $select->add($this->cal->gettext('free'), 'free');
$select->add($this->cal->gettext('busy'), 'busy'); $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'); $select->add($this->cal->gettext('tentative'), 'tentative');
return $select->show(null); return $select->show(null);
} }

2
plugins/calendar/skins/classic/templates/freebusylegend.html
View file

@ -2,6 +2,6 @@
<span class="legend"><img class="availabilityicon free" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availfree" /></span> <span class="legend"><img class="availabilityicon free" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availfree" /></span>
<span class="legend"><img class="availabilityicon busy" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availbusy" /></span> <span class="legend"><img class="availabilityicon busy" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availbusy" /></span>
<span class="legend"><img class="availabilityicon tentative" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availtentative" /></span> <span class="legend"><img class="availabilityicon tentative" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availtentative" /></span>
<span class="legend"><img class="availabilityicon out-of-office" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availoutofoffice" /></span> <!--<span class="legend"><img class="availabilityicon out-of-office" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availoutofoffice" /></span>-->
<span class="legend"><img class="availabilityicon unknown" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availunknown" /></span> <span class="legend"><img class="availabilityicon unknown" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availunknown" /></span>
</div> </div>

2
plugins/calendar/skins/larry/templates/freebusylegend.html
View file

@ -2,6 +2,6 @@
<span class="legend"><img class="availabilityicon free" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availfree" /></span> <span class="legend"><img class="availabilityicon free" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availfree" /></span>
<span class="legend"><img class="availabilityicon busy" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availbusy" /></span> <span class="legend"><img class="availabilityicon busy" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availbusy" /></span>
<span class="legend"><img class="availabilityicon tentative" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availtentative" /></span> <span class="legend"><img class="availabilityicon tentative" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availtentative" /></span>
<span class="legend"><img class="availabilityicon out-of-office" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availoutofoffice" /></span> <!--<span class="legend"><img class="availabilityicon out-of-office" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availoutofoffice" /></span>-->
<span class="legend"><img class="availabilityicon unknown" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availunknown" /></span> <span class="legend"><img class="availabilityicon unknown" src="./program/resources/blank.gif" /> <roundcube:label name="calendar.availunknown" /></span>
</div> </div>

2
plugins/kolab_auth/kolab_auth_ldap.php
View file

@ -34,11 +34,11 @@ class kolab_auth_ldap extends rcube_ldap_generic
{ {
$rcmail = rcube::get_instance(); $rcmail = rcube::get_instance();
$this->debug = (bool) $rcmail->config->get('ldap_debug');
$this->fieldmap = $p['fieldmap']; $this->fieldmap = $p['fieldmap'];
$this->fieldmap['uid'] = 'uid'; $this->fieldmap['uid'] = 'uid';
$p['attributes'] = array_values($this->fieldmap); $p['attributes'] = array_values($this->fieldmap);
$p['debug'] = (bool) $rcmail->config->get('ldap_debug');
// Connect to the server (with bind) // Connect to the server (with bind)
parent::__construct($p); parent::__construct($p);

10
plugins/tasklist/tasklist.php
View file

@ -1555,7 +1555,7 @@ class tasklist extends rcube_plugin
'changed' => is_object($task['changed']) ? $task['changed']->format('U') : 0, 'changed' => is_object($task['changed']) ? $task['changed']->format('U') : 0,
'sequence' => intval($task['sequence']), 'sequence' => intval($task['sequence']),
'fallback' => strtoupper($status), 'fallback' => strtoupper($status),
'method' => $this->ical->method, 'method' => $task['_method'],
'task' => 'tasks', 'task' => 'tasks',
); );
@ -1599,7 +1599,7 @@ class tasklist extends rcube_plugin
if ($existing) { if ($existing) {
// only update attendee status // only update attendee status
if ($this->ical->method == 'REPLY') { if ($task['_method'] == 'REPLY') {
// try to identify the attendee using the email sender address // try to identify the attendee using the email sender address
$existing_attendee = -1; $existing_attendee = -1;
foreach ($existing['attendees'] as $i => $attendee) { foreach ($existing['attendees'] as $i => $attendee) {
@ -1660,7 +1660,7 @@ class tasklist extends rcube_plugin
} }
// set status=CANCELLED on CANCEL messages // set status=CANCELLED on CANCEL messages
if ($this->ical->method == 'CANCEL') { if ($task['_method'] == 'CANCEL') {
$task['status'] = 'CANCELLED'; $task['status'] = 'CANCELLED';
} }
// show me as free when declined (#1670) // show me as free when declined (#1670)
@ -1698,7 +1698,7 @@ class tasklist extends rcube_plugin
} }
if ($success) { 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'); $this->rc->output->command('display_message', $this->gettext(array('name' => $message, 'vars' => array('list' => $list['name']))), 'confirmation');
$metadata['rsvp'] = intval($metadata['rsvp']); $metadata['rsvp'] = intval($metadata['rsvp']);
@ -1712,7 +1712,7 @@ class tasklist extends rcube_plugin
} }
// send iTip reply // 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); $task['comment'] = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
$itip = $this->load_itip(); $itip = $this->load_itip();
$itip->set_sender_email($reply_sender); $itip->set_sender_email($reply_sender);