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

0.Removing mixing of operators

Browse source 
1. Fixing encoding problem in calendar names
This commit is contained in:
Bogomil Shopov 2011-06-14 15:49:28 +03:00
parent e574f572be
commit e00cc1e86a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar.php
View file

@ -435,7 +435,7 @@ class calendar extends rcube_plugin
$this->rc->output->show_message('calendar.errorsaving', 'error'); $this->rc->output->show_message('calendar.errorsaving', 'error');
// FIXME: update a single event object on the client instead of reloading the entire source // FIXME: update a single event object on the client instead of reloading the entire source
if ($success && $reload or ($removed && $reload)) if ($success && $reload || ($removed && $reload))
$this->rc->output->command('plugin.reload_calendar', array('source' => $event['calendar'])); $this->rc->output->command('plugin.reload_calendar', array('source' => $event['calendar']));
} }

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

@ -69,7 +69,8 @@ class kolab_calendar
public function get_name() public function get_name()
{ {
$dispname = preg_replace(array('!INBOX/Calendar/!', '!^INBOX/!', '!^shared/!', '!^user/([^/]+)/!'), array('','','','(\\1) '), $this->imap_folder); $dispname = preg_replace(array('!INBOX/Calendar/!', '!^INBOX/!', '!^shared/!', '!^user/([^/]+)/!'), array('','','','(\\1) '), $this->imap_folder);
return strlen($dispname) ? $dispname : $this->imap_folder; $toret = strlen($dispname) ? $dispname : $this->imap_folder;
return mb_convert_encoding($toret,"UTF8", "UTF7-IMAP");
} }
/** /**