summaryrefslogtreecommitdiff
path: root/plugins/tasklist
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-01-08 17:22:59 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-01-08 17:22:59 (GMT)
commit854779406d8678bee5cbf2ae12d36f66e6d813f4 (patch)
tree1d93663e57fac9fb89739b47288ee30bd108674b /plugins/tasklist
parent44b67121b7e41a6a54ae26e264d0ff0a0adbf36e (diff)
downloadroundcubemail-plugins-kolab-854779406d8678bee5cbf2ae12d36f66e6d813f4.tar.gz
Move utility function to libkolab for common use
Diffstat (limited to 'plugins/tasklist')
-rw-r--r--plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php21
1 files changed, 2 insertions, 19 deletions
diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index 97cdb63..6c9f418 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -825,7 +825,7 @@ class tasklist_kolab_driver extends tasklist_driver
private function get_links($uid)
{
$config = kolab_storage_config::get_instance();
- return array_map(array($this, '_convert_message_uri'), $config->get_object_links($uid));
+ return array_map(array('kolab_storage_config','local_message_uri'), $config->get_object_links($uid));
}
/**
@@ -856,23 +856,6 @@ class tasklist_kolab_driver extends tasklist_driver
}
/**
- * Simplify the given message URI by converting the mailbox
- * part into a relative IMAP path valid for the current user.
- */
- protected function _convert_message_uri($uri)
- {
- if (strpos($uri, 'imap:///') === 0) {
- $linkref = kolab_storage_config::parse_member_url($uri);
-
- return 'imap:///' . implode('/', array_map('rawurlencode', explode('/', $linkref['folder']))) .
- '/' . $linkref['uid'] .
- '?' . http_build_query($linkref['params'], '', '&');
- }
-
- return $uri;
- }
-
- /**
* Extract uid + list identifiers from the given input
*
* @param mixed array or string with task identifier(s)
@@ -1296,7 +1279,7 @@ class tasklist_kolab_driver extends tasklist_driver
public function get_message_uri($headers, $folder)
{
$uri = kolab_storage_config::get_message_uri($headers, $folder);
- return $this->_convert_message_uri($uri);
+ return kolab_storage_config::local_message_uri($uri);
}
/**