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

Added rcube_kolab::folder_id() with improved ID generation method

Browse source
This commit is contained in:
Aleksander Machniak (Kolab Systems) 2011-06-15 11:23:59 +02:00
parent feae471289
commit 1c51c1a9d9
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,6 @@ class kolab_calendar
'sensitivity'=>'sensitivity', 'sensitivity'=>'sensitivity',
'show-time-as' => 'free_busy', 'show-time-as' => 'free_busy',
'alarm','alarms' 'alarm','alarms'
); );
/** /**
@ -47,11 +46,11 @@ class kolab_calendar
*/ */
public function __construct($imap_folder = null) public function __construct($imap_folder = null)
{ {
if ($imap_folder) if (strlen($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 = rcube_kolab::folder_id($this->imap_folder);
// fetch objects from the given IMAP folder // fetch objects from the given IMAP folder
$this->storage = rcube_kolab::get_storage($this->imap_folder); $this->storage = rcube_kolab::get_storage($this->imap_folder);
@ -68,6 +67,7 @@ class kolab_calendar
*/ */
public function get_name() public function get_name()
{ {
// @TODO: get namespace prefixes from IMAP
$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; return strlen($dispname) ? $dispname : $this->imap_folder;
} }

2
plugins/kolab_addressbook/kolab_addressbook.php
View file

@ -202,7 +202,7 @@ class kolab_addressbook extends rcube_plugin
else { else {
foreach ($this->folders as $c_folder) { foreach ($this->folders as $c_folder) {
// create instance of rcube_contacts // create instance of rcube_contacts
$abook_id = strtolower(asciiwords(strtr($c_folder->name, '/.', '--'))); $abook_id = rcube_kolab::folder_id($c_folder->name);
$abook = new rcube_kolab_contacts($c_folder->name); $abook = new rcube_kolab_contacts($c_folder->name);
$this->sources[$abook_id] = $abook; $this->sources[$abook_id] = $abook;
} }

10
plugins/kolab_core/rcube_kolab.php
View file

@ -119,4 +119,14 @@ class rcube_kolab
if (isset($_SESSION['__auth'])) if (isset($_SESSION['__auth']))
unset($_SESSION['__auth']); unset($_SESSION['__auth']);
} }
/**
* Creates folder ID from folder name
*/
public static function folder_id($folder)
{
$folder = rcube_charset_convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
return asciiwords(strtr($folder, '/.', '--'));
}
} }