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

Merged in Mickael/ident_switchphp-solve-the-issue-that-do-1642283330232 (pull request #4)

Browse Source 
ident_switch.php - Solve the issue that don't set the good configuration variable for the smtp_host on the latest version + dev of roundcube

Approved-by: Boris Gulay
This commit is contained in:
Mickael
2022-01-17 15:55:00 +00:00
committed by Boris Gulay
parent ca790d72de ae7b905824
commit 181ac6b27c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ident_switch.php
View File

@@ -179,15 +179,15 @@ class ident_switch extends rcube_plugin
$args['smtp_user'] = $r['username']; $args['smtp_user'] = $r['username'];
$args['smtp_pass'] = $r['smtp_auth'] == self::SMTP_AUTH_IMAP ? $rc->decrypt($r['password']) : ''; $args['smtp_pass'] = $r['smtp_auth'] == self::SMTP_AUTH_IMAP ? $rc->decrypt($r['password']) : '';
$args['smtp_server'] = $r['smtp_host'] ? $r['smtp_host'] : 'localhost'; // Default SMTP host here $args['smtp_host'] = $r['smtp_host'] ? $r['smtp_host'] : 'localhost'; // Default SMTP host here
$args['smtp_port'] = $r['smtp_port'] ? $r['smtp_port'] : 587; // Default SMTP port here $args['smtp_port'] = $r['smtp_port'] ? $r['smtp_port'] : 587; // Default SMTP port here
if ($r['flags'] & self::DB_SECURE_IMAP_TLS) if ($r['flags'] & self::DB_SECURE_IMAP_TLS)
{ {
if (strpos($args['smtp_server'], ':') !== false) if (strpos($args['smtp_host'], ':') !== false)
self::write_log('SMTP server already contains protocol, ignoring TLS flag.'); self::write_log('SMTP server already contains protocol, ignoring TLS flag.');
else else
$args['smtp_server'] = 'tls://' . $args['smtp_server']; $args['smtp_host'] = 'tls://' . $args['smtp_host'];
} }
} }