From 4b10f8d8460f94413a0aa7a6fcbe779e6dd64edd Mon Sep 17 00:00:00 2001 From: mhaase Date: Thu, 29 Jun 2023 21:36:57 +0200 Subject: [PATCH] =?UTF-8?q?Such=20Algorythmus=20f=C3=BCr=20AK=20Gruppen=20?= =?UTF-8?q?ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.config | 4 +++ DVAG - Mailverteiler.vbproj | 53 +++++++++++++++++++++++++++++++------ My Project/AssemblyInfo.vb | 4 +-- mail_sending.vb | 27 ++++++++++--------- packages.config | 12 +++++++-- 5 files changed, 76 insertions(+), 24 deletions(-) diff --git a/App.config b/App.config index 3482ace..1f0e537 100644 --- a/App.config +++ b/App.config @@ -21,6 +21,10 @@ + + + + \ No newline at end of file diff --git a/DVAG - Mailverteiler.vbproj b/DVAG - Mailverteiler.vbproj index 5033bd8..5fe7541 100644 --- a/DVAG - Mailverteiler.vbproj +++ b/DVAG - Mailverteiler.vbproj @@ -26,8 +26,9 @@ false true 0 - 1.1.7.%2a + 1.2.1.%2a false + true true @@ -83,30 +84,61 @@ x64 true + + 329C3EA41F7B6A1CF6F6708F85A55FE46A547C5F + + + DVAG - Mailverteiler_TemporaryKey.pfx + + + true + + + true + - - packages\chilkat-x64.9.5.0.93\lib\net472\ChilkatDotNet47.dll + + packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll + + + packages\chilkat-x64.9.5.0.94\lib\net472\ChilkatDotNet47.dll packages\EAGetMail.5.3.0.2\lib\net472\EAGetMail.dll + + packages\Google.Protobuf.3.21.9\lib\net45\Google.Protobuf.dll + + + packages\K4os.Compression.LZ4.1.3.5\lib\net462\K4os.Compression.LZ4.dll + + + packages\K4os.Compression.LZ4.Streams.1.3.5\lib\net462\K4os.Compression.LZ4.Streams.dll + + + packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll + packages\Microsoft.Office.Interop.Outlook.15.0.4797.1003\lib\net20\Microsoft.Office.Interop.Outlook.dll True - - False - ..\..\Program Files (x86)\MySQL\MySQL Connector Net 8.0.29\Assemblies\v4.5.2\MySql.Data.dll + + packages\MySql.Data.8.0.33\lib\net462\MySql.Data.dll packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + - - packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll + + + + packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -122,6 +154,10 @@ packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll + + packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + @@ -199,6 +235,7 @@ + MyApplicationCodeGenerator Application.Designer.vb diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index f5ea677..dc4763e 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' indem Sie "*" wie unten gezeigt eingeben: ' - - + + diff --git a/mail_sending.vb b/mail_sending.vb index 84c5bba..a51a4b9 100644 --- a/mail_sending.vb +++ b/mail_sending.vb @@ -148,41 +148,42 @@ Public Class mail_sending Exit Sub Else - conn.Open() + conn_dvag.open() + conn.open() 'Regionalforum - If tb_ak_gruppe.Text Like "Forum" Then - sqlcmd = New MySqlCommand("SELECT `email` FROM `tl_member` where xt_regioforum or xt_moreregio like '%" & tb_ak_gruppe.Text & "%' and DISABLE = ''", conn) + If InStr(tb_ak_gruppe.Text, "Forum") Then + sqlcmd = New MySqlCommand("SELECT `email` FROM `tl_member` where xt_regioforum or xt_moreregio like '%" & tb_ak_gruppe.Text & "%' and DISABLE = ''", conn_dvag) 'Arbeitskreis - ElseIf tb_ak_gruppe.Text Like "AK" Then - sqlcmd = New MySqlCommand("SELECT `email` FROM `tl_member` where xt_arbeitskre like '%" & tb_ak_gruppe.Text & "%' and DISABLE = ''", conn) + ElseIf instr(tb_ak_gruppe.Text, "AK") Then + sqlcmd = New MySqlCommand("SELECT `email` FROM `tl_member` where xt_arbeitskre like '%" & tb_ak_gruppe.Text & "%' and DISABLE = ''", conn_dvag) 'Funktionaere - ElseIf tb_ak_gruppe.Text Like "Funktionäre" Then + ElseIf instr(tb_ak_gruppe.Text, "Funktionäre") Then sqlcmd = New MySqlCommand("SELECT `email` FROM `funktionaere`", conn) 'Vorstand - ElseIf tb_ak_gruppe.Text Like "Vorstand" Then + ElseIf instr(tb_ak_gruppe.Text, "Vorstand") Then sqlcmd = New MySqlCommand("SELECT `email` FROM `vorstand`", conn) 'Mitglieder - ElseIf tb_ak_gruppe.Text Like "Mitglieder" Then + ElseIf instr(tb_ak_gruppe.Text, "Mitglieder") Then sqlcmd = New MySqlCommand("select email from newsletter union select email from dvag.tl.member where disable = ''", conn) 'Test - ElseIf tb_ak_gruppe.Text Like "TEST" Then + ElseIf instr(tb_ak_gruppe.Text, "TEST") Then sqlcmd = New MySqlCommand("SELECT `email` FROM `test`", conn) Else - + ' MsgBox("nichts gefunden") End If rtb_log.Text = rtb_log.Text & DateTime.Now & ": Empfänger SQL gesetzt" & vbNewLine - 'MsgBox(sqlcmd.ToString) + 'MsgBox(sqlcmd.ExecuteNonQuery) rtb_log.ScrollToCaret() Try @@ -194,6 +195,7 @@ Public Class mail_sending Dim chemicalInventory As New DataTable() DataAdapter.Fill(chemicalInventory) + 'MsgBox(sqlcmd.ExecuteScalar) For Each row As DataRow In chemicalInventory.Rows @@ -222,7 +224,7 @@ Public Class mail_sending rtb_log.Text = rtb_log.Text & DateTime.Now & ": Empfänger erfolgreich eingelesen" & vbNewLine rtb_log.ScrollToCaret() Catch ex As Exception - 'MsgBox(ex.ToString) + MsgBox(ex.ToString) End Try End If @@ -344,6 +346,7 @@ Public Class mail_sending System.Windows.Forms.Application.DoEvents() Try conn.Open() + ' MsgBox("ok") sqlcmd = New MySqlCommand("update data set `send` = '1', `verarbeitet_am` = '" & DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss") & "' where ID = '" & lb_id.Text & "'", conn) dr = sqlcmd.ExecuteScalar() diff --git a/packages.config b/packages.config index 1f5d415..ca35e04 100644 --- a/packages.config +++ b/packages.config @@ -1,12 +1,20 @@  - + + + + + + + - + + + \ No newline at end of file