diff --git a/App/.vs/SERV_EMAIL/DesignTimeBuild/.dtbcache b/App/.vs/SERV_EMAIL/DesignTimeBuild/.dtbcache index 4bc3b0c..b723959 100644 Binary files a/App/.vs/SERV_EMAIL/DesignTimeBuild/.dtbcache and b/App/.vs/SERV_EMAIL/DesignTimeBuild/.dtbcache differ diff --git a/App/.vs/SERV_EMAIL/v15/.suo b/App/.vs/SERV_EMAIL/v15/.suo index 71c59af..0c180c0 100644 Binary files a/App/.vs/SERV_EMAIL/v15/.suo and b/App/.vs/SERV_EMAIL/v15/.suo differ diff --git a/App/CONFIG_APP/bin/Debug/CONFIG_APP.exe b/App/CONFIG_APP/bin/Debug/CONFIG_APP.exe index 8457403..b5374be 100644 Binary files a/App/CONFIG_APP/bin/Debug/CONFIG_APP.exe and b/App/CONFIG_APP/bin/Debug/CONFIG_APP.exe differ diff --git a/App/CONFIG_APP/bin/Debug/CONFIG_APP.pdb b/App/CONFIG_APP/bin/Debug/CONFIG_APP.pdb index 15ed4a1..3a4c9d1 100644 Binary files a/App/CONFIG_APP/bin/Debug/CONFIG_APP.pdb and b/App/CONFIG_APP/bin/Debug/CONFIG_APP.pdb differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.dll b/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.dll index bfd034e..0306519 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.dll and b/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.dll differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.pdb b/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.pdb index 25bfe12..a9d051b 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.pdb and b/App/CONFIG_APP/bin/Debug/DigitalData.EMLProfiler.pdb differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.dll b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.dll index 944e4fb..147d72b 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.dll and b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.dll differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.pdb b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.pdb index f1a5740..34314de 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.pdb and b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Database.pdb differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.dll b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.dll index 2cc7b06..0e444a5 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.dll and b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.dll differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.pdb b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.pdb index 8fd5d3b..4cea7a0 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.pdb and b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Logging.pdb differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.dll b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.dll index 94c39b8..2f517c1 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.dll and b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.dll differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.pdb b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.pdb index f2c0e86..0352f04 100644 Binary files a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.pdb and b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.pdb differ diff --git a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.xml b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.xml index 0f06d0f..d3042d0 100644 --- a/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.xml +++ b/App/CONFIG_APP/bin/Debug/DigitalData.Modules.Messaging.xml @@ -53,5 +53,11 @@ DigitalData.Modules.Messaging May break in future versions of .NET + + + A Simple EventBus for .NET + https://stackoverflow.com/questions/368265/a-simple-event-bus-for-net + + diff --git a/App/CONFIG_APP/frmMain.Designer.vb b/App/CONFIG_APP/frmMain.Designer.vb index f280a39..9e9b925 100644 --- a/App/CONFIG_APP/frmMain.Designer.vb +++ b/App/CONFIG_APP/frmMain.Designer.vb @@ -348,6 +348,7 @@ Partial Class frmMain Me.TBEMLP_HISTORYTableAdapter = New CONFIG_APP.MyDatasetTableAdapters.TBEMLP_HISTORYTableAdapter() Me.TBEMLP_CONFIGTableAdapter = New CONFIG_APP.MyDatasetTableAdapters.TBEMLP_CONFIGTableAdapter() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() + Me.Button7 = New System.Windows.Forms.Button() GUIDLabel = New System.Windows.Forms.Label() PROFILE_NAMELabel = New System.Windows.Forms.Label() POLL_TYPELabel = New System.Windows.Forms.Label() @@ -2950,6 +2951,7 @@ Partial Class frmMain ' 'GroupBox5 ' + Me.GroupBox5.Controls.Add(Me.Button7) Me.GroupBox5.Controls.Add(Me.chkS22) Me.GroupBox5.Controls.Add(Me.Label16) Me.GroupBox5.Controls.Add(Me.Button1) @@ -2959,7 +2961,7 @@ Partial Class frmMain Me.GroupBox5.Controls.Add(Me.txtInboxname) Me.GroupBox5.Location = New System.Drawing.Point(374, 319) Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(457, 100) + Me.GroupBox5.Size = New System.Drawing.Size(556, 100) Me.GroupBox5.TabIndex = 76 Me.GroupBox5.TabStop = False Me.GroupBox5.Text = "IMAP Test" @@ -3576,6 +3578,15 @@ Partial Class frmMain ' Me.TBEMLP_CONFIGTableAdapter.ClearBeforeFill = True ' + 'Button7 + ' + Me.Button7.Location = New System.Drawing.Point(416, 20) + Me.Button7.Name = "Button7" + Me.Button7.Size = New System.Drawing.Size(140, 59) + Me.Button7.TabIndex = 77 + Me.Button7.Text = "Set to SEEN (Email must contain ""seen"" in Subject" + Me.Button7.UseVisualStyleBackColor = True + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3934,4 +3945,5 @@ Partial Class frmMain Friend WithEvents Label16 As Label Friend WithEvents chkDeleteMail As CheckBox Friend WithEvents chkS22 As CheckBox + Friend WithEvents Button7 As Button End Class diff --git a/App/CONFIG_APP/frmMain.resx b/App/CONFIG_APP/frmMain.resx index 60a8340..353f785 100644 --- a/App/CONFIG_APP/frmMain.resx +++ b/App/CONFIG_APP/frmMain.resx @@ -304,6 +304,82 @@ nRg7L/M8pziOWYAVBu8cdfSxgesVgiCgzWZLz8fTMABHHnX0cbOCMQfIRVFEt/LOgChNU14lJ7/UScxA AQ3Y6Xg4saCqHryCI/+TwTf8uQFu2SUS6FdwhSroObCNwI056As1UKFq0JNooZtEz3sBIUpmhmW9bzQA AAAASUVORK5CYII= + + + + 1209, 17 + + + 1297, 95 + + + 777, 95 + + + 1079, 134 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ + Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ + /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA + zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ + IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E + rkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC + rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV + i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG + 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG + QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX + bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== @@ -312,6 +388,9 @@ 404, 17 + + 404, 17 + 777, 95 @@ -382,6 +461,18 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + 17, 56 + + + 1175, 56 + + + 17, 95 + + + 171, 56 + 171, 56 @@ -455,6 +546,9 @@ 691, 56 + + 691, 56 + 1175, 56 @@ -525,6 +619,9 @@ 171, 95 + + 171, 95 + 17, 95 @@ -595,6 +692,9 @@ 467, 134 + + 467, 134 + 17, 134 @@ -639,73 +739,6 @@ kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - 1079, 134 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC - pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ - Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ - /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA - zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ - IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E - rkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC - DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC - rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV - i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG - 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG - QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX - bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== diff --git a/App/CONFIG_APP/frmMain.vb b/App/CONFIG_APP/frmMain.vb index 87acb90..1bf1f37 100644 --- a/App/CONFIG_APP/frmMain.vb +++ b/App/CONFIG_APP/frmMain.vb @@ -273,7 +273,27 @@ Public Class frmMain Dim _work As New clsWorker(MyLogger, _SQLServerConString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, _Localemail) _work.Start_WorkingProfiles(True) End If + Try + 'Delete all Tempfiles + For Each _file In ClassCurrent.TEMP_FILES + System.IO.File.Delete(_file) + Next + Try + Dim oDiTempPath As New IO.DirectoryInfo(System.IO.Path.GetTempPath) + Dim oaryFi As IO.FileInfo() = oDiTempPath.GetFiles() + Dim ofi As IO.FileInfo + For Each fi In oaryFi + fi.Delete() + Next + Catch ex As Exception + If MyLogger.Debug = True Then + Logger.Warn($"Could not delete the tempfile: {ex.Message}") + End If + End Try + Catch ex As Exception + + End Try End Sub Private Sub BackgroundWorker1_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles BackgroundWorker1.RunWorkerCompleted @@ -838,4 +858,21 @@ Public Class frmMain Private Sub chkS22_CheckedChanged(sender As Object, e As EventArgs) Handles chkS22.CheckedChanged End Sub + + Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click + My.Settings.Save() + Dim PWPlain = _Encryption.DecryptData(EMAIL_PWTextBox.Text) + 'Logger.Debug($"PWis !{PWPlain}35452dd=") + Dim oResult + + oResult = _emailIMAP.IMAP_Set2Seen(EMAIL_SMTPTextBox.Text, PORT_INTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, Path.Combine(My.Application.Info.DirectoryPath, "Log") & "\IsoftLog.txt") + + + + If oResult = False Then + MsgBox("Access Imap NOT successfull", MsgBoxStyle.Critical) + Else + MsgBox("Test Successful!", MsgBoxStyle.Information) + End If + End Sub End Class diff --git a/App/CONFIG_APP/obj/Debug/CONFIG_APP.exe b/App/CONFIG_APP/obj/Debug/CONFIG_APP.exe index 8457403..b5374be 100644 Binary files a/App/CONFIG_APP/obj/Debug/CONFIG_APP.exe and b/App/CONFIG_APP/obj/Debug/CONFIG_APP.exe differ diff --git a/App/CONFIG_APP/obj/Debug/CONFIG_APP.pdb b/App/CONFIG_APP/obj/Debug/CONFIG_APP.pdb index 15ed4a1..3a4c9d1 100644 Binary files a/App/CONFIG_APP/obj/Debug/CONFIG_APP.pdb and b/App/CONFIG_APP/obj/Debug/CONFIG_APP.pdb differ diff --git a/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbproj.GenerateResource.cache b/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbproj.GenerateResource.cache index 5d408d5..b23f98f 100644 Binary files a/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbproj.GenerateResource.cache and b/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbproj.GenerateResource.cache differ diff --git a/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbprojAssemblyReference.cache b/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbprojAssemblyReference.cache index 84b94bb..a3ef3c2 100644 Binary files a/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbprojAssemblyReference.cache and b/App/CONFIG_APP/obj/Debug/CONFIG_APP.vbprojAssemblyReference.cache differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.dll b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.dll index 3edf51e..15977da 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.dll and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.dll differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.pdb b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.pdb index 88d630b..caabe1c 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.pdb and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.EMLProfiler.pdb differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.dll b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.dll index 944e4fb..147d72b 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.dll and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.dll differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.pdb b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.pdb index f1a5740..34314de 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.pdb and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Database.pdb differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.dll b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.dll index 2cc7b06..0e444a5 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.dll and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.dll differ diff --git a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.pdb b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.pdb index 8fd5d3b..4cea7a0 100644 Binary files a/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.pdb and b/App/DigitalData.EMLProfiler/bin/Debug/DigitalData.Modules.Logging.pdb differ diff --git a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb b/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb index cca0d57..e542355 100644 --- a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb +++ b/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb @@ -102,7 +102,7 @@ Public Class clsEmailIMAP Try Logger.Debug(String.Format("Working on IMAP_COLLECT Independentsoft...")) Dim oClient As New Independentsoft.Email.Imap.ImapClient(Server, Port) - If IsoftLog <> "" Then + If IsoftLog <> "" And LogConfig.Debug = True Then Dim iLogger As New Independentsoft.Email.Logger(IsoftLog) AddHandler iLogger.WriteLog, AddressOf OnWriteLog oClient.Logger = iLogger @@ -114,6 +114,7 @@ Public Class clsEmailIMAP Try oClient.Login(Username, Password, AuthenticationType.Login) Catch ex As Exception + Logger.Warn("Error while loginImap.now trying Ntlm-Auth: " & ex.Message) Try oClient.Login(Username, Password, AuthenticationType.Ntlm) Catch ex1 As Exception @@ -124,47 +125,107 @@ Public Class clsEmailIMAP End Try Logger.Debug("Logged in...") oClient.SelectFolder(Inbox) - Dim oEnvelopes As Independentsoft.Email.Imap.Envelope() = oClient.ListMessages() + + Dim coSearchCriteria As New SearchCriteria() + coSearchCriteria.Unseen = True Dim oCount As Integer = 0 - For i As Integer = 0 To oEnvelopes.Length - 1 - If IsNothing(oEnvelopes(i).Subject) Then - Logger.Debug("Attention...Subject is nothing!!") - End If - 'If envelopes(i).Subject.ToString.ToUpper.Contains("[PROCESSMANAGER]") Or envelopes(i).Subject.ToString.ToUpper.Contains("[ADDI]") Then - Logger.Info($"Working on email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}") - Logger.Debug($"Working on email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}") + Dim oUniqueID As Integer() = oClient.Search(coSearchCriteria) - Dim oMessage As Mime.Message = oClient.GetMessage(oEnvelopes(i).UniqueID) - If Not IsNothing(oMessage) Then - oCount += 1 - MAIL_LIST.Add(oMessage) + If IsTest = True Then + MsgBox($"{oUniqueID.Count} unseen messages! (oUniqueID.Length: {oUniqueID.Length.ToString})") + Dim oFoundMessages1 As Message() = New Message(oUniqueID.Length - 1) {} + + For i As Integer = 0 To oUniqueID.Length - 1 + oFoundMessages1(i) = oClient.GetMessage(oUniqueID(i)) + MsgBox($"Message {i.ToString} - {oFoundMessages1(i).Subject}...") + Next + End If + + Dim oFoundMessages As Message() = New Message(oUniqueID.Length - 1) {} + Dim oEnvelopes As Independentsoft.Email.Imap.Envelope() = oClient.ListMessages() + For oCounterEnvelope As Integer = 0 To oEnvelopes.Length - 1 + For oCounterUnseen As Integer = 0 To oUniqueID.Length - 1 + If oEnvelopes(oCounterEnvelope).UniqueID = oUniqueID(oCounterUnseen) Then + If IsTest = True Then + MsgBox($"Working on unseen email: UniqueID: {oEnvelopes(oCounterEnvelope).UniqueID} - Subject:{oEnvelopes(oCounterEnvelope).Subject} - Date {oEnvelopes(oCounterEnvelope).Date.ToString}") + End If + Logger.Info($"Working on unseen email: UniqueID: {oEnvelopes(oCounterEnvelope).UniqueID} - Subject:{oEnvelopes(oCounterEnvelope).Subject} - Date {oEnvelopes(oCounterEnvelope).Date.ToString}") + Logger.Debug($"Working on unseen email: UniqueID: {oEnvelopes(oCounterEnvelope).UniqueID} - Subject:{oEnvelopes(oCounterEnvelope).Subject} - Date {oEnvelopes(oCounterEnvelope).Date.ToString}") + Dim oMessage As Mime.Message = oClient.GetMessage(oEnvelopes(oCounterEnvelope).UniqueID) + If Not IsNothing(oMessage) Then + oCount += 1 + MAIL_LIST.Add(oMessage) + oClient.Store(oEnvelopes(oCounterEnvelope).UniqueID, "+FLAGS", "SEEN") + End If End If - Try - If DeleteinTest = True Then - Logger.Debug($"Message shall be deleted...") - oClient.Delete(oEnvelopes(i).UniqueID) - Logger.Debug($"Message has been marked as deleted!") - End If - Catch ex As Exception - Logger.Warn("Message could not be deleted: " & ex.Message) - End Try - Try - If MoveMailTo <> "" Then - Logger.Debug($"Moving to [{MoveMailTo}] is active...") - oClient.AddMessage(MoveMailTo, oMessage) - Logger.Debug($"Successfully moved!") - End If - - Catch ex As Exception - Logger.Warn("Message could not be moved: " & ex.Message) - End Try - - + Next Next + 'For i As Integer = 0 To oUniqueID.Length - 1 + ' oFoundMessages(i) = oClient.GetMessage(oUniqueID(i)) + ' 'If oFoundMessages(i).Subject.ToLower.Contains("seen") Then + + ' For i1 As Integer = 0 To oEnvelopes.Length - 1 + ' If oEnvelopes(i1).UniqueID = oUniqueID(i) Then + ' Logger.Info($"Working on unseen email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}") + ' Logger.Debug($"Working on unseen email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}") + ' Dim oMessage As Mime.Message = oClient.GetMessage(oEnvelopes(i).UniqueID) + ' If Not IsNothing(oMessage) Then + ' oCount += 1 + ' MAIL_LIST.Add(oMessage) + ' oClient.Store(oEnvelopes(i1).UniqueID, "+FLAGS", "SEEN") + ' End If + ' End If + ' Next + ' 'End If + + 'Next + + + 'Dim oEnvelopes As Independentsoft.Email.Imap.Envelope() = oClient.ListMessages() + 'Dim oCount As Integer = 0 + 'For i As Integer = 0 To oEnvelopes.Length - 1 + ' If IsNothing(oEnvelopes(i).Subject) Then + ' Logger.Debug("Attention...Subject is nothing!!") + ' End If + ' 'If envelopes(i).Subject.ToString.ToUpper.Contains("[PROCESSMANAGER]") Or envelopes(i).Subject.ToString.ToUpper.Contains("[ADDI]") Then + ' Logger.Info($"Working on email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}") + ' Logger.Debug($"Working on email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}") + + + ' Dim oMessage As Mime.Message = oClient.GetMessage(oEnvelopes(i).UniqueID) + ' If Not IsNothing(oMessage) Then + ' oCount += 1 + ' MAIL_LIST.Add(oMessage) + ' End If + ' Try + ' If DeleteinTest = True Then + ' Logger.Debug($"Message shall be deleted...") + ' oClient.Delete(oEnvelopes(i).UniqueID) + ' Logger.Debug($"Message has been marked as deleted!") + ' Else + ' Logger.Debug("Message will be set to SEEN") + ' oClient.Store(oEnvelopes(i).UniqueID, "-FLAGS", "SEEN") + ' End If + ' Catch ex As Exception + ' Logger.Warn("Message could not be deleted: " & ex.Message) + ' End Try + ' Try + ' If MoveMailTo <> "" Then + ' Logger.Debug($"Moving to [{MoveMailTo}] is active...") + ' oClient.AddMessage(MoveMailTo, oMessage) + ' Logger.Debug($"Successfully moved!") + ' End If + + ' Catch ex As Exception + ' Logger.Warn("Message could not be moved: " & ex.Message) + ' End Try + 'Next oClient.Expunge() oClient.Disconnect() If oCount > 0 Then - Logger.Debug($"Found [{oCount.ToString}] Messages...") + Logger.Debug($"###############################################") + Logger.Debug($"Found [{oCount.ToString}] Messages to work on!") + Logger.Debug($"###############################################") End If ' Logger.Debug($"{oCount.ToString} messages will be worked..") Logger.Debug("IMAP COLLECT Independentsoft finished!") @@ -174,6 +235,69 @@ Public Class clsEmailIMAP Return False End Try End Function + Public Function IMAP_Set2Seen(Server As String, Port As Integer, Username As String, Password As String, IsoftLog As String) + Try + Logger.Debug(String.Format("Working on IMAP_Set2Seen Independentsoft...")) + Dim oClient As New Independentsoft.Email.Imap.ImapClient(Server, Port) + If IsoftLog <> "" And LogConfig.Debug = True Then + Dim iLogger As New Independentsoft.Email.Logger(IsoftLog) + AddHandler iLogger.WriteLog, AddressOf OnWriteLog + oClient.Logger = iLogger + End If + + oClient.EnableSsl = True + oClient.ValidateRemoteCertificate = False + oClient.Connect() + Try + oClient.Login(Username, Password, AuthenticationType.Login) + Catch ex As Exception + Logger.Warn("Error while loginImap.now trying Ntlm-Auth: " & ex.Message) + Try + oClient.Login(Username, Password, AuthenticationType.Ntlm) + Catch ex1 As Exception + Logger.Error(ex) + Return False + End Try + + End Try + Logger.Debug("Logged in...") + oClient.SelectFolder("Inbox") + + Dim coSearchCriteria As New SearchCriteria() + coSearchCriteria.Unseen = True + + Dim oUniqueID As Integer() = oClient.Search(coSearchCriteria) + + Dim oFoundMessages As Message() = New Message(oUniqueID.Length - 1) {} + + For i As Integer = 0 To oUniqueID.Length - 1 + oFoundMessages(i) = oClient.GetMessage(oUniqueID(i)) + If oFoundMessages(i).Subject.ToLower.Contains("seen") Then + Logger.Debug($"Working on unseen email: [{oUniqueID(i)}] Subject:{oFoundMessages(i).Subject} - Date {oFoundMessages(i).Date}") + Dim oEnvelopes1 As Independentsoft.Email.Imap.Envelope() = oClient.ListMessages() + For i1 As Integer = 0 To oEnvelopes1.Length - 1 + If oEnvelopes1(i1).UniqueID = oUniqueID(i) Then + Logger.Debug($"Setting email to Unseen!") + oClient.Store(oEnvelopes1(i1).UniqueID, "+FLAGS", "SEEN") + MsgBox("Set to SEEN") + End If + + Next + End If + + Next + oClient.Expunge() + MsgBox("Expunge done") + oClient.Disconnect() + + + Logger.Debug("IMAP_Set2Seen finished!") + Return True + Catch ex As Exception + Logger.Error(ex, "Unexpected Error in IMAP_Set2Seen Independentsoft:") + Return False + End Try + End Function ''' ''' Uses a private API from MailWriter to write a MailMessage to disk. diff --git a/App/DigitalData.EMLProfiler/clsEmail.vb b/App/DigitalData.EMLProfiler/clsEmail.vb index 7bc2441..21b3603 100644 --- a/App/DigitalData.EMLProfiler/clsEmail.vb +++ b/App/DigitalData.EMLProfiler/clsEmail.vb @@ -5,7 +5,7 @@ Imports Independentsoft.Email.Mime Imports Independentsoft.Email.Imap Imports DigitalData.EMLProfiler.ClassCurrent Imports DigitalData.Modules.Logging - +Imports System.Net Public Class clsEmail Private Shared Logger As DigitalData.Modules.Logging.Logger @@ -86,7 +86,7 @@ Public Class clsEmail Return False End Try End Function - Public Function DELETE_EMAIL(msgid As String) + Public Function DELETE_EMAIL(msgid As String, Optional CheckDeletedRun As Boolean = False) Try If CURRENT_POLL_TYPE = "POP" Then Dim client As New Pop3Client(MAIL_SERVER, MAIL_PORT) @@ -107,24 +107,76 @@ Public Class clsEmail client.Disconnect() Return True ElseIf CURRENT_POLL_TYPE = "IMAP" Then - Try - 'Using oClient As New S22.Imap.ImapClient(MAIL_SERVER, MAIL_PORT, MAIL_USER, MAIL_USER_PW, S22.Imap.AuthMethod.Login, True) - ' Dim oMessageIds As IEnumerable(Of UInteger) = oClient.Search(S22.Imap.SearchCondition.Unseen, MAIL_INBOX_NAME) - ' For Each oMessageId As UInteger In oMessageIds - ' If oMessageId = msgid Then - ' Logger.Debug($"DELETE_EMAILMessage shall be deleted...") - ' oClient.DeleteMessage(oMessageId) - ' Logger.Debug($"DELETE_EMAILMessage has been deleted!") - ' End If - ' Next - ' oClient.Expunge() 'delete messages marked as deleted + If CheckDeletedRun = True Then + Try + Logger.Debug(String.Format("Working on S22 Delete...")) + Using oClient As New S22.Imap.ImapClient(MAIL_SERVER, MAIL_PORT, MAIL_USER, MAIL_USER_PW, S22.Imap.AuthMethod.Login, True) + Dim oMessageIds As IEnumerable(Of UInteger) = oClient.Search(S22.Imap.SearchCondition.Unseen, MAIL_INBOX_NAME) + For Each oMessageId As UInteger In oMessageIds + If oMessageId = msgid Then + Logger.Debug($"Message shall be deleted...") + oClient.DeleteMessage(oMessageId) + Logger.Debug($"Message has been deleted!") + End If + Next + oClient.Expunge() 'delete messages marked as deleted + + End Using + Catch ex As Exception + Logger.Warn("Error while deleting s22Mail: " & ex.Message) + Return False + End Try + Else + Try + Logger.Debug(String.Format("Working on IMAP Delete...")) + Dim oIMAPClient As New ImapClient(MAIL_SERVER, MAIL_PORT) + oIMAPClient.EnableSsl = True + oIMAPClient.ValidateRemoteCertificate = False + oIMAPClient.Connect() + Try + oIMAPClient.Login(MAIL_USER, MAIL_USER_PW, AuthenticationType.Login) + Catch ex As Exception + Logger.Warn("Error while loginImap.now trying Ntlm-Auth: " & ex.Message) + Try + oIMAPClient.Login(MAIL_USER, MAIL_USER_PW, AuthenticationType.Ntlm) + Catch ex1 As Exception + Logger.Error(ex) + Return False + End Try + End Try + Logger.Debug("Logged in for delete...") + oIMAPClient.SelectFolder(MAIL_INBOX_NAME) + Dim oEnvelopes As Envelope() = oIMAPClient.ListMessages() + + For i As Integer = 0 To oEnvelopes.Length - 1 + If oEnvelopes(i).MessageID = msgid Then + oIMAPClient.Delete(oEnvelopes(i).UniqueID) 'mark as deleted + End If + Next + oIMAPClient.Expunge() 'delete messages marked as deleted + Dim oDeleted As Boolean = True + For i As Integer = 0 To oEnvelopes.Length - 1 + If oEnvelopes(i).MessageID = msgid Then + Logger.Debug("Message is still existing. Deleting did not work!") + oDeleted = False + End If + Next + oIMAPClient.Disconnect() + If oDeleted = False Then + DELETE_EMAIL(msgid, True) + Else + Return True + End If + + + Catch ex As Exception + Logger.Warn("Error in IMAP Delete: " & ex.Message) + Return False + End Try + End If + + - 'End Using - Return True - Catch ex As Exception - Logger.Warn("Error in IMAP Delete: " & ex.Message) - Return False - End Try Else Return False @@ -139,6 +191,7 @@ Public Class clsEmail mailfrom As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String, AUTH_TYPE As String, Optional attment As String = "") Try + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 Logger.Debug($"in Email_Send_Independentsoft..") Dim empfaenger As String() If mailto.Contains(";") Then diff --git a/App/DigitalData.EMLProfiler/clsWindream_Index.vb b/App/DigitalData.EMLProfiler/clsWindream_Index.vb index 5cd0795..5c63e5d 100644 --- a/App/DigitalData.EMLProfiler/clsWindream_Index.vb +++ b/App/DigitalData.EMLProfiler/clsWindream_Index.vb @@ -40,6 +40,7 @@ Public Class clsWindream_Index Sub New(LogConf As LogConfig) MyBase.New(LogConf) Logger = LogConf.GetLogger + LogConf.Debug = True End Sub Private Function IsNotEmpty(ByVal aValue As Object) @@ -141,6 +142,8 @@ Public Class clsWindream_Index Logger.Debug("Typ des windream-Indexes: 4098 Vektor Numerisch") Case 4099 Logger.Debug("Typ des windream-Indexes: 4099 Vektor Kommazahl") + Case 4100 + Logger.Debug("Typ des windream-Indexes: 4100 Vektor Boolean") Case 4101 Logger.Debug("Typ des windream-Indexes: 4101 Vektor Date") Case 4103 @@ -165,7 +168,8 @@ Public Class clsWindream_Index Dim str As String = aValues(0) str = str.ToString.Replace(" ", "") myArray(0) = CDbl(str.Replace(".", ",")) - + Case 4100 + myArray(0) = CBool(aValues(0)) Case 4101 myArray(0) = CDate(aValues(0)) Case 4103 @@ -207,6 +211,8 @@ Public Class clsWindream_Index myArray(i1) = OConvertValue Case 4099 myArray(i1) = CDbl(aValue.Replace(".", ",").Replace(" ", "")) + Case 4100 + myArray(i1) = CBool(aValue) Case 4101 myArray(i1) = CDate(aValue) Case 4103 @@ -299,6 +305,7 @@ Public Class clsWindream_Index Case WMObjectVariableValueTypeString Logger.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeString") OConvertValue = CStr(value) + Logger.Debug($"OConvertValue.Length [{OConvertValue.ToString.Length}] - Content/Value: [{OConvertValue}]") Case WMObjectVariableValueTypeInteger Logger.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeInteger") value = value.ToString.Replace(" ", "") @@ -313,6 +320,7 @@ Public Class clsWindream_Index Logger.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeFloat") value = value.ToString.Replace(" ", "") OConvertValue = CDbl(value) + Case WMObjectVariableValueTypeFixedPoint Logger.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeFixedPoint") value = value.ToString.Replace(" ", "") @@ -365,6 +373,9 @@ Public Class clsWindream_Index Logger.Debug("Typ des windream-Indexes: 4099 Vektor Kommazahl") 'Vektor Kommazahl oIsVector = True + Case 4100 + Logger.Debug("Typ des windream-Indexes: 4100 Vektor Boolean") + oIsVector = True Case 4101 Logger.Debug("Typ des windream-Indexes: 4101 Vektor Date") 'Vektor Kommazahl @@ -381,7 +392,7 @@ Public Class clsWindream_Index 'Vektor Kommazahl oIsVector = True Case Else - Logger.Debug("Typ des windream-Indexes konnte nicht bestimmt werden!") + Logger.Debug($"Typ des windream-Indexes [{indexname} - Typ: {vType.ToString} ] konnte nicht bestimmt werden!") Logger.Debug("Versuch des Auslesens (vType): " & vType) 'MsgBox(vType & vbNewLine & CStr(value), MsgBoxStyle.Exclamation, "Marlon-Case Else") OConvertValue = "" @@ -396,7 +407,6 @@ Public Class clsWindream_Index '############################################################################################ If oIsVector = False Then If OConvertValue.ToString Is Nothing = False Then - Logger.Debug("Versuch dem Dok einen Index zuzuweisen: oDocument.SetVariableValue(" & aName & ", " & OConvertValue & ")") If _int = True Then OConvertValue = OConvertValue.ToString.Replace(" ", "") @@ -409,7 +419,14 @@ Public Class clsWindream_Index OConvertValue = OConvertValue.ToString.Replace(" ", "") oDocument.SetVariableValue(aName, CDbl(OConvertValue)) Else - oDocument.SetVariableValue(aName, OConvertValue) + If OConvertValue.ToString.Length <= 512 Then + oDocument.SetVariableValue(aName, OConvertValue) + Else + Logger.Info($"Will not set indexvalue of index [{aName}] with the full length as Length > 512 [{OConvertValue.ToString.Length}]") + oDocument.SetVariableValue(aName, OConvertValue.ToString.Substring(0, 511)) + + End If + End If Logger.Info(String.Format("Index '{0}' was written with value '{1}'", aName, OConvertValue)) @@ -444,7 +461,7 @@ Public Class clsWindream_Index 'Next Dim Anzahl As Integer = aValues.Length 'Vektorfeld wird mit EINEM Wert gefüllt - If Anzahl = 1 Then + If Anzahl = 1 And vType = 4100 Then Logger.Debug("Vektorfeld wird mit EINEM Wert gefüllt ") ReDim myArray(0) Select Case vType @@ -463,6 +480,8 @@ Public Class clsWindream_Index Str = Str.ToString.Replace(" ", "") 'Umwandeln in Double myArray(0) = CDbl(Str.Replace(".", ",")) + Case 4100 + myArray(0) = CBool(value) Case 4101 'Umwandeln in Date myArray(0) = CDate(value) @@ -539,6 +558,17 @@ Public Class clsWindream_Index Logger.Debug("Konvertierter Wert: (" & i1 & ")" & myArray(i1).ToString) i1 = i1 + 1 Next + Case 4100 + ReDim myArray(Anzahl - 1) + Dim i1 As Integer = 0 + 'Die Datatable durchlaufen und Werte für den Index in Array schreiben + For Each NewValue As Object In aValues + Dim Str As String = NewValue.ToString + myArray(i1) = CBool(Str) + Logger.Debug("Konvertierter Wert: (" & i1 & ")" & myArray(i1).ToString) + i1 = i1 + 1 + + Next Case 4101 'Vektortyp DATE 'Die Größe des Arrays festlegen @@ -584,7 +614,6 @@ Public Class clsWindream_Index 'SetRights(WMObject, User) oDocument.Save() oDocument.unlock() - Logger.Debug("Indexierung erfolgreich beendet (Save und Unlock durchgeführt)") Logger.Debug("") @@ -765,6 +794,9 @@ Public Class clsWindream_Index Case 4099 Logger.Debug("Typ des windream-Indexes: 4099 Vektor Kommazahl") Return True + Case 4100 + Logger.Debug("Typ des windream-Indexes: 4100 Vektor Boolean") + Return True Case 4101 Logger.Debug("Typ des windream-Indexes: 4101 Vektor Date") Return True @@ -778,8 +810,7 @@ Public Class clsWindream_Index Logger.Debug("Typ des windream-Indexes: 36865 Vektor alphanumerisch") Return True Case Else - Logger.Debug("Typ des windream-Indexes konnte nicht bestimmt werden!") - + Logger.Debug($"GetCheckISVektor Typ des windream-Indexes [{oIndexname} - Typ: {vType.ToString} ] konnte nicht bestimmt werden!") End Select Return False End Function diff --git a/App/DigitalData.EMLProfiler/clsWorkEmail.vb b/App/DigitalData.EMLProfiler/clsWorkEmail.vb index 5045d11..6c73a5d 100644 --- a/App/DigitalData.EMLProfiler/clsWorkEmail.vb +++ b/App/DigitalData.EMLProfiler/clsWorkEmail.vb @@ -20,9 +20,6 @@ Public Class clsWorkEmail Try Logger = LogConf.GetLogger MyLogger = LogConf - If LogConf.Debug = True Then - Logger.Info("DEBUG Active") - End If _email = New clsEmail(LogConf) _DB_MSSQL = New clsDatabase(LogConf, ConStr) _windream = New clsWindream_allgemein(LogConf) @@ -38,7 +35,6 @@ Public Class clsWorkEmail End Sub Public Function WORK_MAIL(MyEmailMessage As Message) Try - Logger.Debug($"Starting WORK_MAIL...") CURRENT_MAIL_BODY_ALL = "" CURRENT_MAIL_BODY_ANSWER1 = "" @@ -97,7 +93,14 @@ Public Class clsWorkEmail Dim TEMP_PROCESS_PROFILE_DT As DataTable = DT_POLL_PROCESS Dim PM_ROW As DataRow() = TEMP_PROCESS_PROFILE_DT.Select(oExpression) For Each row As DataRow In PM_ROW - WM_REFERENCE_INDEX = row("WM_REFERENCE_INDEX") + + Try + WM_REFERENCE_INDEX = row("WM_REFERENCE_INDEX") + Catch ex As Exception + Logger.Debug($"PM_IN Attention WM_REFERENCE_INDEX seems to be Empty/null: {ex.Message}") + WM_REFERENCE_INDEX = Nothing + End Try + WM_VECTOR_LOG = row("WM_VECTOR_LOG") WM_OBJEKTTYPE = row("WM_OBJEKTTYPE") WM_IDX_BODY_TEXT = row("WM_IDX_BODY_TEXT") @@ -157,6 +160,7 @@ Public Class clsWorkEmail Try WM_REFERENCE_INDEX = oDataRow("WM_REFERENCE_INDEX") Catch ex As Exception + Logger.Debug($"Attention WM_REFERENCE_INDEX seems to be Empty/null: {ex.Message}") WM_REFERENCE_INDEX = Nothing End Try Try @@ -187,8 +191,11 @@ Public Class clsWorkEmail Private Function SAVE2TEMP() Try Dim oTempPath As String = Path.Combine(Path.GetTempPath, "DD_EmailProfiler") + Logger.Debug($"oTempPath is: {oTempPath} ...") If Directory.Exists(oTempPath) = False Then Directory.CreateDirectory(oTempPath) + Else + Logger.Debug($"oTempPath [{oTempPath}] is already existing!!") End If Dim oFileEntries As String() = Directory.GetFiles(oTempPath) ' Process the list of files found in the directory. diff --git a/App/DigitalData.EMLProfiler/clsWorker.vb b/App/DigitalData.EMLProfiler/clsWorker.vb index 88640f5..193193f 100644 --- a/App/DigitalData.EMLProfiler/clsWorker.vb +++ b/App/DigitalData.EMLProfiler/clsWorker.vb @@ -129,7 +129,6 @@ Public Class clsWorker pollresult = _email.POP3_COLLECT() Case "IMAP" 'pollresult = _emailIMAP.IMAP_COLLECT() - ' 09.04.19: Use S22.Imap instead of IndependentSoft ImapClient pollresult = _emailIMAP.FetchIMAPMessagesIsoft(MAIL_SERVER, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_INBOX_NAME) End Select End If @@ -162,9 +161,28 @@ Public Class clsWorker For Each _file In TEMP_FILES System.IO.File.Delete(_file) Next - Catch ex As Exception + Try + Dim oDiTempPath As New IO.DirectoryInfo(System.IO.Path.GetTempPath) + Dim oaryFi As IO.FileInfo() = oDiTempPath.GetFiles() + Dim ofi As IO.FileInfo + For Each fi In oaryFi + Try + fi.Delete() + Catch ex As Exception + Logger.Warn($"SWP1 - Could not delete the tempfile: {ex.Message}") + End Try + + Next + Catch ex As Exception + Logger.Warn($"SWP2 - Could not delete the tempfile: {ex.Message}") + End Try + + + Catch ex As Exception + Logger.Warn($"SWP - Could not delete the tempfile from TEMP_FILES: {ex.Message}") End Try + Else Logger.Info("No active profiles") End If diff --git a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.dll b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.dll index 3edf51e..15977da 100644 Binary files a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.dll and b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.dll differ diff --git a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.pdb b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.pdb index 88d630b..caabe1c 100644 Binary files a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.pdb and b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.pdb differ diff --git a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbproj.FileListAbsolute.txt b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbproj.FileListAbsolute.txt index 97cc60d..cb75be7 100644 --- a/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbproj.FileListAbsolute.txt +++ b/App/DigitalData.EMLProfiler/obj/Debug/DigitalData.EMLProfiler.vbproj.FileListAbsolute.txt @@ -1,6 +1,3 @@ -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 E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\DigitalData.EMLProfiler.dll.config E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\DigitalData.EMLProfiler.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\bin\Debug\DigitalData.EMLProfiler.pdb @@ -24,6 +21,9 @@ 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.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 E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.vbproj.CopyComplete E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.dll E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\DigitalData.EMLProfiler\obj\Debug\DigitalData.EMLProfiler.xml diff --git a/App/SERV_EMAIL/MyService.vb b/App/SERV_EMAIL/MyService.vb index 25228db..3886fc5 100644 --- a/App/SERV_EMAIL/MyService.vb +++ b/App/SERV_EMAIL/MyService.vb @@ -56,7 +56,7 @@ Public Class MyService ' Set the Interval Timer_Durchlauf.Interval = (TIMER_INTERVALL * 60000) Timer_Durchlauf.Enabled = True - Logger.Info("...Timer started.") + Logger.Debug("...Timer started.") ' Und den Durchlauf das erste Mal starten _threadRunner.RunWorkerAsync() End If @@ -83,7 +83,6 @@ Public Class MyService Protected Overrides Sub OnStop() ' Hier Code zum Ausführen erforderlicher Löschvorgänge zum Beenden des Dienstes einfügen. Logger.Info("## Service was stopped manually. ##") - Logger.Warn("## Service was stopped manually. ##") End Sub Private Sub Thread1_Completed(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) 'Handles threadDateiimport.RunWorkerCompleted 'This event fires when the DoWork event completes diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.dll b/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.dll index 1f36628..948a375 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.dll and b/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.dll differ diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.pdb b/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.pdb index 76c372f..9ee031d 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.pdb and b/App/SERV_EMAIL/bin/Debug/DigitalData.EMLProfiler.pdb differ diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.dll b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.dll index 944e4fb..7cd0e84 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.dll and b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.dll differ diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.pdb b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.pdb index f1a5740..74f8d74 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.pdb and b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Database.pdb differ diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.dll b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.dll index 2cc7b06..c5d456a 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.dll and b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.dll differ diff --git a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.pdb b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.pdb index 8fd5d3b..c5e6f74 100644 Binary files a/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.pdb and b/App/SERV_EMAIL/bin/Debug/DigitalData.Modules.Logging.pdb differ diff --git a/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.exe b/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.exe index 633abe8..5bbcb19 100644 Binary files a/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.exe and b/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.exe differ diff --git a/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.pdb b/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.pdb index d460772..2051296 100644 Binary files a/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.pdb and b/App/SERV_EMAIL/bin/Debug/SERV_EMAIL.pdb differ diff --git a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.exe b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.exe index 633abe8..5bbcb19 100644 Binary files a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.exe and b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.exe differ diff --git a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.pdb b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.pdb index d460772..2051296 100644 Binary files a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.pdb and b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.pdb differ diff --git a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.vbproj.FileListAbsolute.txt b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.vbproj.FileListAbsolute.txt index 5e10113..e51b06f 100644 --- a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.vbproj.FileListAbsolute.txt +++ b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.vbproj.FileListAbsolute.txt @@ -47,4 +47,3 @@ E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\obj\Debug\SERV_E E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\obj\Debug\SERV_EMAIL.exe E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\obj\Debug\SERV_EMAIL.xml E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\obj\Debug\SERV_EMAIL.pdb -E:\SchreiberM\Visual Studio\GIT\DD_EmailProfiler\App\SERV_EMAIL\obj\Debug\SERV_EMAIL.vbprojAssemblyReference.cache diff --git a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.vbprojAssemblyReference.cache b/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.vbprojAssemblyReference.cache deleted file mode 100644 index 65dfc65..0000000 Binary files a/App/SERV_EMAIL/obj/Debug/SERV_EMAIL.vbprojAssemblyReference.cache and /dev/null differ