From 29983c16711b7eb6828afab8ca87a09eec9f6fe3 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 09 Oct 2010 12:46:53 -0400
Subject: [PATCH] - Add caching support in id2uid and uid2id functions (#1487019), Fix get_message_cache_index to use internal cache when only sort order changes. Both changes improves performance of 'show' action - code cleanup/function description fixes
---
program/include/rcmail.php | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 1b11ca3..b6af440 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -683,6 +683,16 @@
if ($virtuser = rcube_user::email2user($username))
$username = $virtuser;
+ // Here we need IDNA ASCII
+ // Only rcube_contacts class is using domain names in Unicode
+ $host = idn_to_ascii($host);
+ if (strpos($username, '@')) {
+ // lowercase domain name
+ list($local, $domain) = explode('@', $username);
+ $username = $local . '@' . mb_strtolower($domain);
+ $username = idn_to_ascii($username);
+ }
+
// user already registered -> overwrite username
if ($user = rcube_user::query($username, $host))
$username = $user->data['username'];
@@ -690,15 +700,9 @@
if (!$this->imap)
$this->imap_init();
- // Here we need IDNA ASCII
- // Only rcube_contacts class is using domain names in Unicode
- $host = idn_to_ascii($host);
- if (strpos($username, '@'))
- $username = idn_to_ascii($username);
-
// try IMAP login
if (!($imap_login = $this->imap->connect($host, $username, $pass, $imap_port, $imap_ssl))) {
- // lowercase username if it's an e-mail address (#1484473)
+ // try with lowercase
$username_lc = mb_strtolower($username);
if ($username_lc != $username && ($imap_login = $this->imap->connect($host, $username_lc, $pass, $imap_port, $imap_ssl)))
$username = $username_lc;
--
Gitblit v1.9.1