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

nette · Sep 13, 2017 · f3bc518 · f3bc518
1 parent 707fe7d
commit f3bc518
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Bridges/MailDI/MailExtension.php b/src/Bridges/MailDI/MailExtension.php
@@ -19,6 +19,7 @@ class MailExtension extends Nette\DI\CompilerExtension
 {
 	public $defaults = [
 		'smtp' => false,
+		'clientHostname' => null,
 		'host' => null,
 		'port' => null,
 		'username' => null,

diff --git a/src/Mail/SmtpMailer.php b/src/Mail/SmtpMailer.php
@@ -18,6 +18,9 @@
 class SmtpMailer implements IMailer
 {
 	use Nette\SmartObject;
+
+	/** @var string */
+	private $clientHostname;
 
 	/** @var resource */
 	private $connection;
@@ -56,6 +59,7 @@ public function __construct(array $options = [])
 			$this->host = ini_get('SMTP');
 			$this->port = (int) ini_get('smtp_port');
 		}
+		$this->clientHostname = isset($options['clientHostname']) ? $options['clientHostname'] : null;
 		$this->username = $options['username'] ?? '';
 		$this->password = $options['password'] ?? '';
 		$this->secure = $options['secure'] ?? '';
@@ -130,7 +134,13 @@ 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';
+		$self = $this->clientHostname;
+		if ($self === null) {
+			$self = isset($_SERVER['HTTP_HOST']) && preg_match('#^[\w.-]+\z#', $_SERVER['HTTP_HOST'])
+				? $_SERVER['HTTP_HOST']
+				: 'localhost';
+		}
+
 		$this->write("EHLO $self");
 		$ehloResponse = $this->read();
 		if ((int) $ehloResponse !== 250) {