From 4beff2f34d89a40a14579ef4d3a034f3d88b7f9a Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Wed, 2 Nov 2022 13:00:44 +0100
Subject: [PATCH] Fix subject with single quotes

---
 App/DigitalData.EMLProfiler/clsEmail.IMAP.vb | 5 ++++-
 App/DigitalData.EMLProfiler/clsWorkEmail.vb  | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb b/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb
index 9f6a744..0c4dff8 100644
--- a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb
+++ b/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb
@@ -26,6 +26,7 @@ Public Class clsEmailIMAP
             oListuids = _limilab.IMAPGetMessageIDs_AllMails()
 
             If IsNothing(oListuids) Then
+                Logger.Warn("List of UIDs was Nothing. Returning False.")
                 Return False
             Else
                 If oListuids.Count > 0 Then
@@ -35,8 +36,10 @@ Public Class clsEmailIMAP
                 Else
                     Logger.Debug("FetchIMAPMessagesLimilab - No Emails found!")
                 End If
+
+                Return True
             End If
-            Return True
+
         Catch ex As Exception
             Logger.Error(ex)
             Return False
diff --git a/App/DigitalData.EMLProfiler/clsWorkEmail.vb b/App/DigitalData.EMLProfiler/clsWorkEmail.vb
index 049ad94..890f19a 100644
--- a/App/DigitalData.EMLProfiler/clsWorkEmail.vb
+++ b/App/DigitalData.EMLProfiler/clsWorkEmail.vb
@@ -66,7 +66,7 @@ Public Class clsWorkEmail
             CURRENT_MAIL_BODY_ANSWER1 = ""
             CURRENT_MAIL_BODY_Substr2 = ""
             CURRENT_MAIL_MESSAGE = MyEmailMessage
-            CURRENT_MAIL_SUBJECT = MyEmailMessage.Subject.ToUpper
+            CURRENT_MAIL_SUBJECT = MyEmailMessage.Subject.ToUpper.Replace("'", "''")
             CURRENT_MAIL_MESSAGE_ID = RemoveIllegalFileNameChars(MyEmailMessage.MessageID)
             CURRENT_MAIL_UID = poUID
 
@@ -184,7 +184,7 @@ Public Class clsWorkEmail
             Dim oCreatedWho = "DDEmailProfiler"
 
             Dim oMaskedBodyText = BodyText.Replace("'", "''")
-            Dim oSubjectBodyText = String.Format(EmailStrings.EMAIL_SUBJECT_TEXT, CURRENT_MAIL_SUBJECT).Replace("'", "''")
+            Dim oSubjectBodyText = String.Format(EmailStrings.EMAIL_SUBJECT_TEXT, CURRENT_MAIL_SUBJECT)
             Dim oCompleteBodyText = oMaskedBodyText & oSubjectBodyText
 
             Dim oFinalBodyText = String.Format(EmailStrings.EMAIL_WRAPPING_TEXT, oCompleteBodyText)
@@ -814,8 +814,8 @@ Public Class clsWorkEmail
             Logger.Error(ex)
             Return False
         End Try
-
     End Function
+
     Private Function INSERT_HISTORY_ATTMT_MSSQL(oMSGID As String, ATTMT1 As String)
         If IsNothing(_DB_MSSQL) Then
             Logger.Info("INSERT_HISTORY_FB: _DB_MSSQL is nothing ")
@@ -827,7 +827,7 @@ Public Class clsWorkEmail
           $"('{CURRENT_MAIL_PROCESS_NAME}'," &
           $"'{oMSGID}'," &
           $"'{CURRENT_MAIL_FROM}'," &
-          $"'{CURRENT_MAIL_MESSAGE.Subject.Replace("'", "''")}'," &
+          $"'{CURRENT_MAIL_SUBJECT}'," &
           $"'{CURRENT_MAIL_MESSAGE.Date}'," &
           $"'{CURRENT_MAIL_BODY_ALL}'," &
           $"'{ATTMT1}')"