[DS-4118] Make new helpdesk phone property optional and give it a bet…

…ter name.

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

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

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