summaryrefslogtreecommitdiff
path: root/program/include/main.inc
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2005-10-22 14:17:25 +0000
committerthomascube <thomas@roundcube.net>2005-10-22 14:17:25 +0000
commitf619dedc5aa2020eeffa01e05feacedb043ccb66 (patch)
tree21d544808edbd23837951cbe19d64ed84242dbe5 /program/include/main.inc
parent7dd801e71011f62ff7b2dd59636a6908fd037993 (diff)
Patches for 20051021 release
Diffstat (limited to 'program/include/main.inc')
-rw-r--r--program/include/main.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index f0df4ef65..7955aa870 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -253,6 +253,15 @@ function rcmail_login($user, $pass, $host=NULL)
if (!$host)
$host = $CONFIG['default_host'];
+ // parse $host URL
+ $a_host = parse_url($host);
+ if ($a_host['host'])
+ {
+ $host = $a_host['host'];
+ $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE;
+ $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $CONFIG['default_port']);
+ }
+
// query if user already registered
$sql_result = $DB->query(sprintf("SELECT user_id, username, language, preferences
FROM %s
@@ -269,15 +278,6 @@ function rcmail_login($user, $pass, $host=NULL)
$user = $sql_arr['username'];
}
- // parse $host URL
- $a_host = parse_url($host);
- if ($a_host['host'])
- {
- $host = $a_host['host'];
- $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE;
- $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $CONFIG['default_port']);
- }
-
// exit if IMAP login failed
if (!($imap_login = $IMAP->connect($host, $user, $pass, $imap_port, $imap_ssl)))
return FALSE;