Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator

EnvelopeGenerator.Common/Entities/EmailData.vb

@@ -31,7 +31,7 @@ Public Class EmailData
         EmailSubject = String.Empty
         EmailType = pStatus
 
-        Message = pEnvelope.Message
+        Message = TextToHtml(pEnvelope.Message)
         ReferenceID = pEnvelope.Id
         ReferenceString = pEnvelope.Uuid
         ReceiverName = pReceiver.Name
@@ -40,6 +40,22 @@ Public Class EmailData
         SenderName = pEnvelope.User.FullName
         EnvelopeTitle = pEnvelope.Title
     End Sub
+    Public Function TextToHtml(input As String) As String
+        If String.IsNullOrEmpty(input) Then Return ""
+
+        ' HTML-Encodierung der Sonderzeichen
+        Dim encoded As String = System.Net.WebUtility.HtmlEncode(input)
+
+        ' Tabs in   umwandeln (z.B. 4 non-breaking spaces)
+        encoded = encoded.Replace(vbTab, "    ")
+
+        ' Zeilenumbrüche in <br /> umwandeln
+        encoded = encoded.Replace(vbCrLf, "<br />") ' Windows
+        encoded = encoded.Replace(vbCr, "<br />")   ' Mac alt
+        encoded = encoded.Replace(vbLf, "<br />")   ' Unix/Linux
+
+        Return encoded
+    End Function
 
     ''' <summary>
     ''' Constructor for sending email to creator

EnvelopeGenerator.Common/Models/ReceiverModel.vb

@@ -57,7 +57,8 @@ Public Class ReceiverModel
 
     Public Function Insert(pReceiver As EnvelopeReceiver, pTransaction As SqlTransaction) As Boolean
         Try
-            Dim oCheck = $"SELECT COUNT(GUID) FROM [dbo].[TBSIG_RECEIVER] WHERE SIGNATURE = '{pReceiver.GetSignature()}'"
+            Dim oSignature As String = pReceiver.GetSignature()
+            Dim oCheck = $"SELECT COUNT(GUID) FROM [dbo].[TBSIG_RECEIVER] WHERE SIGNATURE = '{oSignature}'"
             Dim oExists = Database.GetScalarValue(oCheck)
 
             If oExists = 0 Then
@@ -77,7 +78,7 @@ Public Class ReceiverModel
                     Return False
                 End If
             Else
-                Logger.Warn($"Receiver [{pReceiver.Email}] already existing! Check collecting not existing Receivers!")
+                Logger.Warn($"Receiver [{pReceiver.Email}] already existing! SignatureID: {oSignature} Check SQL {oCheck}")
                 Return True
             End If
         Catch ex As Exception

EnvelopeGenerator.Common/Models/UserModel.vb

@@ -70,9 +70,9 @@ Public Class UserModel
         End Try
     End Function
 
-    Public Function SelectUserId() As Integer
+    Public Function SelectUserId(oUserName As String) As Integer
         Try
-            Dim oUserId As Integer = Database.GetScalarValue($"SELECT GUID FROM TBDD_USER WHERE USERNAME = '{Environment.UserName}'")
+            Dim oUserId As Integer = Database.GetScalarValue($"SELECT GUID FROM TBDD_USER WHERE USERNAME = '{oUserName}'")
             Return oUserId
 
         Catch ex As Exception

EnvelopeGenerator.Common/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.4.2.0")>
-<Assembly: AssemblyFileVersion("2.4.2.0")>
+<Assembly: AssemblyVersion("2.4.3.0")>
+<Assembly: AssemblyFileVersion("2.4.3.0")>