Changeset 2717 in subversion

Timestamp:

Jul 7, 2009 4:36:42 AM (4 years ago)

Author:

alec

Message:

• Support %h variable in 'smtp_server' option (#1485766)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcube_smtp.inc (modified) (1 diff)
• program/lib/imap.inc (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Support %h variable in 'smtp_server' option (#1485766)
 - Show SMTP errors in browser (#1485927)
 - Allow WBR tag in HTML message (#1485960)

trunk/roundcubemail/config/main.inc.php.dist

@@ -99 +99 @@
 // to use SSL connection, set ssl://smtp.host.com
 // if left blank, the PHP mail() function is used
+// Use %h variable as replacement for user's IMAP hostname
 $rcmail_config['smtp_server'] = '';
 

trunk/roundcubemail/program/include/rcube_smtp.inc

@@ -65 +65 @@
 
   $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']))

trunk/roundcubemail/program/lib/imap.inc

@@ -261 +261 @@
 
                 $line = $a[1][0] . '"' . ($escape ? iil_Escape($out) : $out) . '"';
-//              console('[...] '. $out);
         }
         return $line;
@@ -270 +269 @@
         $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);