- Use only one from IMAP authentication methods to prevent login delays (14...

alecpl

2011-02-15 ab0b51a1fef87bcc643c3aaf2e635c811b28ccd8

 program/include/rcube_config.php

@@ -5,7 +5,7 @@
 | program/include/rcube_config.php                                      |
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2008-2010, Roundcube Dev. - Switzerland                 |
 | Copyright (C) 2008-2010, The Roundcube Dev Team                       |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
@@ -47,10 +47,6 @@
     */
    private function load()
    {
        // start output buffering, we don't need any output yet, 
        // it'll be cleared after reading of config files, etc.
        ob_start();
    
        // load main config file
        if (!$this->load_from_file(RCMAIL_CONFIG_DIR . '/main.inc.php'))
            $this->errors[] = 'main.inc.php was not found.';
@@ -98,9 +94,6 @@
            ini_set('display_errors', 0);
        }

        // clear output buffer
        ob_end_clean();

        // export config data
        $GLOBALS['CONFIG'] = &$this->prop;
    }
@@ -136,7 +129,11 @@
    public function load_from_file($fpath)
    {
        if (is_file($fpath) && is_readable($fpath)) {
            // use output buffering, we don't need any output here 
            ob_start();
            include($fpath);
            ob_end_clean();

            if (is_array($rcmail_config)) {
                $this->prop = array_merge($this->prop, $rcmail_config, $this->userprefs);
                return true;
@@ -290,7 +287,7 @@
            $domain = rcube_parse_host($this->prop['mail_domain']);

        if ($encode)
            $domain = idn_to_ascii($domain);
            $domain = rcube_idn_to_ascii($domain);

        return $domain;
    }