senior/roundcube-ident_switch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align Checker port resolution and add delimiter preconfig support

Browse Source
This commit is contained in:
Laurent Dinclaux
2026-02-10 18:38:42 +11:00
parent 39fe417104
commit 3a8202bd7a
4 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/IdentSwitchChecker.php
View File

@@ -112,26 +112,24 @@ class IdentSwitchChecker
$imap = new rcube_imap_generic();
$host = $identity['imap_host'] ?: 'localhost';
$port = $identity['imap_port'] ?: 143;
$ssl = false;
$ssl = null;
if (!empty($identity['flags']) && ($identity['flags'] & ident_switch::DB_SECURE_IMAP_TLS)) {
$ssl = 'tls';
}
// Strip and parse protocol prefix from host
// Parse scheme from host field
$hostLower = strtolower($host);
if (str_starts_with($hostLower, 'tls://')) {
$ssl = 'tls';
$host = substr($host, 6);
} elseif (str_starts_with($hostLower, 'ssl://')) {
if (str_starts_with($hostLower, 'ssl://')) {
$ssl = 'ssl';
$host = substr($host, 6);
if (!$identity['imap_port']) {
$port = 993;
}
} elseif (str_starts_with($hostLower, 'tls://')) {
$ssl = 'tls';
$host = substr($host, 6);
} elseif (!empty($identity['flags']) && ($identity['flags'] & ident_switch::DB_SECURE_IMAP_TLS)) {
// Backward compat: old records without scheme in host
$ssl = 'tls';
}
$def_port = ($ssl === 'ssl') ? 993 : 143;
$port = $identity['imap_port'] ?: $def_port;
$username = $identity['username'] ?: $identity['email'];
$password = $rc->decrypt($identity['password']);