MS send

App/DigitalData.EMLProfiler/ClassCurrent.vb

@@ -36,6 +36,7 @@ Public Class ClassCurrent
     Public Shared CURRENT_MAIL_BODY_ANSWER1 As String = ""
     Public Shared CURRENT_MAIL_BODY_Substr2 As String = ""
     Public Shared CURRENT_MAIL_SUBJECT As String = ""
+    Public Shared CURRENT_MAIL_FROM As String = ""
     Public Shared CURRENT_MAIL_PROCESS_NAME As String
 
     Public Shared CURRENT_POLL_TYPE As String

App/DigitalData.EMLProfiler/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.1.0.0")>
+<Assembly: AssemblyVersion("1.2.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.xml

@@ -71,10 +71,11 @@ DigitalData.Modules.Database
  <summary>
  
  </summary>
- <param name="Datasource"></param>
- <param name="Database"></param>
- <param name="User"></param>
- <param name="Password"></param>
+ <param name="LogConfig">The LogFactory containing the current log config. Used to instanciate the class logger for this and any dependent class</param>
+ <param name="Datasource">The server where the database lives, for example 127.0.0.1 or dd-vmx09-vm03</param>
+ <param name="Database">The location of the Database in the format `127.0.0.1:E:\Path\To\Database.FDB`</param>
+ <param name="User">The user name to connect as</param>
+ <param name="Password">The user's password</param>
  <exception cref="T:DigitalData.Modules.Database.Exceptions.DatabaseException"></exception>
 </member>
 <member name="M:DigitalData.Modules.Database.Firebird.GetConnectionString(System.String,System.String,System.String,System.String)">
@@ -172,7 +173,7 @@ DigitalData.Modules.Database
  Returns a datatable for a sql-statement 
  </summary>
  <param name="sqlcommand">sqlcommand for datatable (select XYZ from TableORView)</param>
- <param name="commandtimeout">Optional Timeout</param>
+ <param name="Timeout">Optional Timeout</param>
  <returns>Returns a datatable</returns>
  <remarks></remarks>
 </member>
@@ -181,7 +182,16 @@ DigitalData.Modules.Database
  Executes the passed sql-statement 
  </summary>
  <param name="executeStatement">the sql statement</param>
- <param name="commandtimeout">Optional Timeout</param>
+ <param name="Timeout">Optional Timeout</param>
+ <returns>Returns true if properly executed, else false</returns>
+ <remarks></remarks>
+</member>
+<member name="M:DigitalData.Modules.Database.MSSQLServer.NewExecuteScalar(System.String,System.Int32)">
+ <summary>
+ Executes the passed sql-statement as Scalar
+ </summary>
+ <param name="ScalarSQL">the sql statement</param>
+ <param name="Timeout">Optional Timeout</param>
  <returns>Returns true if properly executed, else false</returns>
  <remarks></remarks>
 </member>
@@ -193,14 +203,5 @@ DigitalData.Modules.Database
  <param name="commandtimeout">Optional Timeout</param>
  <remarks></remarks>
 </member>
-<member name="M:DigitalData.Modules.Database.MSSQLServer.NewExecuteScalar(System.String,System.Int32)">
- <summary>
- Executes the passed sql-statement as Scalar
- </summary>
- <param name="executeStatement">the sql statement</param>
- <param name="commandtimeout">Optional Timeout</param>
- <returns>Returns true if properly executed, else false</returns>
- <remarks></remarks>
-</member>
 </members>
 </doc>

App/DigitalData.EMLProfiler/clsEmail.vb

@@ -191,23 +191,24 @@ Public Class clsEmail
                     Try
                         client.Connect()
                     Catch ex As Exception
-                        Logger.Warn("clsEmail.Client.Connect: " & ex.Message)
+                        Logger.Warn("clsEmail.Client.Connect1: " & ex.Message)
+                        Logger.Debug("Error in ClientConnect - but still trying to send")
                         _error = True
                         ' Continue For
                     End Try
-                    Logger.Info("Connected to Client!")
+                    Logger.Debug("Connected to Client!")
                     If AUTH_TYPE = "SSL" Then
                         client.EnableSsl = True
                         'client.ValidateRemoteCertificate = True
-                        Logger.Info("Authentification via SSL.")
+                        Logger.Debug("Authentification via SSL.")
                     ElseIf AUTH_TYPE = "TLS" Then
                         ' client.ValidateRemoteCertificate = False
                         client.StartTls()
                         client.EnableSsl = False
-                        Logger.Info("Authentification via TLS. SSL disabled")
+                        Logger.Debug("Authentification via TLS. SSL disabled")
                     Else
                         client.EnableSsl = False
-                        Logger.Info("Authentification NONE. SSL disabled")
+                        Logger.Debug("Authentification NONE. SSL disabled")
                     End If
                     Try
 
@@ -224,7 +225,7 @@ Public Class clsEmail
                             client.Login(mailUser, mailPW)
                         End If
 
-                        Logger.Info("Logged in!")
+                        Logger.Debug("Logged in!")
                     Catch ex As Exception
                         Try
                             If mailsmtp.Contains("office365.com") Then

App/DigitalData.EMLProfiler/clsWorkEmail.vb

@@ -47,6 +47,8 @@ Public Class clsWorkEmail
                 CURRENT_MAIL_SUBJECT = ""
             End If
 
+            CURRENT_MAIL_FROM = msg.From.EmailAddress
+
             Dim oTempMailExists As Boolean = SAVE2TEMP()
             'Checking wether Mail can be opened
             Dim oTempMailAccessible As Boolean = False
@@ -138,12 +140,15 @@ Public Class clsWorkEmail
             Dim oDel_email As Boolean = False
             Logger.Info(String.Format("COMMON_EMAIL_IN...Subject [{0}]", CURRENT_MAIL_MESSAGE.Subject))
             Logger.Debug(String.Format("COMMON_EMAIL_IN...Subject [{0}]", CURRENT_MAIL_MESSAGE.Subject))
-            Dim oExpression = "PROCESS_NAME = 'Attachment Sniffer'"
-            CURRENT_MAIL_PROCESS_NAME = "Attachment Sniffer"
+            Dim oExpression = "PROCESS_NAME = 'Attachment Sniffer' or PROCESS_NAME = 'ZugFeRD-Parser'"
+
             'Filter the rows using Select() method of DataTable
             Dim TEMP_PROCESS_PROFILE_DT As DataTable = DT_POLL_PROCESS
             Dim PM_ROW As DataRow() = TEMP_PROCESS_PROFILE_DT.Select(oExpression)
+
             For Each oDataRow As DataRow In PM_ROW
+                oDel_email = oDataRow("DELETE_MAIL")
+                CURRENT_MAIL_PROCESS_NAME = oDataRow.Item("PROCESS_NAME")
                 Try
                     WM_REFERENCE_INDEX = oDataRow("WM_REFERENCE_INDEX")
                 Catch ex As Exception
@@ -161,8 +166,7 @@ Public Class clsWorkEmail
 
                 COPY2HDD(oDataRow("COPY_2_HDD"), oDataRow("PATH_ORIGINAL"), oDataRow("PATH_EMAIL_ERRORS"), True)
                 EXTRACT_ATTACHMENTS(oDataRow("PATH_EMAIL_TEMP"), oDataRow("PATH_EMAIL_ERRORS"))
-                'EXTRACT_BODY()
-                oDel_email = oDataRow("DELETE_MAIL")
+
             Next
             If ClassCurrent.CURRENT_DEBUG_LOCAL_EMAIL = "" Then
                 EMAIL_DELETE(oDel_email)
@@ -445,7 +449,7 @@ Public Class clsWorkEmail
                     oMSGID = oMSGID.Replace(">", "").Replace("<", "")
                     For Each oAttachment As Attachment In oCurrentMail.GetAttachments
                         Dim oAttachmentFileString
-                        Logger.Debug(String.Format("Working on Attachment [{0}]", oAttachment.GetFileName))
+                        Logger.Debug(String.Format(" Working on Attachment [{0}]", oAttachment.GetFileName))
                         Try
                             Dim oFilename = oAttachment.GetFileName
                             oFilename = CleanInput(oFilename)
@@ -507,14 +511,15 @@ Public Class clsWorkEmail
 
     Private Function INSERT_HISTORY()
         If MessageError = False Then
-            Dim ins = $"INSERT INTO TBEMLP_HISTORY (WORK_PROCESS,EMAIL_MSGID,EMAIL_SUBJECT,EMAIL_DATE,EMAIL_BODY,EMAIL_SUBSTRING1,EMAIL_SUBSTRING2) VALUES " &
+            Dim ins = $"INSERT INTO TBEMLP_HISTORY (WORK_PROCESS,EMAIL_MSGID,EMAIL_SUBJECT,EMAIL_DATE,EMAIL_BODY,EMAIL_SUBSTRING1,EMAIL_SUBSTRING2,EMAIL_FROM) VALUES " &
       $"('{CURRENT_MAIL_PROCESS_NAME}'," &
       $"'{CURRENT_MAIL_MESSAGE.MessageID.Replace("<", "").Replace(">", "")}'," &
       $"'{CURRENT_MAIL_MESSAGE.Subject}'," &
       $"'{CURRENT_MAIL_MESSAGE.Date}'," &
       $"'{CURRENT_MAIL_BODY_ALL}'," &
       $"'{CURRENT_MAIL_BODY_ANSWER1}'," &
-      $"'{CURRENT_MAIL_BODY_Substr2}')"
+      $"'{CURRENT_MAIL_BODY_Substr2}'," &
+      $"'{CURRENT_MAIL_FROM}')"
             _Database.Execute_non_Query(ins)
 
         End If

App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbproj.FileListAbsolute.txt

@@ -21,7 +21,6 @@ E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin
 E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\NLog.xml
 E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\S22.Imap.xml
 E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\FirebirdSql.Data.FirebirdClient.pdb
-E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbprojAssemblyReference.cache
 E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.Resources.resources
 E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.GenerateResource.cache
 E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.CoreCompileInputs.cache