MS

2017-04-18 16:08:05 +02:00 · 2017-04-18 16:08:05 +02:00 · 701cce5dff
commit 701cce5dff
parent ca7a26beb9
9 changed files with 137 additions and 39 deletions
--- a/Global_Indexer/ClassFolderWatcher.vb
+++ b/Global_Indexer/ClassFolderWatcher.vb
@ -38,7 +38,7 @@ Public Class ClassFolderWatcher
    Public Shared Function StartStop_FolderWatch()
        Try
            If CURRENT_FOLDERWATCH = "" Then
-                MsgBox("Bitte definieren Sie einen Überwachungsordner:", MsgBoxStyle.Exclamation)
+                'MsgBox("Bitte definieren Sie einen Überwachungsordner:", MsgBoxStyle.Exclamation)
                Return False
            End If
            If FolderWatcher Is Nothing Then
@ -90,8 +90,13 @@ Public Class ClassFolderWatcher
    Public Shared Function StartStop_FolderWatchSCAN()
        Try
            If CURRENT_SCAN_FOLDERWATCH = "" Then
-                MsgBox("Bitte definieren Sie einen Überwachungsordner für Scan-Eingänge:", MsgBoxStyle.Exclamation)
-                Return False
+                If FolderWatcher.EnableRaisingEvents = True Then
+                    Stop_FWSCAN()
+                    Return 0
+                Else
+                    MsgBox("Bitte definieren Sie einen Überwachungsordner für Scan-Eingänge:", MsgBoxStyle.Exclamation)
+                    Return False
+                End If
            End If
            If FolderWatcher_SCAN Is Nothing Then
                FolderWatcher_SCAN = New System.IO.FileSystemWatcher(CURRENT_SCAN_FOLDERWATCH, "*.*")
@ -128,6 +133,18 @@ Public Class ClassFolderWatcher
            Return 99
        End Try
    End Function
+    Public Shared Function Stop_FWSCAN()
+        If FolderWatcher.EnableRaisingEvents = True Then
+            'Gestartet also Stoppen
+            FolderWatcher.EnableRaisingEvents = False
+            FW_started = False
+            ClassLogger.Add(" >> FolderWatch gestoppt", False)
+            SaveConfigValue("FW_started", "False")
+            Return True
+        Else
+            Return False
+        End If
+    End Function
    Private Shared Sub OnCreated(source As Object, e As FileSystemEventArgs)
        Try
            For Each row As DataRow In DTEXCLUDE_FILES.Rows
--- a/Global_Indexer/ClassHelper.vb
+++ b/Global_Indexer/ClassHelper.vb
@ -1,4 +1,5 @@
 Imports System.Text
+Imports System.Text.RegularExpressions

 Public Class ClassHelper
    Public Shared Function encode_utf8(ByVal str As String) As String
@ -9,7 +10,7 @@ Public Class ClassHelper
            Dim utf8Encoding As New System.Text.UTF8Encoding(True)
            Dim encodedString() As Byte
            encodedString = utf8Encoding.GetBytes(str)
-            If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> String {0} was encoded via utf8 to {1}", str, utf8Encoding.GetString(encodedString)))
+            If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> String {0} was encoded via utf8 to {1}", str, utf8Encoding.GetString(encodedString)), False)
            Return utf8Encoding.GetString(encodedString)
        Catch ex As Exception
            ClassLogger.Add("Unexpected error in encode_utf8: " & ex.Message)
@ -17,4 +18,28 @@ Public Class ClassHelper
        End Try

    End Function
+    Public Shared Function StringAsUtf8Bytes(ByVal strData As String) As Byte()
+        Try
+            Dim bytes() As Byte
+            ' get unicode string as bytes
+            bytes = Encoding.UTF8.GetBytes(strData)
+            ' return byte data
+            Return bytes
+        Catch ex As Exception
+            ClassLogger.Add("Unexpected error in StringAsUtf8Bytes: " & ex.Message)
+            Return Nothing
+        End Try
+
+    End Function
+    Public Shared Function CheckSpecialSigns(ByVal str As String)
+        Try
+            Dim pattern As String = "[!""#$%&'()*+,\-./:;<=>?@[\\\]^_`{|}~\s]"
+            Dim matches As MatchCollection = Regex.Matches(str, pattern)
+            Return matches.Count
+        Catch ex As Exception
+            ClassLogger.Add("Unexpected error in CheckSpecialSigns: " & ex.Message)
+            Return 0
+        End Try
+    End Function
+
 End Class
--- a/Global_Indexer/ClassInit.vb
+++ b/Global_Indexer/ClassInit.vb
@ -59,8 +59,14 @@ Public Class ClassInit
            If Not folderwatch Is Nothing Then
                CURRENT_FOLDERWATCH = folderwatch
                If FW_started = True Then
-                    FW_ISSTARTED = True
-                    ClassFolderWatcher.StartStop_FolderWatch()
+                    If CURRENT_FOLDERWATCH = "" Then
+                        FW_started = False
+                        SaveConfigValue("FW_started", "False")
+                    Else
+                        FW_ISSTARTED = True
+                        ClassFolderWatcher.StartStop_FolderWatch()
+                    End If
+                   
                End If
            End If
            If Not folderwatch_SCAN Is Nothing Then
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.9.8.9")> 
+<Assembly: AssemblyVersion("1.9.9.0")> 
 <Assembly: AssemblyFileVersion("1.0.0.0")> 

 <Assembly: NeutralResourcesLanguageAttribute("")> 
--- a/Global_Indexer/frmConfig_Basic.vb
+++ b/Global_Indexer/frmConfig_Basic.vb
@ -253,15 +253,29 @@ Public Class frmConfig_Basic
    End Sub
    Sub CheckFolder(mypath As String, FOLDER_TYPE As String)
        Try
+            If mypath = "" Then
+                ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FOLDERWATCH_USER WHERE USER_ID = " & CURRENT_USERID & " AND FOLDER_TYPE = '" & FOLDER_TYPE & "'", True)
+                If FOLDER_TYPE = "SCAN" Then
+                    CURRENT_SCAN_FOLDERWATCH = ""
+                    SaveConfigValue("FWSCAN_started", "False")
+                    FWSCAN_started = False
+                Else
+                    FW_started = False
+                    SaveConfigValue("FW_started", "False")
+                    CURRENT_FOLDERWATCH = ""
+                End If
+              
+                Exit Sub
+            End If
            Try
                If (Not System.IO.Directory.Exists(mypath)) Then
                    System.IO.Directory.CreateDirectory(mypath)
                End If
            Catch ex As Exception
-                ClassLogger.Add(" >> Unexpected error inm Erstellen des Folderwatchordners: " & mypath, False)
+                ClassLogger.Add(" >> Unexpected error in CheckFolder: " & mypath, False)
                ClassLogger.Add(" >> " & ex.Message, False)
                If USER_LANGUAGE = "de-DE" Then
-                    MsgBox("Unexpected error inm Erstellen des Folderwatchordners: " & mypath & vbNewLine & "Bitte überprüfen Sie die Rechte!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                    MsgBox("Unexpected error in ECheckFolder: " & mypath & vbNewLine & "Bitte überprüfen Sie die Rechte!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
                Else
                    MsgBox("Error in creating Hotfolder: " & mypath & vbNewLine & "Please check the rights!" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
                End If
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@ -1788,8 +1788,8 @@ Public Class frmIndex
            'Me.VWINDEX_AUTOMTableAdapter.Connection.ConnectionString = My.Settings.MyConnectionString
            'Me.VWINDEX_MANTableAdapter.Connection.ConnectionString = My.Settings.MyConnectionString
        Catch ex As Exception
-            ClassLogger.Add(" - Unexpected error inm Speichern der Verbindung - Fehler: " & vbNewLine & ex.Message)
-            MsgBox("Unexpected error inm Speichern der Verbindung: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
+            ClassLogger.Add(" - Unexpected error in Speichern der Verbindung - Fehler: " & vbNewLine & ex.Message)
+            MsgBox("Unexpected error in Speichern der Verbindung: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
        End Try
    End Sub

@ -2164,37 +2164,53 @@ Public Class frmIndex

            Else
                Dim tempFilename = My.Computer.FileSystem.GetTempFileName()
+                Dim tempFilename1 = My.Computer.FileSystem.GetTempFileName()
                Try
-
                    Me.grpBetreff.Dock = DockStyle.Top
                    Me.grpbxMailBody.Dock = DockStyle.Fill
                    Dim msg_email As New Msg.Message(CURRENT_WORKFILE)
+                    msg_email.Encoding = Encoding.Unicode
+
+                    Dim headers As String = ClassEmailHeaderExtractor.getMessageHeaders(msg_email)
+                    If LogErrorsOnly = False Then ClassLogger.Add(" EMAIL-HEADER: " & headers, False)
                    'Eine tempfile generieren
                    Dim name = Path.GetFileNameWithoutExtension(tempFilename)
                    tempFilename = Path.Combine(Path.GetDirectoryName(tempFilename), name & ".html")
+                    name = Path.GetFileNameWithoutExtension(tempFilename1)
+                    tempFilename1 = Path.Combine(Path.GetDirectoryName(tempFilename1), name & ".msg")
+                    msg_email.Save(tempFilename1)
+                    Dim msg_email_unicode As New Msg.Message(tempFilename1)
                    TEMP_FILES.Add(tempFilename)
+                    TEMP_FILES.Add(tempFilename1)
+
                    If LogErrorsOnly = False Then ClassLogger.Add(" ...tempFilename: " & tempFilename, False)
+                    If LogErrorsOnly = False Then ClassLogger.Add(" ...tempFilename1: " & tempFilename1, False)
                    'tempfile löschen
                    If My.Computer.FileSystem.FileExists(tempFilename) Then
                        My.Computer.FileSystem.DeleteFile(tempFilename)
                    End If
-
-                    If msg_email.Subject = "" Then
-                        Me.txtBetreff.Text = "!! No subject in email !!"
+                    If msg_email_unicode.Subject = "" Then
+                        Me.txtBetreff.Text = "!!No subject in email!!"
                    Else
-                        Dim betreff = ClassHelper.encode_utf8(msg_email.Subject)
+                        If LogErrorsOnly = False Then ClassLogger.Add(" ...subject before converting: '" & msg_email_unicode.Subject & "'", False)
+                        Dim betreff = ClassHelper.encode_utf8(msg_email_unicode.Subject)
                        If Not IsNothing(betreff) Then
+                            If ClassHelper.CheckSpecialSigns(betreff) > 0 Then
+
+                            End If
+
+                            If LogErrorsOnly = False Then ClassLogger.Add(" ...subject after converting: " & betreff, False)
                            Me.txtBetreff.Text = betreff
                        Else
-                            Me.txtBetreff.Text = msg_email.Subject
+                            ClassLogger.Add(" ...subject could not be converted to utf8!", False)
+                            Me.txtBetreff.Text = msg_email_unicode.Subject
                        End If
-
                    End If
-
+                  
                    'Try
                    Dim wFile As System.IO.FileStream
                    Dim byteData() As Byte
-                    byteData = msg_email.BodyHtml
+                    byteData = msg_email_unicode.BodyHtml
                    If LogErrorsOnly = False Then ClassLogger.Add(" ...byteData HTML finished", False)
                    ' MsgBox(msg_email.InternetCodePage)
                    '    wFile = New FileStream(tempFilename, FileMode.Append)
@ -2203,10 +2219,10 @@ Public Class frmIndex
                    'Catch ex As IOException
                    '    MsgBox(ex.ToString)
                    'End Try
-                    If IsNothing(msg_email.BodyHtml) Then
-                        File.WriteAllText(tempFilename, msg_email.Body, System.Text.Encoding.UTF8)
+                    If IsNothing(msg_email_unicode.BodyHtml) Then
+                        File.WriteAllText(tempFilename, msg_email_unicode.Body, System.Text.Encoding.UTF8)
                    Else
-                        Dim vOut As String = System.Text.Encoding.UTF8.GetString(msg_email.BodyHtml)
+                        Dim vOut As String = System.Text.Encoding.UTF8.GetString(msg_email_unicode.BodyHtml)
                        File.WriteAllText(tempFilename, vOut, System.Text.Encoding.UTF8)
                    End If

--- a/Global_Indexer/frmSQLSuggestion.Designer.vb
+++ b/Global_Indexer/frmSQLSuggestion.Designer.vb
@ -60,10 +60,10 @@ Partial Class frmSQLSuggestion
        '
        'GroupBox1
        '
+        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
        Me.GroupBox1.Controls.Add(Me.btnTestNachbearbeitung)
        Me.GroupBox1.Controls.Add(Me.txtTest_idxMan)
        Me.GroupBox1.Controls.Add(Me.Label2)
-        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
        Me.GroupBox1.Name = "GroupBox1"
        Me.GroupBox1.TabStop = False
        '
@ -86,8 +86,8 @@ Partial Class frmSQLSuggestion
        '
        'btnVorschlag
        '
-        Me.btnVorschlag.Image = Global.Global_Indexer.My.Resources.Resources.database_go
        resources.ApplyResources(Me.btnVorschlag, "btnVorschlag")
+        Me.btnVorschlag.Image = Global.Global_Indexer.My.Resources.Resources.database_go
        Me.btnVorschlag.Name = "btnVorschlag"
        Me.btnVorschlag.UseVisualStyleBackColor = True
        '
@ -153,8 +153,8 @@ Partial Class frmSQLSuggestion
        '
        'Button2
        '
-        Me.Button2.Image = Global.Global_Indexer.My.Resources.Resources.save_16xLG
        resources.ApplyResources(Me.Button2, "Button2")
+        Me.Button2.Image = Global.Global_Indexer.My.Resources.Resources.save_16xLG
        Me.Button2.Name = "Button2"
        Me.Button2.UseVisualStyleBackColor = True
        '
@ -178,7 +178,6 @@ Partial Class frmSQLSuggestion
        Me.Controls.Add(Me.SQL_ERGEBNISTextBox)
        Me.Controls.Add(SQL_UEBERPRUEFUNGLabel)
        Me.Controls.Add(Me.SQL_UEBERPRUEFUNGTextBox)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
        Me.MaximizeBox = False
        Me.MinimizeBox = False
        Me.Name = "frmSQLSuggestion"
--- a/Global_Indexer/frmSQLSuggestion.resx
+++ b/Global_Indexer/frmSQLSuggestion.resx
@ -152,11 +152,15 @@
  <metadata name="SQL_UEBERPRUEFUNGLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
  </metadata>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="SQL_UEBERPRUEFUNGLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
  <data name="SQL_UEBERPRUEFUNGLabel.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="SQL_UEBERPRUEFUNGLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>533, 66</value>
+    <value>683, 66</value>
  </data>
  <data name="SQL_UEBERPRUEFUNGLabel.Size" type="System.Drawing.Size, System.Drawing">
    <value>437, 39</value>
@ -181,6 +185,9 @@ Definieren Sie hier einen SQL-Befehl der die Auswahl auf VORHANDEN überprüft.
  <data name="&gt;&gt;SQL_UEBERPRUEFUNGLabel.ZOrder" xml:space="preserve">
    <value>8</value>
  </data>
+  <data name="GroupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
  <data name="btnTestNachbearbeitung.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleLeft</value>
  </data>
@ -262,7 +269,7 @@ Ergebniswert angezeigt.</value>
    <value>2</value>
  </data>
  <data name="GroupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 229</value>
+    <value>15, 367</value>
  </data>
  <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
    <value>351, 93</value>
@ -285,14 +292,17 @@ Ergebniswert angezeigt.</value>
  <data name="&gt;&gt;GroupBox1.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
+  <data name="btnVorschlag.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
  <data name="btnVorschlag.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleLeft</value>
  </data>
  <data name="btnVorschlag.Location" type="System.Drawing.Point, System.Drawing">
-    <value>372, 82</value>
+    <value>536, 54</value>
  </data>
  <data name="btnVorschlag.Size" type="System.Drawing.Size, System.Drawing">
-    <value>151, 25</value>
+    <value>89, 25</value>
  </data>
  <data name="btnVorschlag.TabIndex" type="System.Int32, mscorlib">
    <value>48</value>
@ -315,6 +325,9 @@ Ergebniswert angezeigt.</value>
  <data name="&gt;&gt;btnVorschlag.ZOrder" xml:space="preserve">
    <value>5</value>
  </data>
+  <data name="SQL_ERGEBNISTextBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
  <data name="SQL_ERGEBNISTextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Consolas, 8.25pt</value>
  </data>
@ -324,12 +337,11 @@ Ergebniswert angezeigt.</value>
  <data name="SQL_ERGEBNISTextBox.Multiline" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="SQL_ERGEBNISTextBox.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
    <value>Both</value>
  </data>
  <data name="SQL_ERGEBNISTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>351, 136</value>
+    <value>610, 279</value>
  </data>
  <data name="SQL_ERGEBNISTextBox.TabIndex" type="System.Int32, mscorlib">
    <value>47</value>
@ -346,17 +358,20 @@ Ergebniswert angezeigt.</value>
  <data name="&gt;&gt;SQL_ERGEBNISTextBox.ZOrder" xml:space="preserve">
    <value>7</value>
  </data>
+  <data name="SQL_UEBERPRUEFUNGTextBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
  <data name="SQL_UEBERPRUEFUNGTextBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Consolas, 8.25pt</value>
  </data>
  <data name="SQL_UEBERPRUEFUNGTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>536, 112</value>
+    <value>686, 108</value>
  </data>
  <data name="SQL_UEBERPRUEFUNGTextBox.Multiline" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="SQL_UEBERPRUEFUNGTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>434, 106</value>
+    <value>483, 106</value>
  </data>
  <data name="SQL_UEBERPRUEFUNGTextBox.TabIndex" type="System.Int32, mscorlib">
    <value>49</value>
@ -430,11 +445,14 @@ Ergebniswert angezeigt.</value>
  <data name="&gt;&gt;Button1.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
+  <data name="Button2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
  <data name="Button2.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleLeft</value>
  </data>
  <data name="Button2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>880, 229</value>
+    <value>1070, 407</value>
  </data>
  <data name="Button2.Size" type="System.Drawing.Size, System.Drawing">
    <value>90, 31</value>
@ -460,6 +478,9 @@ Ergebniswert angezeigt.</value>
  <data name="&gt;&gt;Button2.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
+  <data name="lblSave.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
  <data name="lblSave.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
@ -467,7 +488,7 @@ Ergebniswert angezeigt.</value>
    <value>Segoe UI Semibold, 9pt, style=Bold, Italic</value>
  </data>
  <data name="lblSave.Location" type="System.Drawing.Point, System.Drawing">
-    <value>679, 237</value>
+    <value>905, 441</value>
  </data>
  <data name="lblSave.Size" type="System.Drawing.Size, System.Drawing">
    <value>195, 15</value>
@ -500,7 +521,7 @@ Ergebniswert angezeigt.</value>
    <value>6, 13</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>973, 326</value>
+    <value>1172, 489</value>
  </data>
  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt</value>
--- a/SetupWix/Product.wxs
+++ b/SetupWix/Product.wxs
@ -157,7 +157,7 @@
            
             <!-- Digital-Data DLLS -->
            <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
-              <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="E:\SchreiberM\Visual Studio\Kunden - Produktiv\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DLLLicenseManager.dll" KeyPath="yes" />
+              <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DLLLicenseManager.dll" KeyPath="yes" />
            </Component>
            
           <!-- Office-Bibliotheken -->