diff --git a/DVAG - Mailverteiler.vbproj b/DVAG - Mailverteiler.vbproj
index aba7f59..8f72207 100644
--- a/DVAG - Mailverteiler.vbproj
+++ b/DVAG - Mailverteiler.vbproj
@@ -8,7 +8,7 @@
WinExe
DVAG___Mailverteiler.My.MyApplication
DVAG___Mailverteiler
- DVAG - Mailverteiler
+ anpassungen
512
WindowsForms
v4.7.2
@@ -26,7 +26,7 @@
false
true
0
- 1.1.2.%2a
+ 1.1.7.%2a
false
true
@@ -37,7 +37,7 @@
true
true
bin\Debug\
- DVAG - Mailverteiler.xml
+ anpassungen.xml
42016,41999,42017,42018,42019,42032,42036,42020,42021,42022
@@ -47,7 +47,7 @@
true
true
bin\Release\
- DVAG - Mailverteiler.xml
+ anpassungen.xml
42016,41999,42017,42018,42019,42032,42036,42020,42021,42022
@@ -67,7 +67,7 @@
true
true
bin\x64\Debug\
- DVAG - Mailverteiler.xml
+ anpassungen.xml
42016,41999,42017,42018,42019,42032,42036,42020,42021,42022
full
x64
@@ -76,7 +76,7 @@
true
bin\x64\Release\
- DVAG - Mailverteiler.xml
+ anpassungen.xml
true
42016,41999,42017,42018,42019,42032,42036,42020,42021,42022
pdbonly
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index ba401ac..f5ea677 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_auslesen.Designer.vb b/mail_auslesen.Designer.vb
index fbd86ac..fca0eb5 100644
--- a/mail_auslesen.Designer.vb
+++ b/mail_auslesen.Designer.vb
@@ -179,7 +179,7 @@ Partial Class mail_auslesen
Me.Controls.Add(Me.bt_start)
Me.Name = "mail_auslesen"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
- Me.Text = "Form1"
+ Me.Text = "Form"
Me.ResumeLayout(False)
Me.PerformLayout()
diff --git a/mail_auslesen.vb b/mail_auslesen.vb
index 05ef42e..f27c22a 100644
--- a/mail_auslesen.vb
+++ b/mail_auslesen.vb
@@ -197,7 +197,10 @@ Public Class mail_auslesen
End While
+ mail_sending.Show()
mail_sending.bt_start.PerformClick()
+ Me.Hide()
+
@@ -214,6 +217,7 @@ Public Class mail_auslesen
Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles bt_stop.Click
Timer_mail_auslesen.Stop()
+ Me.Text = "Dienst ist gestoppt"
My.Settings.mail_auslesen = "0"
End Sub
@@ -226,13 +230,11 @@ Public Class mail_auslesen
End Function
Private Sub Timer_mail_auslesen_Tick(sender As Object, e As EventArgs) Handles Timer_mail_auslesen.Tick
-
+ Me.Text = "Dienst läuft"
einlesen()
End Sub
Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click
-
-
einlesen()
End Sub
End Class
diff --git a/mail_sending.vb b/mail_sending.vb
index 2e88ddf..84c5bba 100644
--- a/mail_sending.vb
+++ b/mail_sending.vb
@@ -171,9 +171,10 @@ Public Class mail_sending
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 tb_ak_gruppe.Text Like "TEST" Then
sqlcmd = New MySqlCommand("SELECT `email` FROM `test`", conn)
+
Else
@@ -181,7 +182,7 @@ Public Class mail_sending
End If
rtb_log.Text = rtb_log.Text & DateTime.Now & ": Empfänger SQL gesetzt" & vbNewLine
- MsgBox(sqlcmd.ToString)
+ 'MsgBox(sqlcmd.ToString)
rtb_log.ScrollToCaret()
Try
@@ -195,12 +196,13 @@ Public Class mail_sending
For Each row As DataRow In chemicalInventory.Rows
- ' MsgBox(row.Item("email"))
+
dr = (row.Item("email"))
rtb_empfaengergruppe.Text = rtb_empfaengergruppe.Text & dr & vbNewLine
Next
+
Dim last = rtb_empfaengergruppe.Text.LastIndexOf("")
If last > 0 Then
@@ -244,13 +246,13 @@ Public Class mail_sending
System.Windows.Forms.Application.DoEvents()
- save_log()
+ 'save_log()
mail_versenden()
- save_log()
+ 'save_log()
update_sql_gesendete_mails()
- save_log()
+ 'save_log()
felder_leeren()
- save_log()
+ 'save_log()
@@ -329,9 +331,11 @@ Public Class mail_sending
tb_betreff.Clear()
rtb_mail_body.Clear()
lb_id.Text = ""
+ rtb_log.Text = ""
- If My.Settings.mail_auslesen = "1" Then mail_auslesen.Timer_mail_auslesen.Start()
mail_auslesen.Show()
+ If My.Settings.mail_auslesen = "1" Then mail_auslesen.Timer_mail_auslesen.Start()
+
Me.Hide()
End Sub