diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-07 08:36:42 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-07 08:36:42 +0000 |
| commit | 55200135e3eac05c9d307d2a733aff02c87faf61 (patch) | |
| tree | 581d05580bb9c6cdc75bdda58ec821280ed26696 /roundcubemail/program | |
| parent | 47ef4c9af58c33bbdadb4301938de57219a35d85 (diff) | |
- Support %h variable in 'smtp_server' option (#1485766)
git-svn-id: https://svn.roundcube.net/trunk@2717 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/include/rcube_smtp.inc | 6 | ||||
| -rw-r--r-- | roundcubemail/program/lib/imap.inc | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/roundcubemail/program/include/rcube_smtp.inc b/roundcubemail/program/include/rcube_smtp.inc index 066e5ed47..db681af05 100644 --- a/roundcubemail/program/include/rcube_smtp.inc +++ b/roundcubemail/program/include/rcube_smtp.inc @@ -64,10 +64,10 @@ function smtp_mail($from, $recipients, &$headers, &$body, &$response, &$error) )); $smtp_timeout = null; - $smtp_host = $CONFIG['smtp_server']; + $smtp_host = str_replace('%h', $_SESSION['imap_host'], $CONFIG['smtp_server']); $smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25; - $smtp_host_url = parse_url($CONFIG['smtp_server']); - + $smtp_host_url = parse_url($smtp_host); + // overwrite port if (isset($smtp_host_url['host']) && isset($smtp_host_url['port'])) { diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc index c6b5000ff..7b40c020b 100644 --- a/roundcubemail/program/lib/imap.inc +++ b/roundcubemail/program/lib/imap.inc @@ -260,7 +260,6 @@ function iil_MultLine($fp, $line, $escape=false) { } $line = $a[1][0] . '"' . ($escape ? iil_Escape($out) : $out) . '"'; -// console('[...] '. $out); } return $line; } @@ -269,10 +268,12 @@ function iil_ReadBytes($fp, $bytes) { $data = ''; $len = 0; do { - $data .= fread($fp, $bytes-$len); + $d = fread($fp, $bytes-$len); + $data .= $d; if ($len == strlen($data)) { break; //nothing was read -> exit to avoid apache lockups } +// console('[...] '. $d); $len = strlen($data); } while ($len < $bytes); |