Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube

This commit is contained in:
Thomas Bruederli 2011-07-20 15:39:01 +02:00
commit 266dcaf07d

View file

@ -155,21 +155,17 @@ class kolab_addressbook_ui
), ),
); );
if (strlen($path_imap)) { if (!empty($options) && ($options['norename'] || $options['namespace'] != 'personal')) {
$path = rcube_charset_convert($path_imap, 'UTF7-IMAP'); // prevent user from moving folder
// @TODO: $options $hidden_fields[] = array('name' => '_parent', 'value' => $path_imap);
if (!empty($options) && ($options['norename'] || $options['namespace'] != 'personal')) { }
// prevent user from moving folder else {
$hidden_fields[] = array('name' => '_parent', 'value' => $path_imap); $select = rcube_kolab::folder_selector('contact', array('name' => '_parent'));
}
else {
$select = rcube_kolab::folder_selector('contact', array('name' => '_parent'));
$form['props']['fieldsets']['location']['content']['path'] = array( $form['props']['fieldsets']['location']['content']['path'] = array(
'label' => $this->plugin->gettext('parentbook'), 'label' => $this->plugin->gettext('parentbook'),
'value' => $select->show($path_imap), 'value' => $select->show($path_imap),
); );
}
} }
// Allow plugins to modify address book form content (e.g. with ACL form) // Allow plugins to modify address book form content (e.g. with ACL form)