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

Fixes: centralize helpers, remove dead code, fix JS issues

Browse Source
This commit is contained in:
Laurent Dinclaux
2026-02-10 22:41:11 +11:00
parent da573c184e
commit 05a7a2967f
5 changed files with 57 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/IdentSwitchChecker.php
View File

@@ -111,20 +111,12 @@ class IdentSwitchChecker
{
$imap = new rcube_imap_generic();
$host = $identity['imap_host'] ?: 'localhost';
$ssl = null;
$parsed = ident_switch::parse_host_scheme($identity['imap_host'] ?: 'localhost');
$host = $parsed['host'];
$ssl = $parsed['scheme'] ?: null;
// Parse scheme from host field
$hostLower = strtolower($host);
if (str_starts_with($hostLower, 'ssl://')) {
$ssl = 'ssl';
$host = substr($host, 6);
} 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';
if (!$ssl && !empty($identity['flags']) && ($identity['flags'] & ident_switch::DB_SECURE_IMAP_TLS)) {
$ssl = 'tls'; // Backward compat: old records without scheme in host
}
$def_port = ($ssl === 'ssl') ? 993 : 143;