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

Use full folder names by default and truncated ones for listings (#2370)

Browse source
This commit is contained in:
Thomas Bruederli 2013-10-16 16:35:56 +02:00
parent 5fd5be6176
commit 2c337eb9d6
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,13 +114,14 @@ class kolab_driver extends calendar_driver
foreach ($folders as $id => $cal) { foreach ($folders as $id => $cal) {
$fullname = $cal->get_name(); $fullname = $cal->get_name();
$name = kolab_storage::folder_displayname($fullname, $names); $listname = kolab_storage::folder_displayname($fullname, $names);
// special handling for virtual folders // special handling for virtual folders
if ($cal->virtual) { if ($cal->virtual) {
$calendars[$cal->id] = array( $calendars[$cal->id] = array(
'id' => $cal->id, 'id' => $cal->id,
'name' => $name, 'name' => $fullname,
'listname' => $listname,
'virtual' => true, 'virtual' => true,
'readonly' => true, 'readonly' => true,
); );
@ -128,8 +129,8 @@ class kolab_driver extends calendar_driver
else { else {
$calendars[$cal->id] = array( $calendars[$cal->id] = array(
'id' => $cal->id, 'id' => $cal->id,
'name' => $name, 'name' => $fullname,
'altname' => $fullname, 'listname' => $listname,
'editname' => $cal->get_foldername(), 'editname' => $cal->get_foldername(),
'color' => $cal->get_color(), 'color' => $cal->get_color(),
'readonly' => $cal->readonly, 'readonly' => $cal->readonly,

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

@ -200,7 +200,7 @@ class calendar_ui
$html_id = html_identifier($id); $html_id = html_identifier($id);
$class = 'cal-' . asciiwords($id, true); $class = 'cal-' . asciiwords($id, true);
$title = !empty($prop['altname']) && $prop['altname'] != $prop['name'] ? html_entity_decode($prop['altname'], ENT_COMPAT, RCMAIL_CHARSET) : ''; $title = $prop['name'] != $prop['listname'] ? html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : '';
if ($prop['virtual']) if ($prop['virtual'])
$class .= ' virtual'; $class .= ' virtual';
@ -212,7 +212,7 @@ class calendar_ui
$li .= html::tag('li', array('id' => 'rcmlical' . $html_id, 'class' => $class), $li .= html::tag('li', array('id' => 'rcmlical' . $html_id, 'class' => $class),
($prop['virtual'] ? '' : html::tag('input', array('type' => 'checkbox', 'name' => '_cal[]', 'value' => $id, 'checked' => $prop['active']), '') . ($prop['virtual'] ? '' : html::tag('input', array('type' => 'checkbox', 'name' => '_cal[]', 'value' => $id, 'checked' => $prop['active']), '') .
html::span('handle', ' ')) . html::span('handle', ' ')) .
html::span(array('class' => 'calname', 'title' => $title), $prop['name'])); html::span(array('class' => 'calname', 'title' => $title), $prop['listname']));
} }
$this->rc->output->set_env('calendars', $jsenv); $this->rc->output->set_env('calendars', $jsenv);

9
plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
View file

@ -95,14 +95,15 @@ class tasklist_kolab_driver extends tasklist_driver
$path_imap = join($delim, $path_imap); $path_imap = join($delim, $path_imap);
$fullname = kolab_storage::object_name($utf7name); $fullname = kolab_storage::object_name($utf7name);
$name = kolab_storage::folder_displayname($fullname, $listnames); $listname = kolab_storage::folder_displayname($fullname, $listnames);
// special handling for virtual folders // special handling for virtual folders
if ($folder->virtual) { if ($folder->virtual) {
$list_id = kolab_storage::folder_id($utf7name); $list_id = kolab_storage::folder_id($utf7name);
$this->lists[$list_id] = array( $this->lists[$list_id] = array(
'id' => $list_id, 'id' => $list_id,
'name' => $name, 'name' => $fullname,
'listname' => $listname,
'virtual' => true, 'virtual' => true,
'editable' => false, 'editable' => false,
); );
@ -128,8 +129,8 @@ class tasklist_kolab_driver extends tasklist_driver
$list_id = kolab_storage::folder_id($utf7name); $list_id = kolab_storage::folder_id($utf7name);
$tasklist = array( $tasklist = array(
'id' => $list_id, 'id' => $list_id,
'name' => $name, 'name' => $fullname,
'altname' => $fullname, 'listname' => $listname,
'editname' => $editname, 'editname' => $editname,
'color' => $folder->get_color('0000CC'), 'color' => $folder->get_color('0000CC'),
'showalarms' => isset($prefs[$list_id]['showalarms']) ? $prefs[$list_id]['showalarms'] : $alarms, 'showalarms' => isset($prefs[$list_id]['showalarms']) ? $prefs[$list_id]['showalarms'] : $alarms,

4
plugins/tasklist/tasklist_ui.php
View file

@ -106,7 +106,7 @@ class tasklist_ui
$html_id = html_identifier($id); $html_id = html_identifier($id);
$class = 'tasks-' . asciiwords($id, true); $class = 'tasks-' . asciiwords($id, true);
$title = !empty($prop['altname']) && $prop['altname'] != $prop['name'] ? html_entity_decode($prop['altname'], ENT_COMPAT, RCMAIL_CHARSET) : ''; $title = $prop['name'] != $prop['listname'] ? html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : '';
if ($prop['virtual']) if ($prop['virtual'])
$class .= ' virtual'; $class .= ' virtual';
@ -118,7 +118,7 @@ class tasklist_ui
$li .= html::tag('li', array('id' => 'rcmlitasklist' . $html_id, 'class' => $class), $li .= html::tag('li', array('id' => 'rcmlitasklist' . $html_id, 'class' => $class),
($prop['virtual'] ? '' : html::tag('input', array('type' => 'checkbox', 'name' => '_list[]', 'value' => $id, 'checked' => $prop['active']))) . ($prop['virtual'] ? '' : html::tag('input', array('type' => 'checkbox', 'name' => '_list[]', 'value' => $id, 'checked' => $prop['active']))) .
html::span('handle', ' ') . html::span('handle', ' ') .
html::span(array('class' => 'listname', 'title' => $title), $prop['name'])); html::span(array('class' => 'listname', 'title' => $title), $prop['listname']));
} }
$this->rc->output->set_env('tasklists', $jsenv); $this->rc->output->set_env('tasklists', $jsenv);