From 346f8e0dd979482fb6b3d002834f3b3e45024751 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 24 Jul 2019 16:04:40 -0400
Subject: [PATCH] Make server name configurable in Mailer.

---
 config/vufind/config.ini                    | 2 ++
 module/VuFind/src/VuFind/Mailer/Factory.php | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/config/vufind/config.ini b/config/vufind/config.ini
index 8c0b77fc20e..9b6660da687 100644
--- a/config/vufind/config.ini
+++ b/config/vufind/config.ini
@@ -499,6 +499,8 @@ host            = localhost
 port            = 25
 ;username       = user
 ;password       = pass
+; The server name to report to the upstream mail server when sending mail.
+;name = vufind.myuniversity.edu
 ; If a login is required you can define which protocol to use for securing the
 ; connection. If no explicit protocol ('tls' or 'ssl') is configured, a protocol
 ; based on the configured port is chosen (587 -> tls, 487 -> ssl).
diff --git a/module/VuFind/src/VuFind/Mailer/Factory.php b/module/VuFind/src/VuFind/Mailer/Factory.php
index 3359da67c3f..ac139c6d858 100644
--- a/module/VuFind/src/VuFind/Mailer/Factory.php
+++ b/module/VuFind/src/VuFind/Mailer/Factory.php
@@ -64,6 +64,9 @@ class Factory implements FactoryInterface
         $settings = [
             'host' => $config->Mail->host, 'port' => $config->Mail->port
         ];
+        if (isset($config->Mail->name)) {
+            $settings['name'] = $config->Mail->name;
+        }
         if (isset($config->Mail->username) && isset($config->Mail->password)) {
             $settings['connection_class'] = 'login';
             $settings['connection_config'] = [
-- 
GitLab