SmtpMailer: allow setting the client name through config (#46)

Author: janbuchar

src/Bridges/MailDI/MailExtension.php

@@ -26,6 +26,7 @@ class MailExtension extends Nette\DI\CompilerExtension
 		'secure' => null,
 		'timeout' => null,
 		'context' => null,
+		'clientHost' => null,
 	];
 
 

src/Mail/SmtpMailer.php

@@ -46,6 +46,9 @@ class SmtpMailer implements IMailer
 	/** @var bool */
 	private $persistent;
 
+	/** @var string */
+	private $clientHost;
+
 
 	public function __construct(array $options = [])
 	{
@@ -65,6 +68,13 @@ public function __construct(array $options = [])
 			$this->port = $this->secure === 'ssl' ? 465 : 25;
 		}
 		$this->persistent = !empty($options['persistent']);
+		if (isset($options['clientHost'])) {
+			$this->clientHost = $options['clientHost'];
+		} else {
+			$this->clientHost = isset($_SERVER['HTTP_HOST']) && preg_match('#^[\w.-]+\z#', $_SERVER['HTTP_HOST'])
+				? $_SERVER['HTTP_HOST']
+				: 'localhost';
+		}
 	}
 
 
@@ -130,19 +140,18 @@ protected function connect(): void
 		stream_set_timeout($this->connection, $this->timeout, 0);
 		$this->read(); // greeting
 
-		$self = isset($_SERVER['HTTP_HOST']) && preg_match('#^[\w.-]+\z#', $_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
-		$this->write("EHLO $self");
+		$this->write("EHLO $this->clientHost");
 		$ehloResponse = $this->read();
 		if ((int) $ehloResponse !== 250) {
-			$this->write("HELO $self", 250);
+			$this->write("HELO $this->clientHost", 250);
 		}
 
 		if ($this->secure === 'tls') {
 			$this->write('STARTTLS', 220);
 			if (!stream_socket_enable_crypto($this->connection, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
 				throw new SmtpException('Unable to connect via TLS.');
 			}
-			$this->write("EHLO $self", 250);
+			$this->write("EHLO $this->clientHost", 250);
 		}
 
 		if ($this->username != null && $this->password != null) {