- Removed dependency on rcube_* functions, small improvements

alecpl

2011-04-08 f66f5f02e30d9fc2d5c06eeefb4377b8ff36fce2

 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:                                                              |
@@ -188,8 +188,18 @@
     */
    public function set_user_prefs($prefs)
    {
        // Honor the dont_override setting for any existing user preferences
        $dont_override = $this->get('dont_override');
        if (is_array($dont_override) && !empty($dont_override)) {
            foreach ($prefs as $key => $pref) {
                if (in_array($key, $dont_override)) {
                    unset($prefs[$key]);
                }
            }
        }

        $this->userprefs = $prefs;
        $this->prop = array_merge($this->prop, $prefs);
        $this->prop      = array_merge($this->prop, $prefs);
    }


@@ -287,7 +297,7 @@
            $domain = rcube_parse_host($this->prop['mail_domain']);

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

        return $domain;
    }