Thomas Bruederli
2012-05-23 b97f21a18f9ffa5306bdccbb77c4b63a09a0e4e7
program/include/rcmail.php
@@ -19,9 +19,6 @@
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 | Author: Aleksander Machniak <alec@alec.pl>                            |
 +-----------------------------------------------------------------------+
 $Id$
*/
@@ -1329,11 +1326,12 @@
        $attrib      = $hook['attribs'];
        if ($type == 'select') {
            $attrib['is_escaped'] = true;
            $select = new html_select($attrib);
            // add no-selection option
            if ($attrib['noselection']) {
                $select->add($rcmail->gettext($attrib['noselection']), '');
                $select->add(html::quote($rcmail->gettext($attrib['noselection'])), '');
            }
            $rcmail->render_folder_tree_select($a_mailboxes, $mbox_name, $attrib['maxlength'], $select, $attrib['realnames']);
@@ -1362,7 +1360,7 @@
     */
    public function folder_selector($p = array())
    {
        $p += array('maxlength' => 100, 'realnames' => false);
        $p += array('maxlength' => 100, 'realnames' => false, 'is_escaped' => true);
        $a_mailboxes = array();
        $storage = $this->get_storage();
@@ -1388,7 +1386,7 @@
        $select = new html_select($p);
        if ($p['noselection']) {
            $select->add($p['noselection'], '');
            $select->add(html::quote($p['noselection']), '');
        }
        $this->render_folder_tree_select($a_mailboxes, $mbox, $p['maxlength'], $select, $p['realnames'], 0, $p);
@@ -1579,7 +1577,7 @@
                }
            }
            $select->add(str_repeat('&nbsp;', $nestLevel*4) . $foldername, $folder['id']);
            $select->add(str_repeat('&nbsp;', $nestLevel*4) . html::quote($foldername), $folder['id']);
            if (!empty($folder['folders'])) {
                $out .= $this->render_folder_tree_select($folder['folders'], $mbox_name, $maxlength,
@@ -2012,6 +2010,11 @@
        return $this->storage_connect();
    }
    public function imap_init()
    {
        return $this->storage_init();
    }
    /**
     * Connect to the mail storage server with stored session data
     *