diff options
| author | yehudah <yehudah@b8457f37-d9ea-0310-8a92-e5e31aec5664> | 2018-03-04 22:43:20 +0000 |
|---|---|---|
| committer | yehudah <yehudah@b8457f37-d9ea-0310-8a92-e5e31aec5664> | 2018-03-04 22:43:20 +0000 |
| commit | 4d764b4df29b9031e6e21036c8880703804b7e58 (patch) | |
| tree | 194e4d3ee68d587caec49a4c4672d4c57c2303a0 /Postman/Postman-Mail/Zend-1.12.10 | |
| parent | 437ff5566028c456b39fd96ff988a649edd46063 (diff) | |
| download | Post-SMTP-4d764b4df29b9031e6e21036c8880703804b7e58.zip | |
* sendgrid 6
* mail params
* email log send to column
* hostname insted of ip in emails
* remove mailgun test folder ( virustotal issue)
* added filters to from_name and from_email filters (local connection)
* change hostname extrect loginc
Diffstat (limited to 'Postman/Postman-Mail/Zend-1.12.10')
| -rw-r--r-- | Postman/Postman-Mail/Zend-1.12.10/Mail.php | 4 | ||||
| -rw-r--r-- | Postman/Postman-Mail/Zend-1.12.10/Mail/Protocol/Smtp.php | 2 | ||||
| -rw-r--r-- | Postman/Postman-Mail/Zend-1.12.10/Mail/Transport/Smtp.php | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Postman/Postman-Mail/Zend-1.12.10/Mail.php b/Postman/Postman-Mail/Zend-1.12.10/Mail.php index 437e0fa..b2204f7 100644 --- a/Postman/Postman-Mail/Zend-1.12.10/Mail.php +++ b/Postman/Postman-Mail/Zend-1.12.10/Mail.php @@ -1176,7 +1176,9 @@ class Postman_Zend_Mail extends Postman_Zend_Mime_Message if ($transport === null) { if (! self::$_defaultTransport instanceof Postman_Zend_Mail_Transport_Abstract) { require_once 'Zend/Mail/Transport/Sendmail.php'; - $transport = new Postman_Zend_Mail_Transport_Sendmail(); + + $replyTo = self::getDefaultReplyTo(); + $transport = new Postman_Zend_Mail_Transport_Sendmail("-f{$replyTo['email']}"); } else { $transport = self::$_defaultTransport; } diff --git a/Postman/Postman-Mail/Zend-1.12.10/Mail/Protocol/Smtp.php b/Postman/Postman-Mail/Zend-1.12.10/Mail/Protocol/Smtp.php index a6ebbd5..b71ff10 100644 --- a/Postman/Postman-Mail/Zend-1.12.10/Mail/Protocol/Smtp.php +++ b/Postman/Postman-Mail/Zend-1.12.10/Mail/Protocol/Smtp.php @@ -205,7 +205,7 @@ class Postman_Zend_Mail_Protocol_Smtp extends Postman_Zend_Mail_Protocol_Abstrac $this->_expect(220, 180); stream_context_set_option($this->_socket, 'ssl', 'verify_peer', false); - //stream_context_set_option($this->_socket, 'ssl', 'verify_peer_name', false); + stream_context_set_option($this->_socket, 'ssl', 'verify_peer_name', false); stream_context_set_option($this->_socket, 'ssl', 'allow_self_signed', true); if (!stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) { diff --git a/Postman/Postman-Mail/Zend-1.12.10/Mail/Transport/Smtp.php b/Postman/Postman-Mail/Zend-1.12.10/Mail/Transport/Smtp.php index e47357a..42004a4 100644 --- a/Postman/Postman-Mail/Zend-1.12.10/Mail/Transport/Smtp.php +++ b/Postman/Postman-Mail/Zend-1.12.10/Mail/Transport/Smtp.php @@ -120,7 +120,7 @@ class Postman_Zend_Mail_Transport_Smtp extends Postman_Zend_Mail_Transport_Abstr if (isset($config['name'])) { $this->_name = $config['name']; } else { - $this->_name = PostmanUtils::getServerIp(); + $this->_name = PostmanUtils::getServerName(); } if (isset($config['port'])) { |