From fdee0e452f824bf59c257a7a0db647bdbdf493f6 Mon Sep 17 00:00:00 2001 From: "Aleksander Machniak (Kolab Systems)" Date: Wed, 20 Jul 2011 15:18:53 +0200 Subject: [PATCH 1/2] Display parent folder selector more often --- .../lib/kolab_addressbook_ui.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php index 0b4880f5..9c2ca804 100644 --- a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php +++ b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php @@ -157,19 +157,19 @@ class kolab_addressbook_ui if (strlen($path_imap)) { $path = rcube_charset_convert($path_imap, 'UTF7-IMAP'); - // @TODO: $options - if (!empty($options) && ($options['norename'] || $options['namespace'] != 'personal')) { - // prevent user from moving folder - $hidden_fields[] = array('name' => '_parent', 'value' => $path_imap); - } - else { - $select = rcube_kolab::folder_selector('contact', array('name' => '_parent')); + } - $form['props']['fieldsets']['location']['content']['path'] = array( - 'label' => $this->plugin->gettext('parentbook'), - 'value' => $select->show($path_imap), - ); - } + if (!empty($options) && ($options['norename'] || $options['namespace'] != 'personal')) { + // prevent user from moving folder + $hidden_fields[] = array('name' => '_parent', 'value' => $path_imap); + } + else { + $select = rcube_kolab::folder_selector('contact', array('name' => '_parent')); + + $form['props']['fieldsets']['location']['content']['path'] = array( + 'label' => $this->plugin->gettext('parentbook'), + 'value' => $select->show($path_imap), + ); } // Allow plugins to modify address book form content (e.g. with ACL form) From 7e57b93806bb19ff536d8b28275a3649cbf24600 Mon Sep 17 00:00:00 2001 From: "Aleksander Machniak (Kolab Systems)" Date: Wed, 20 Jul 2011 15:23:47 +0200 Subject: [PATCH 2/2] Removed old code --- plugins/kolab_addressbook/lib/kolab_addressbook_ui.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php index 9c2ca804..1703d81f 100644 --- a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php +++ b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php @@ -155,10 +155,6 @@ class kolab_addressbook_ui ), ); - if (strlen($path_imap)) { - $path = rcube_charset_convert($path_imap, 'UTF7-IMAP'); - } - if (!empty($options) && ($options['norename'] || $options['namespace'] != 'personal')) { // prevent user from moving folder $hidden_fields[] = array('name' => '_parent', 'value' => $path_imap);