- Fix so connection to LDAP will be properly closed

alecpl

2011-12-01 14b342b03aaedadb67244149e7dea3210c6ac0ed

 program/steps/settings/edit_folder.inc

@@ -106,28 +106,27 @@
        ),
    );

    if (strlen($path) || !strlen($mbox)) {
        if (!empty($options) && ($options['norename'] || $options['namespace'] != 'personal')) {
            // prevent user from moving folder
            $hidden_path = new html_hiddenfield(array('name' => '_parent', 'value' => $path));
            $form['props']['fieldsets']['location']['content']['name']['value'] .= $hidden_path->show();
        }
        else {
            $selected = isset($_POST['_parent']) ? $_POST['_parent'] : $path_id;
            $select = rcmail_mailbox_select(array(
                'name'        => '_parent',
                'noselection' => '---',
                'realnames'   => false,
                'maxlength'   => 150,
                'unsubscribed' => true,
                'exceptions' => array($mbox_imap),
            ));
    if (!empty($options) && ($options['norename'] || $options['protected'])) {
        // prevent user from moving folder
        $hidden_path = new html_hiddenfield(array('name' => '_parent', 'value' => $path));
        $form['props']['fieldsets']['location']['content']['name']['value'] .= $hidden_path->show();
    }
    else {
        $selected = isset($_POST['_parent']) ? $_POST['_parent'] : $path_id;
        $select = rcmail_mailbox_select(array(
            'name'        => '_parent',
            'noselection' => '---',
            'realnames'   => false,
            'maxlength'   => 150,
            'unsubscribed' => true,
            'skip_noinferiors' => true,
            'exceptions'  => array($mbox_imap),
        ));

            $form['props']['fieldsets']['location']['content']['path'] = array(
                'label' => rcube_label('parentfolder'),
                'value' => $select->show($selected),
            );
        }
        $form['props']['fieldsets']['location']['content']['path'] = array(
            'label' => rcube_label('parentfolder'),
            'value' => $select->show($selected),
        );
    }

    // Settings
@@ -136,7 +135,7 @@
    );

    // Settings: threading
    if ($threading_supported && !$options['noselect'] && !$options['is_root']) {
    if ($threading_supported && ($mbox_imap == 'INBOX' || (!$options['noselect'] && !$options['is_root']))) {
        $select = new html_select(array('name' => '_viewmode', 'id' => '_listmode'));
        $select->add(rcube_label('list'), 0);
        $select->add(rcube_label('threads'), 1);
@@ -193,7 +192,7 @@
            'content' => array()
        );

        if (!$options['noselect'] && !$options['is_root']) {
        if ((!$options['noselect'] && !$options['is_root']) || $mbox_imap == 'INBOX') {
            $msgcount = $RCMAIL->imap->messagecount($mbox_imap, 'ALL', true, false);

            // Size
@@ -257,7 +256,7 @@
            $content = rcmail_get_form_part($tab);
        }

        if ($content) {        
        if ($content) {
            $out .= html::tag('fieldset', null, html::tag('legend', null, Q($tab['name'])) . $content) ."\n";
        }
    }
@@ -289,30 +288,6 @@
    }

    return $content;
}

function rcmail_localize_folderpath($path)
{
    global $RCMAIL;

    $protect_folders = $RCMAIL->config->get('protect_default_folders');
    $default_folders = (array) $RCMAIL->config->get('default_imap_folders');
    $delimiter       = $RCMAIL->imap->get_hierarchy_delimiter();
    $path            = explode($delimiter, $path);
    $result          = array();

    foreach ($path as $idx => $dir) {
        $directory = implode($delimiter, array_slice($path, 0, $idx+1));
        if ($protect_folders && in_array($directory, $default_folders)) {
            unset($result);
            $result[] = rcmail_localize_foldername($directory);
        }
        else {
            $result[] = rcube_charset_convert($dir, 'UTF7-IMAP');
        }
    }

    return implode($delimiter, $result);
}