alecpl
2011-01-08 808d1617ef17d8ae33cbc6533cf391c31123c0da
- Fix fallback to LOGIN auth (broken in r4389)


1 files modified
12 ■■■■■ changed files
program/include/rcube_imap_generic.php 12 ●●●●● patch | view | raw | blame | history
program/include/rcube_imap_generic.php
@@ -768,10 +768,14 @@
                $auth_methods = $auth_caps;
            }
            // RFC 2595 (LOGINDISABLED) LOGIN disabled when connection is not secure
            if (($key = array_search('LOGIN', $auth_methods)) !== false
                && $this->getCapability('LOGINDISABLED')
            ) {
                unset($auth_methods[$key]);
            $login_disabled = $this->getCapability('LOGINDISABLED');
            if (($key = array_search('LOGIN', $auth_methods)) !== false) {
                if ($login_disabled) {
                    unset($auth_methods[$key]);
                }
            }
            else if (!$login_disabled) {
                $auth_methods[] = 'LOGIN';
            }
        }
        else {