From d1d3f4f73d91bee10c5f20422a77573cd59d93e1 Mon Sep 17 00:00:00 2001
From: "Mark H. Wood" <mwood@IUPUI.Edu>
Date: Wed, 5 Feb 2020 10:40:53 -0500
Subject: [PATCH] [DS-4118] Make new helpdesk phone property optional and give
 it a better name.

---
 dspace/config/dspace.cfg             | 4 ++--
 dspace/config/emails/change_password | 8 +++++++-
 dspace/config/emails/register        | 8 +++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg
index 3a8f89a62fc4..f73f88dcbe4e 100644
--- a/dspace/config/dspace.cfg
+++ b/dspace/config/dspace.cfg
@@ -182,8 +182,8 @@ mail.allowed.referrers = ${dspace.hostname}
 mail.message.headers = subject
 mail.message.headers = charset
 
-# Helpdesk telephone.  Not email, but should be with other contact info.
-telephone.helpdesk = +1 555 555 5555
+# Helpdesk telephone.  Not email, but should be with other contact info.  Optional.
+#mail.message.helpdesk.telephone = +1 555 555 5555
 
 ##### Asset Storage (bitstreams / files) ######
 # Moved to config/spring/api/bitstore.xml
diff --git a/dspace/config/emails/change_password b/dspace/config/emails/change_password
index 93778641e78c..eb114feeeb0c 100644
--- a/dspace/config/emails/change_password
+++ b/dspace/config/emails/change_password
@@ -5,12 +5,18 @@
 ## See org.dspace.core.Email for information on the format of this file.
 ##
 #set($subject = 'Change Password Request')
+#set($phone = ${config.get('mail.message.helpdesk.telephone')})
 To change the password for your DSpace account, please click the link
 below:
 
   ${params[0]}
 
 If you need assistance with your account, please email
-${config.get("mail.helpdesk")} or call us at ${config.get("telephone.helpdesk")}.
+
+  ${config.get("mail.helpdesk")}
+#if( $phone )
+
+or call us at ${phone}.
+#end
 
 The DSpace Team
diff --git a/dspace/config/emails/register b/dspace/config/emails/register
index 331015dc1679..694be449a887 100644
--- a/dspace/config/emails/register
+++ b/dspace/config/emails/register
@@ -5,12 +5,18 @@
 ## See org.dspace.core.Email for information on the format of this file.
 ##
 #set($subject = "${config.get('dspace.name')} Account Registration")
+#set($phone = ${config.get('mail.message.helpdesk.telephone')})
 To complete registration for a DSpace account, please click the link
 below:
 
   ${params[0]}
 
 If you need assistance with your account, please email
-${config.get("mail.helpdesk")} or call us at ${config.get("telephone.helpdesk")}.
+
+  ${config.get("mail.helpdesk")}
+#if( $phone )
+
+or call us at ${phone}.
+#end
 
 The DSpace Team