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

Use internal charset conversion (mbstring is not mandatory for Roundcube); fix event data output

Browse source
This commit is contained in:
Thomas Bruederli 2011-06-14 17:18:28 -06:00
parent e00cc1e86a
commit 723dd5ffa4
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@ class kolab_calendar
private $id2uid; private $id2uid;
private $imap_folder = 'INBOX/Calendar'; private $imap_folder = 'INBOX/Calendar';
private $sensitivity_map = array('public', 'private', 'confidential'); private $sensitivity_map = array('public', 'private', 'confidential');
private $priority_map = array('low', 'normal', 'high');
private $fieldmap = array( private $fieldmap = array(
@ -49,7 +50,7 @@ class kolab_calendar
{ {
if ($imap_folder) if ($imap_folder)
$this->imap_folder = $imap_folder; $this->imap_folder = $imap_folder;
write_log('err_log',$imap_folder);
// ID is derrived from folder name // ID is derrived from folder name
$this->id = strtolower(asciiwords(strtr($this->imap_folder, '/.', '--'))); $this->id = strtolower(asciiwords(strtr($this->imap_folder, '/.', '--')));
@ -69,8 +70,7 @@ 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);
$toret = strlen($dispname) ? $dispname : $this->imap_folder; return rcube_charset_convert(strlen($dispname) ? $dispname : $this->imap_folder, "UTF7-IMAP");
return mb_convert_encoding($toret,"UTF8", "UTF7-IMAP");
} }
/** /**
@ -317,12 +317,13 @@ class kolab_calendar
} }
$sensitivity_map = array_flip($this->sensitivity_map); $sensitivity_map = array_flip($this->sensitivity_map);
$priority_map = array_flip($this->priority_map);
return array( return array(
'id' => $rec['uid'], 'id' => $rec['uid'],
'uid' => $rec['uid'], 'uid' => $rec['uid'],
'title' => $rec['summary'], 'title' => strval($rec['summary']),
'location' => $rec['location'], 'location' => strval($rec['location']),
'description' => $rec['body'], 'description' => $rec['body'],
'start' => $rec['start-date'], 'start' => $rec['start-date'],
'end' => $rec['end-date'], 'end' => $rec['end-date'],
@ -331,7 +332,7 @@ class kolab_calendar
'alarms' => $alarm_value . $alarm_unit, 'alarms' => $alarm_value . $alarm_unit,
'categories' => $rec['categories'], 'categories' => $rec['categories'],
'free_busy' => $rec['show-time-as'], 'free_busy' => $rec['show-time-as'],
'priority' => $rec['priority'], // normal 'priority' => isset($priority_map[$rec['priority']]) ? $priority_map[$rec['priority']] : 1,
'sensitivity' => $sensitivity_map[$rec['sensitivity']], 'sensitivity' => $sensitivity_map[$rec['sensitivity']],
'calendar' => $this->id, 'calendar' => $this->id,
); );
@ -355,7 +356,7 @@ class kolab_calendar
'end-date'=>$event['end'], 'end-date'=>$event['end'],
'sensitivity'=>$this->sensitivity_map[$event['sensitivity']], 'sensitivity'=>$this->sensitivity_map[$event['sensitivity']],
'show-time-as' => $event['free_busy'], 'show-time-as' => $event['free_busy'],
'priority' => $event['priority'] 'priority' => $this->priority_map[$event['priority']]
); );

2
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -64,7 +64,7 @@ class kolab_driver extends calendar_driver
} }
else { else {
foreach ($folders as $c_folder) { foreach ($folders as $c_folder) {
$calendar = new kolab_calendar($c_folder->name); $calendar = new kolab_calendar($c_folder->name);
$this->folders[$calendar->id] = $calendar; $this->folders[$calendar->id] = $calendar;
if ($calendar->ready) { if ($calendar->ready) {
$this->calendars[$calendar->id] = array( $this->calendars[$calendar->id] = array(