Adding durafmt library and use it from enterprise global relay export (#8487)

* Adding durafmt library and use it from enterprise global relay export

* Allow to specify different server host and server name on smtp connections

* Fixing utils/smtp tests

2 files changed, 4 insertions, 4 deletions

diff --git a/templates/globalrelay_compliance_export.html b/templates/globalrelay_compliance_export.html
index 91028d11c..da93f887c 100644
--- a/templates/globalrelay_compliance_export.html
+++ b/templates/globalrelay_compliance_export.html
@@ -65,7 +65,7 @@
         <li><span class="bold">Channel:&nbsp;</span>{{.Props.ChannelName}}</li>
         <li><span class="bold">Started:&nbsp;</span>{{.Props.Started}}</li>
         <li><span class="bold">Ended:&nbsp;</span>{{.Props.Ended}}</li>
-        <li><span class="bold">Duration:&nbsp;</span>{{.Props.Duration}}&nbsp;Minutes</li>
+        <li><span class="bold">Duration:&nbsp;</span>{{.Props.Duration}}</li>
     </ul>
 </div>
 <table class="participants">
@@ -88,4 +88,4 @@
 </div>
 
 <p>Exported on {{.Props.ExportDate}}</p>
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/templates/globalrelay_compliance_export_participant_row.html b/templates/globalrelay_compliance_export_participant_row.html
index 7a61e23eb..554c47c16 100644
--- a/templates/globalrelay_compliance_export_participant_row.html
+++ b/templates/globalrelay_compliance_export_participant_row.html
@@ -4,7 +4,7 @@
     <td class="email">{{.Props.Email}}</td>
     <td class="joined">{{.Props.Joined}}</td>
     <td class="left">{{.Props.Left}}</td>
-    <td class="duration">{{.Props.DurationMinutes}} Minutes</td>
+    <td class="duration">{{.Props.Duration}}</td>
     <td class="messages">{{.Props.NumMessages}}</td>
 </tr>
-{{end}}
\ No newline at end of file
+{{end}}