From 1a2f8375ded7563964ea24c44c7874a92e6f7b77 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 12 Aug 2010 03:11:28 -0400
Subject: [PATCH] - add message_part_structure hook also for text parts of mixed messages
---
program/include/rcube_smtp.php | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index 2bf8cc1..3c54d47 100644
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -5,7 +5,7 @@
| program/include/rcube_smtp.php |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -22,7 +22,15 @@
// define headers delimiter
define('SMTP_MIME_CRLF', "\r\n");
-class rcube_smtp {
+/**
+ * Class to provide SMTP functionality using PEAR Net_SMTP
+ *
+ * @package Mail
+ * @author Thomas Bruederli <roundcube@gmail.com>
+ * @author Aleksander Machniak <alec@alec.pl>
+ */
+class rcube_smtp
+{
private $conn = null;
private $response;
@@ -65,7 +73,7 @@
'smtp_timeout' => $RCMAIL->config->get('smtp_timeout'),
));
- $smtp_host = str_replace('%h', $_SESSION['imap_host'], $CONFIG['smtp_server']);
+ $smtp_host = rcube_parse_host($CONFIG['smtp_server']);
// when called from Installer it's possible to have empty $smtp_host here
if (!$smtp_host) $smtp_host = 'localhost';
$smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
@@ -124,7 +132,7 @@
$this->error = array('label' => 'smtpautherror', 'vars' => array('code' => $this->conn->_code));
$this->response[] .= 'Authentication failure: ' . $result->getMessage() . ' (Code: ' . $result->getCode() . ')';
$this->reset();
- $this->disconnect();
+ $this->disconnect();
return false;
}
}
@@ -188,7 +196,9 @@
// set From: address
if (PEAR::isError($this->conn->mailFrom($from)))
{
- $this->error = array('label' => 'smtpfromerror', 'vars' => array('from' => $from, 'code' => $this->conn->_code));
+ $err = $this->conn->getResponse();
+ $this->error = array('label' => 'smtpfromerror', 'vars' => array(
+ 'from' => $from, 'code' => $this->conn->_code, 'msg' => $err[1]));
$this->response[] .= "Failed to set sender '$from'";
$this->reset();
return false;
@@ -207,7 +217,9 @@
foreach ($recipients as $recipient)
{
if (PEAR::isError($this->conn->rcptTo($recipient))) {
- $this->error = array('label' => 'smtptoerror', 'vars' => array('to' => $recipient, 'code' => $this->conn->_code));
+ $err = $this->conn->getResponse();
+ $this->error = array('label' => 'smtptoerror', 'vars' => array(
+ 'to' => $recipient, 'code' => $this->conn->_code, 'msg' => $err[1]));
$this->response[] .= "Failed to add recipient '$recipient'";
$this->reset();
return false;
@@ -233,7 +245,13 @@
// Send the message's headers and the body as SMTP data.
if (PEAR::isError($result = $this->conn->data($data, $text_headers)))
{
- $this->error = array('label' => 'smtperror', 'vars' => array('msg' => $result->getMessage()));
+ $err = $this->conn->getResponse();
+ if (!in_array($err[0], array(354, 250, 221)))
+ $msg = sprintf('[%d] %s', $err[0], $err[1]);
+ else
+ $msg = $result->getMessage();
+
+ $this->error = array('label' => 'smtperror', 'vars' => array('msg' => $msg));
$this->response[] .= "Failed to send data";
$this->reset();
return false;
@@ -386,14 +404,14 @@
$addresses = array();
$recipients = rcube_explode_quoted_string(',', $recipients);
-
+
reset($recipients);
while (list($k, $recipient) = each($recipients))
{
$a = explode(" ", $recipient);
while (list($k2, $word) = each($a))
{
- if ((strpos($word, "@") > 0) && (strpos($word, "\"")===false))
+ if (strpos($word, "@") > 0 && $word[strlen($word)-1] != '"')
{
$word = preg_replace('/^<|>$/', '', trim($word));
if (in_array($word, $addresses)===false)
@@ -405,5 +423,3 @@
}
}
-
-?>
--
Gitblit v1.9.1